From 1d8261bcabdffc7451aee8c4442beb20fdc11b22 Mon Sep 17 00:00:00 2001 From: yuenmichelle1 Date: Wed, 7 Jan 2026 11:21:31 -0600 Subject: [PATCH 1/6] drop python2 support. --- Dockerfile.dev2 | 12 ------------ Dockerfile.stable2 | 6 ------ docker-compose.yml | 31 ------------------------------- 3 files changed, 49 deletions(-) delete mode 100644 Dockerfile.dev2 delete mode 100644 Dockerfile.stable2 diff --git a/Dockerfile.dev2 b/Dockerfile.dev2 deleted file mode 100644 index 010aa7d..0000000 --- a/Dockerfile.dev2 +++ /dev/null @@ -1,12 +0,0 @@ -FROM python:2-alpine - -WORKDIR /usr/src/panoptes-cli - -RUN apk --no-cache add git libmagic -RUN pip install git+https://github.com/zooniverse/panoptes-python-client.git - -COPY . . - -RUN pip install . - -CMD [ "panoptes" ] diff --git a/Dockerfile.stable2 b/Dockerfile.stable2 deleted file mode 100644 index 46f2951..0000000 --- a/Dockerfile.stable2 +++ /dev/null @@ -1,6 +0,0 @@ -FROM python:2.7-alpine - -RUN apk add --no-cache libmagic -RUN pip install panoptescli - -CMD [ "panoptes" ] diff --git a/docker-compose.yml b/docker-compose.yml index 68f4545..ec9c082 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '2' - services: dev: build: @@ -29,32 +27,3 @@ services: - ${HOME}/.panoptes/:/root/.panoptes/ - ${HOME}:${HOME} working_dir: ${PWD} - - dev2: - build: - context: ./ - dockerfile: Dockerfile.dev2 - volumes: - - ${HOME}/.panoptes/:/root/.panoptes/ - - ${HOME}:${HOME} - working_dir: ${PWD} - - debug2: - build: - context: ./ - dockerfile: Dockerfile.dev2 - volumes: - - ${HOME}/.panoptes/:/root/.panoptes/ - - ${HOME}:${HOME} - environment: - - PANOPTES_DEBUG=true - working_dir: ${PWD} - - stable2: - build: - context: ./ - dockerfile: Dockerfile.stable2 - volumes: - - ${HOME}/.panoptes/:/root/.panoptes/ - - ${HOME}:${HOME} - working_dir: ${PWD} From 2d3b8e5f80ad2c208beec8ea47adff4618bf356f Mon Sep 17 00:00:00 2001 From: yuenmichelle1 Date: Wed, 7 Jan 2026 11:25:17 -0600 Subject: [PATCH 2/6] update github actions to most recent stable versions that work with ubuntu-latest runner - update actions/setup-python to v5 (v6 currently runs on node 24 and current ubuntu-latest supports up to node 20) - using python 3.13 since 3.14 is not available with setup-python v5 update test pypi action to run on published release --- .github/workflows/publish-to-pypi.yml | 14 +++++++++----- .github/workflows/publish-to-test-pypi.yml | 8 ++++---- .github/workflows/run_tests_CI.yml | 10 +++++----- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index 87fdd57..fb328b1 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -1,17 +1,21 @@ name: Publish to PyPi -on: workflow_dispatch +on: + workflow_dispatch: + release: + types: + - published jobs: build-and-publish: name: Build python package and publish to PyPi runs-on: ubuntu-latest steps: - - uses: actions/checkout@master - - name: Set up Python 3.9 - uses: actions/setup-python@v2 + - uses: actions/checkout@v6 + - name: Set up Python 3.13 + uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.13 - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/publish-to-test-pypi.yml b/.github/workflows/publish-to-test-pypi.yml index 753b731..b934bac 100644 --- a/.github/workflows/publish-to-test-pypi.yml +++ b/.github/workflows/publish-to-test-pypi.yml @@ -7,11 +7,11 @@ jobs: name: Build python package and publish to Test PyPi runs-on: ubuntu-latest steps: - - uses: actions/checkout@master - - name: Set up Python 3.9 - uses: actions/setup-python@v2 + - uses: actions/checkout@v6 + - name: Set up Python 3.13 + uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.13 - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/run_tests_CI.yml b/.github/workflows/run_tests_CI.yml index e707854..97cdb74 100644 --- a/.github/workflows/run_tests_CI.yml +++ b/.github/workflows/run_tests_CI.yml @@ -11,12 +11,12 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Set up Python 3.9 - uses: actions/setup-python@v2 + - uses: actions/checkout@v6 + - name: Set up Python 3.13 + uses: actions/setup-python@v5 with: - python-version: 3.9 - - uses: actions/cache@v3 + python-version: 3.14 + - uses: actions/cache@v4 with: path: ${{ env.pythonLocation }} key: ${{ env.pythonLocation }}-${{ hashFiles('setup.py') }} From 6be45ba1e1c0bfd7eb9db1b9789d57328cedc46b Mon Sep 17 00:00:00 2001 From: yuenmichelle1 Date: Wed, 7 Jan 2026 14:13:28 -0600 Subject: [PATCH 3/6] Update run_tests_CI.yml --- .github/workflows/run_tests_CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests_CI.yml b/.github/workflows/run_tests_CI.yml index 97cdb74..dc4266f 100644 --- a/.github/workflows/run_tests_CI.yml +++ b/.github/workflows/run_tests_CI.yml @@ -15,7 +15,7 @@ jobs: - name: Set up Python 3.13 uses: actions/setup-python@v5 with: - python-version: 3.14 + python-version: 3.13 - uses: actions/cache@v4 with: path: ${{ env.pythonLocation }} From 9aa3212e43a45dbb6b9a4f95aa71129ce9a6c625 Mon Sep 17 00:00:00 2001 From: yuenmichelle1 Date: Wed, 7 Jan 2026 14:25:31 -0600 Subject: [PATCH 4/6] update dockerfile dev to pull latest python 3 vs specifying python 3.9 --- Dockerfile.dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.dev b/Dockerfile.dev index eeeb122..ce23d6c 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM python:3.9-alpine +FROM python:3-alpine WORKDIR /usr/src/panoptes-cli From 40d68f4e38f03f544bef19f3894c630a49ea50fb Mon Sep 17 00:00:00 2001 From: yuenmichelle1 Date: Tue, 13 Jan 2026 09:33:51 -0600 Subject: [PATCH 5/6] Update setup.py --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 1353273..8f54c8e 100644 --- a/setup.py +++ b/setup.py @@ -17,10 +17,10 @@ packages=find_packages(), include_package_data=True, install_requires=[ - 'Click>=6.7,<8.2', - 'PyYAML>=5.1,<6.1', + 'Click>=6.7', + 'PyYAML>=5.1', 'panoptes-client>=1.7,<2.0', - 'humanize>=0.5.1,<4.8', + 'humanize>=0.5.1', 'pathvalidate>=0.29.0,<2.6', ], entry_points=''' From 765d82b3cfcef01a6417417bef98a2c9c8daa384 Mon Sep 17 00:00:00 2001 From: yuenmichelle1 Date: Tue, 13 Jan 2026 09:38:53 -0600 Subject: [PATCH 6/6] publish to test pypi on published release --- .github/workflows/publish-to-pypi.yml | 3 --- .github/workflows/publish-to-test-pypi.yml | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index fb328b1..56826c3 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -2,9 +2,6 @@ name: Publish to PyPi on: workflow_dispatch: - release: - types: - - published jobs: build-and-publish: diff --git a/.github/workflows/publish-to-test-pypi.yml b/.github/workflows/publish-to-test-pypi.yml index b934bac..3726894 100644 --- a/.github/workflows/publish-to-test-pypi.yml +++ b/.github/workflows/publish-to-test-pypi.yml @@ -1,6 +1,10 @@ name: Publish to Test PyPi -on: workflow_dispatch +on: + workflow_dispatch: + release: + types: + - published jobs: build-and-publish: