From 9ff1407425d61e22ace7dd948a8700f0235524ba Mon Sep 17 00:00:00 2001 From: Brad Macdonald Date: Mon, 16 Oct 2023 13:46:41 -0600 Subject: [PATCH 01/13] bump setuptools version --- .github/workflows/ci.yml | 2 +- setup.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4e97479..33cfa90 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: push: # Avoid using all the resources/limits available by checking only # relevant branches and tags. Other branches can be checked via PRs. - branches: [main] + branches: [main, bwmac/ORCA-283/ci_publish_bug] tags: ['v[0-9]*', '[0-9]+.[0-9]+*'] # Match tags that resemble a version pull_request: # Run in every PR workflow_dispatch: # Allow manually triggering the workflow diff --git a/setup.cfg b/setup.cfg index 42bcda2..b8f8599 100644 --- a/setup.cfg +++ b/setup.cfg @@ -76,7 +76,7 @@ all = # Dependencies for testing (used by tox and Pipenv) testing = - setuptools~=65.0 + setuptools~=67.0 pytest~=7.0 pytest-cov~=4.0 pytest-mock~=3.0 From c1f88fc4de4fee7baba1f055a35e33d906e1e9b3 Mon Sep 17 00:00:00 2001 From: Brad Macdonald Date: Mon, 16 Oct 2023 14:34:11 -0600 Subject: [PATCH 02/13] bump requests --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index b8f8599..56e82cc 100644 --- a/setup.cfg +++ b/setup.cfg @@ -71,7 +71,7 @@ all = synapseclient~=2.7 fs-synapse~=1.0 sevenbridges-python~=2.9 - requests~=2.28 + requests~=2.5 urllib3<2.0 # Dependencies for testing (used by tox and Pipenv) From 6c785866680c1b7a7b8590ca35d97fd27146615c Mon Sep 17 00:00:00 2001 From: Brad Macdonald Date: Mon, 16 Oct 2023 15:14:14 -0600 Subject: [PATCH 03/13] bump action version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 33cfa90..2ece963 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -145,7 +145,7 @@ jobs: type=ref,event=branch type=sha - name: Publish Python Package to Docker Hub and GHCR - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v5 with: platforms: linux/amd64,linux/arm64 context: . From 2170aa728cb77ae18a4a9a993567802c80ea6cd9 Mon Sep 17 00:00:00 2001 From: Brad Macdonald Date: Mon, 16 Oct 2023 15:42:55 -0600 Subject: [PATCH 04/13] revert action, bump setuptools --- .github/workflows/ci.yml | 2 +- setup.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ece963..33cfa90 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -145,7 +145,7 @@ jobs: type=ref,event=branch type=sha - name: Publish Python Package to Docker Hub and GHCR - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v3 with: platforms: linux/amd64,linux/arm64 context: . diff --git a/setup.cfg b/setup.cfg index 56e82cc..3ca2c1f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -76,7 +76,7 @@ all = # Dependencies for testing (used by tox and Pipenv) testing = - setuptools~=67.0 + setuptools~=68.0 pytest~=7.0 pytest-cov~=4.0 pytest-mock~=3.0 From af9f99dad48ebda69495eb278e8187817dd58bcc Mon Sep 17 00:00:00 2001 From: Brad Macdonald Date: Mon, 16 Oct 2023 16:16:50 -0600 Subject: [PATCH 05/13] reverts dependency versions and adds 3.9 and 3.10 to tests --- .github/workflows/ci.yml | 2 ++ setup.cfg | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 33cfa90..e57a720 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,6 +65,8 @@ jobs: matrix: python: - "3.8" + - "3.9" + - "3.10" - "3.11" # newest Python that is stable platform: - ubuntu-latest diff --git a/setup.cfg b/setup.cfg index 3ca2c1f..42bcda2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -71,12 +71,12 @@ all = synapseclient~=2.7 fs-synapse~=1.0 sevenbridges-python~=2.9 - requests~=2.5 + requests~=2.28 urllib3<2.0 # Dependencies for testing (used by tox and Pipenv) testing = - setuptools~=68.0 + setuptools~=65.0 pytest~=7.0 pytest-cov~=4.0 pytest-mock~=3.0 From dfa114df9c414d4ce64a63c9a067e85605ab83c2 Mon Sep 17 00:00:00 2001 From: Brad Macdonald Date: Tue, 17 Oct 2023 09:12:51 -0600 Subject: [PATCH 06/13] bump requests version --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 42bcda2..ab8c9e2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -71,7 +71,7 @@ all = synapseclient~=2.7 fs-synapse~=1.0 sevenbridges-python~=2.9 - requests~=2.28 + requests~=2.5 urllib3<2.0 # Dependencies for testing (used by tox and Pipenv) From 3324d68f3d0d1a83598a6909a0a9584f54d5b4b6 Mon Sep 17 00:00:00 2001 From: Brad Macdonald Date: Tue, 17 Oct 2023 09:36:01 -0600 Subject: [PATCH 07/13] remove extra python versions, set pyparsing version --- .github/workflows/ci.yml | 4 +--- setup.cfg | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e57a720..979fec9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,9 +64,7 @@ jobs: strategy: matrix: python: - - "3.8" - - "3.9" - - "3.10" + - "3.8" # oldest Python that is supported - "3.11" # newest Python that is stable platform: - ubuntu-latest diff --git a/setup.cfg b/setup.cfg index ab8c9e2..8ea47a0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -101,6 +101,7 @@ dev = typing-extensions~=4.5 metaflow~=2.9 s3fs~=2023.5 + pyparsing~=3.0 [options.entry_points] # Add here console scripts like: From fd45b4503ea51f9a77c8dd08d3463a13e51f41fd Mon Sep 17 00:00:00 2001 From: Brad Macdonald Date: Tue, 17 Oct 2023 10:06:25 -0600 Subject: [PATCH 08/13] make pyparsing version mandatory --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 8ea47a0..39b293d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -55,6 +55,7 @@ install_requires = pydantic~=1.10 sqlalchemy<2.0 # To address SQLAlchemy warning (https://sqlalche.me/e/b8d9) typing-extensions~=4.5 + pyparsing~=3.1 [options.packages.find] where = src @@ -101,7 +102,6 @@ dev = typing-extensions~=4.5 metaflow~=2.9 s3fs~=2023.5 - pyparsing~=3.0 [options.entry_points] # Add here console scripts like: From ef40a953e40dbf1cb2b7c6385857397d130d48bf Mon Sep 17 00:00:00 2001 From: Brad Macdonald Date: Tue, 17 Oct 2023 14:00:17 -0600 Subject: [PATCH 09/13] revert requests version --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 39b293d..6867056 100644 --- a/setup.cfg +++ b/setup.cfg @@ -72,7 +72,7 @@ all = synapseclient~=2.7 fs-synapse~=1.0 sevenbridges-python~=2.9 - requests~=2.5 + requests~=2.28 urllib3<2.0 # Dependencies for testing (used by tox and Pipenv) From cd9d93dc70c813bdea3d1feef03b92f1141c9aad Mon Sep 17 00:00:00 2001 From: Brad Macdonald Date: Tue, 17 Oct 2023 14:01:19 -0600 Subject: [PATCH 10/13] open up pyparsing range --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 6867056..9662ea8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -55,7 +55,7 @@ install_requires = pydantic~=1.10 sqlalchemy<2.0 # To address SQLAlchemy warning (https://sqlalche.me/e/b8d9) typing-extensions~=4.5 - pyparsing~=3.1 + pyparsing>=2.5 [options.packages.find] where = src From 1b67beb3929698433ce99d9599d7297bd7374730 Mon Sep 17 00:00:00 2001 From: Brad Macdonald Date: Tue, 17 Oct 2023 14:49:53 -0600 Subject: [PATCH 11/13] bump dockerfile python version --- src/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docker/Dockerfile b/src/docker/Dockerfile index 60efb9f..a19a562 100644 --- a/src/docker/Dockerfile +++ b/src/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.11.1 +FROM python:3.11.6 WORKDIR /usr/src/app From 701fa8601a0cfe515fa47727881b3dc2f5406227 Mon Sep 17 00:00:00 2001 From: Brad Macdonald Date: Tue, 17 Oct 2023 15:19:42 -0600 Subject: [PATCH 12/13] remove pyparsing pin --- setup.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 9662ea8..42bcda2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -55,7 +55,6 @@ install_requires = pydantic~=1.10 sqlalchemy<2.0 # To address SQLAlchemy warning (https://sqlalche.me/e/b8d9) typing-extensions~=4.5 - pyparsing>=2.5 [options.packages.find] where = src From 271792f2fe412d5f452a790c3fdc93d0e9b08de3 Mon Sep 17 00:00:00 2001 From: Brad Macdonald Date: Tue, 17 Oct 2023 16:51:39 -0600 Subject: [PATCH 13/13] removes this branch from CI `branches` --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 979fec9..4e97479 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: push: # Avoid using all the resources/limits available by checking only # relevant branches and tags. Other branches can be checked via PRs. - branches: [main, bwmac/ORCA-283/ci_publish_bug] + branches: [main] tags: ['v[0-9]*', '[0-9]+.[0-9]+*'] # Match tags that resemble a version pull_request: # Run in every PR workflow_dispatch: # Allow manually triggering the workflow @@ -64,7 +64,7 @@ jobs: strategy: matrix: python: - - "3.8" # oldest Python that is supported + - "3.8" - "3.11" # newest Python that is stable platform: - ubuntu-latest