From 83a8d439e5db38f57bccead017f7c5f2f3d27bdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A0=20Casaj=C3=BAs?= Date: Wed, 27 Apr 2022 15:28:26 +0200 Subject: [PATCH 1/5] Add workflow for python 3.10 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9f9792f2..d42160c9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [3.7, 3.9] + python-version: [3.7, 3.10] # service containers to run with `postgres-job` services: From 7d38c41d52a9c9a2e2b5fdc42f94717f74989cc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A0=20Casaj=C3=BAs?= Date: Wed, 27 Apr 2022 15:30:16 +0200 Subject: [PATCH 2/5] Put version version between " so it is 3.10 instead of 3.1 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d42160c9..b18ff656 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [3.7, 3.10] + python-version: [3.7, "3.10"] # service containers to run with `postgres-job` services: From 0a34c1547fc426462ca04f81f35eed96ac187e43 Mon Sep 17 00:00:00 2001 From: Carlos Quintana Date: Thu, 28 Apr 2022 15:22:23 +0200 Subject: [PATCH 3/5] Fix python 3.10 --- .github/workflows/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b18ff656..68109407 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -59,6 +59,12 @@ jobs: path: .venv key: venv-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/poetry.lock') }} + - name: Install OS dependencies + if: ${{ matrix.python-version }} == '3.10' + run: | + sudo apt update + sudo apt install -y libre2-dev + - name: Install dependencies if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' run: poetry install --no-interaction --no-root From 8fedceb090cbaa78412d0de6de1e343291edbc34 Mon Sep 17 00:00:00 2001 From: Carlos Quintana Date: Thu, 28 Apr 2022 16:10:43 +0200 Subject: [PATCH 4/5] Also install libpq-dev --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 68109407..54186f8a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -63,7 +63,7 @@ jobs: if: ${{ matrix.python-version }} == '3.10' run: | sudo apt update - sudo apt install -y libre2-dev + sudo apt install -y libre2-dev libpq-dev - name: Install dependencies if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' From 89fe4387e51ba692a4b07a2262618493d1ac5580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A0=20Casaj=C3=BAs?= Date: Thu, 28 Apr 2022 16:20:14 +0200 Subject: [PATCH 5/5] Update PGPy to 0.5.4 to allow for python 3.10 --- poetry.lock | 8 ++++---- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/poetry.lock b/poetry.lock index 758186ec..cc441297 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1109,7 +1109,7 @@ ptyprocess = ">=0.5" [[package]] name = "pgpy" -version = "0.5.3" +version = "0.5.4" description = "Pretty Good Privacy for Python" category = "main" optional = false @@ -1959,7 +1959,7 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"] [metadata] lock-version = "1.1" python-versions = "^3.7" -content-hash = "1bf0b77dfa436aafc5c265a63894ae2b07203c883394ac10cb116343eaf2b6c2" +content-hash = "06d37c9f592a76f563a1424d04d9bd842131dda575ef5b261bfa474e3079c23f" [metadata.files] aiohttp = [ @@ -2599,8 +2599,8 @@ pexpect = [ {file = "pexpect-4.8.0.tar.gz", hash = "sha256:fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c"}, ] pgpy = [ - {file = "PGPy-0.5.3-py2.py3-none-any.whl", hash = "sha256:cba6fbbb44a896a8a4f5807b3d8d4943a8f7a6607be11587f4a27734c711c1dd"}, - {file = "PGPy-0.5.3.tar.gz", hash = "sha256:a49c269cedcaf82ac6999bcae5fd3f543ecb1c759f9d48a15ad8d8fa4ac03987"}, + {file = "PGPy-0.5.4-py2.py3-none-any.whl", hash = "sha256:c29ad9b2bcba6575c3773410894e77a7552b6a3de184fd99b4da3995986f26a9"}, + {file = "PGPy-0.5.4.tar.gz", hash = "sha256:bdd3da1e006fc8e81cc02232969924d6e8c98a4af1621a925d99bba09164183b"}, ] phpserialize = [ {file = "phpserialize-1.3.tar.gz", hash = "sha256:bf672d312d203d09a84c26366fab8f438a3ffb355c407e69974b7ef2d39a0fa7"}, diff --git a/pyproject.toml b/pyproject.toml index 8cf52d69..9a2176c0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -77,7 +77,7 @@ memory_profiler = "^0.57.0" gevent = "^21.12.0" aiospamc = "^0.6.1" email_validator = "^1.1.1" -PGPy = "^0.5.3" +PGPy = "0.5.4" coinbase-commerce = "^1.0.1" requests = "^2.25.1" newrelic = "^6.4.4"