From d4fa2834d4455c5f3adce38f964bcde34c76c608 Mon Sep 17 00:00:00 2001 From: sarthakpati Date: Fri, 1 Sep 2023 17:00:39 -0400 Subject: [PATCH 01/11] added a comment to check paul's repo --- FigureGenerator/screenshot_maker.py | 3 +++ 1 file changed, 3 insertions(+) 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 From e4d5c4eaea007fb72925d0178e3e9e7f8794d2ee Mon Sep 17 00:00:00 2001 From: sarthakpati Date: Tue, 13 May 2025 09:37:56 -0400 Subject: [PATCH 02/11] Update GitHub Actions workflow and setup.py for multi-platform support and Python version updates --- .github/workflows/main.yml | 12 ++++++++---- setup.py | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eab5ff5..5c760fc 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.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/setup.py b/setup.py index dad48f0..6be140f 100644 --- a/setup.py +++ b/setup.py @@ -45,9 +45,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, From c6b434ca1155a213fa33e43b8733fcca277083a7 Mon Sep 17 00:00:00 2001 From: sarthakpati Date: Tue, 13 May 2025 09:39:26 -0400 Subject: [PATCH 03/11] Bump version to 0.0.5 --- FigureGenerator/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From a11bfed38e4b50bf08b3c83d7669908dc93d7fc2 Mon Sep 17 00:00:00 2001 From: Sarthak Pati Date: Tue, 13 May 2025 09:41:52 -0400 Subject: [PATCH 04/11] Update python-package.yml --- .github/workflows/python-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index b6e0616..cb50e8f 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7, 3.8, 3.9] + python-version: ["3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v2 From 4c843839c59fdf35d7110081e06b56b3877c3d34 Mon Sep 17 00:00:00 2001 From: Sarthak Pati Date: Tue, 13 May 2025 09:42:33 -0400 Subject: [PATCH 05/11] Update python-package.yml --- .github/workflows/python-package.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index cb50e8f..9b23997 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -18,9 +18,9 @@ jobs: python-version: ["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 From 2bbc20133ac03d22a10da726702a3c321d84063c Mon Sep 17 00:00:00 2001 From: Sarthak Pati Date: Tue, 13 May 2025 09:46:27 -0400 Subject: [PATCH 06/11] Update setup.py --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 6be140f..776e11b 100644 --- a/setup.py +++ b/setup.py @@ -29,6 +29,7 @@ "black", "matplotlib", "requests", + "setuptools", ] setup( From 5a37a8acc9c203d522c14b3ace807be9a170180d Mon Sep 17 00:00:00 2001 From: Sarthak Pati Date: Tue, 13 May 2025 09:49:55 -0400 Subject: [PATCH 07/11] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 776e11b..1994f16 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ version=__version__, author="Sarthak Pati", # alphabetical order author_email="software@cbica.upenn.edu", - python_requires=">=3.6", + python_requires=">=3.10", packages=find_packages(), scripts=["figure_generator"], classifiers=[ From 5858cff1dea9de246b4827fb3dd925a30f73e201 Mon Sep 17 00:00:00 2001 From: Sarthak Pati Date: Tue, 13 May 2025 14:44:46 -0400 Subject: [PATCH 08/11] checking a lower python version --- .github/workflows/main.yml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5c760fc..4a57efa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macos-latest] - python-version: ["3.10", "3.11", "3.12"] + python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 diff --git a/setup.py b/setup.py index 1994f16..776e11b 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ version=__version__, author="Sarthak Pati", # alphabetical order author_email="software@cbica.upenn.edu", - python_requires=">=3.10", + python_requires=">=3.6", packages=find_packages(), scripts=["figure_generator"], classifiers=[ From c63f4f7e0f4f7938b86be129932d96df4a4cd539 Mon Sep 17 00:00:00 2001 From: Sarthak Pati Date: Tue, 13 May 2025 14:47:01 -0400 Subject: [PATCH 09/11] check ing lower python --- .github/workflows/python-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 9b23997..b6384b7 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.10", "3.11", "3.12"] + python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 From 74418448c464700b0e4687d3c8d7eeae4f977802 Mon Sep 17 00:00:00 2001 From: Sarthak Pati Date: Tue, 13 May 2025 16:57:15 -0400 Subject: [PATCH 10/11] updated min python --- .github/workflows/main.yml | 2 +- .github/workflows/python-package.yml | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4a57efa..cb1878c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macos-latest] - python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index b6384b7..ae84aa3 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 diff --git a/setup.py b/setup.py index 776e11b..ab7244e 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ version=__version__, author="Sarthak Pati", # alphabetical order author_email="software@cbica.upenn.edu", - python_requires=">=3.6", + python_requires=">=3.8", packages=find_packages(), scripts=["figure_generator"], classifiers=[ From e215b2eb20be5d3808b9d4a202f1280adfc74b94 Mon Sep 17 00:00:00 2001 From: Sarthak Pati Date: Tue, 13 May 2025 18:18:29 -0400 Subject: [PATCH 11/11] updated min python --- .github/workflows/main.yml | 2 +- .github/workflows/python-package.yml | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cb1878c..d68592f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macos-latest] - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index ae84aa3..9412905 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 diff --git a/setup.py b/setup.py index ab7244e..92e3a09 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ version=__version__, author="Sarthak Pati", # alphabetical order author_email="software@cbica.upenn.edu", - python_requires=">=3.8", + python_requires=">=3.9", packages=find_packages(), scripts=["figure_generator"], classifiers=[