Skip to content

Commit a39d70a

Browse files
authored
Merge pull request #8 from sarthakpati/updated_to_new_python
Updated for new python versions
2 parents 5aeec48 + e215b2e commit a39d70a

File tree

5 files changed

+20
-12
lines changed

5 files changed

+20
-12
lines changed

.github/workflows/main.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,22 @@ permissions:
1919
jobs:
2020
deploy:
2121

22-
runs-on: ubuntu-latest
22+
runs-on: ${{ matrix.os }}
23+
strategy:
24+
matrix:
25+
os: [ubuntu-latest, windows-latest, macos-latest]
26+
python-version: ["3.9", "3.10", "3.11", "3.12"]
2327

2428
steps:
25-
- uses: actions/checkout@v3
29+
- uses: actions/checkout@v4
2630
- name: Set up Python
2731
uses: actions/setup-python@v4
2832
with:
29-
python-version: '3.8'
33+
python-version: ${{ matrix.python-version }}
3034
# This second step is unnecessary but highly recommended because
3135
# It will cache database and saves time re-downloading it if database isn't stale.
3236
- name: Cache pip
33-
uses: actions/cache@v3
37+
uses: actions/cache@v4
3438
with:
3539
path: ~/.cache/pip
3640
key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}

.github/workflows/python-package.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515
runs-on: ubuntu-latest
1616
strategy:
1717
matrix:
18-
python-version: [3.7, 3.8, 3.9]
18+
python-version: ["3.9", "3.10", "3.11", "3.12"]
1919

2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v4
2222
- name: Set up Python ${{ matrix.python-version }}
23-
uses: actions/setup-python@v2
23+
uses: actions/setup-python@v4
2424
with:
2525
python-version: ${{ matrix.python-version }}
2626
- name: Install dependencies

FigureGenerator/screenshot_maker.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
import matplotlib.pyplot as plt
1717

1818

19+
# check logic in https://github.com/pyushkevich/upenn_be5370_utils/blob/main/upenn_be5370_utils/sitkview.py
20+
21+
1922
class FigureGenerator:
2023
def __init__(self, args):
2124
# change comma-separated string to list for images and masks

FigureGenerator/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/bin/env python3
22
# -*- coding: UTF-8 -*-
3-
__version__ = "0.0.4"
3+
__version__ = "0.0.5"

setup.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,15 @@
2929
"black",
3030
"matplotlib",
3131
"requests",
32+
"setuptools",
3233
]
3334

3435
setup(
3536
name="FigureGenerator",
3637
version=__version__,
3738
author="Sarthak Pati", # alphabetical order
3839
author_email="software@cbica.upenn.edu",
39-
python_requires=">=3.6",
40+
python_requires=">=3.9",
4041
packages=find_packages(),
4142
scripts=["figure_generator"],
4243
classifiers=[
@@ -45,9 +46,9 @@
4546
"License :: OSI Approved :: BSD License",
4647
"Natural Language :: English",
4748
"Operating System :: OS Independent",
48-
"Programming Language :: Python :: 3.6",
49-
"Programming Language :: Python :: 3.7",
50-
"Programming Language :: Python :: 3.8",
49+
"Programming Language :: Python :: 3.10",
50+
"Programming Language :: Python :: 3.11",
51+
"Programming Language :: Python :: 3.12",
5152
],
5253
description=("Making screenshots for presentations and manuscripts."),
5354
install_requires=requirements,

0 commit comments

Comments
 (0)