diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eab5ff5..d68592f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,18 +19,22 @@ permissions: jobs: deploy: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, windows-latest, macos-latest] + python-version: ["3.9", "3.10", "3.11", "3.12"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: ${{ matrix.python-version }} # This second step is unnecessary but highly recommended because # It will cache database and saves time re-downloading it if database isn't stale. - name: Cache pip - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }} diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index b6e0616..9412905 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -15,12 +15,12 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7, 3.8, 3.9] + python-version: ["3.9", "3.10", "3.11", "3.12"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Install dependencies diff --git a/FigureGenerator/screenshot_maker.py b/FigureGenerator/screenshot_maker.py index 42c6cfb..55580e8 100644 --- a/FigureGenerator/screenshot_maker.py +++ b/FigureGenerator/screenshot_maker.py @@ -16,6 +16,9 @@ import matplotlib.pyplot as plt +# check logic in https://github.com/pyushkevich/upenn_be5370_utils/blob/main/upenn_be5370_utils/sitkview.py + + class FigureGenerator: def __init__(self, args): # change comma-separated string to list for images and masks diff --git a/FigureGenerator/version.py b/FigureGenerator/version.py index c73d05c..216f218 100644 --- a/FigureGenerator/version.py +++ b/FigureGenerator/version.py @@ -1,3 +1,3 @@ #!/usr/bin/env python3 # -*- coding: UTF-8 -*- -__version__ = "0.0.4" +__version__ = "0.0.5" diff --git a/setup.py b/setup.py index dad48f0..92e3a09 100644 --- a/setup.py +++ b/setup.py @@ -29,6 +29,7 @@ "black", "matplotlib", "requests", + "setuptools", ] setup( @@ -36,7 +37,7 @@ version=__version__, author="Sarthak Pati", # alphabetical order author_email="software@cbica.upenn.edu", - python_requires=">=3.6", + python_requires=">=3.9", packages=find_packages(), scripts=["figure_generator"], classifiers=[ @@ -45,9 +46,9 @@ "License :: OSI Approved :: BSD License", "Natural Language :: English", "Operating System :: OS Independent", - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ], description=("Making screenshots for presentations and manuscripts."), install_requires=requirements,