From 24faa9ba3a4cd5779e0465650b1fda4d5a362f23 Mon Sep 17 00:00:00 2001 From: Glandos Date: Mon, 15 Nov 2021 21:33:21 +0100 Subject: [PATCH 1/6] add tests for python 3.10 --- .github/workflows/test-docs.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-docs.yml b/.github/workflows/test-docs.yml index 1f56c4220..9767aea2f 100644 --- a/.github/workflows/test-docs.yml +++ b/.github/workflows/test-docs.yml @@ -36,7 +36,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: [3.6, 3.7, 3.8, 3.9, 3.10] dependencies: [normal] database: [sqlite] # Test other databases only with one version of Python (Debian buster has 3.7) @@ -60,6 +60,9 @@ jobs: - python-version: 3.9 dependencies: minimal database: sqlite + - python-version: 3.10 + dependencies: minimal + database: sqlite steps: - uses: actions/checkout@v2 From 910488c99cad3c171a4c21968b7c6e2ce54e1433 Mon Sep 17 00:00:00 2001 From: Glandos Date: Mon, 15 Nov 2021 21:36:27 +0100 Subject: [PATCH 2/6] 3.10 needs to be a string --- .github/workflows/test-docs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-docs.yml b/.github/workflows/test-docs.yml index 9767aea2f..7bc420689 100644 --- a/.github/workflows/test-docs.yml +++ b/.github/workflows/test-docs.yml @@ -36,7 +36,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.6, 3.7, 3.8, 3.9, 3.10] + python-version: [3.6, 3.7, 3.8, 3.9, "3.10"] dependencies: [normal] database: [sqlite] # Test other databases only with one version of Python (Debian buster has 3.7) @@ -60,7 +60,7 @@ jobs: - python-version: 3.9 dependencies: minimal database: sqlite - - python-version: 3.10 + - python-version: "3.10" dependencies: minimal database: sqlite From 2f4bdb548f9c7d0f7a4d8c4b5b518c2837e97ed2 Mon Sep 17 00:00:00 2001 From: Glandos Date: Mon, 15 Nov 2021 21:55:35 +0100 Subject: [PATCH 3/6] raise minimal version of pytest to support python 3.10 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 2920691e6..81ef4cc7c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -50,7 +50,7 @@ dev = flake8>=3.7.9 Flask-Testing>=0.8.1 isort>=5.0.0 - pytest>=5.4.1 + pytest>=6.2.5 tox>=3.14.6 zest.releaser>=6.20.1 psycopg2-binary>=2.9,<3 From f8f33be96e9fff036c67559357a038cc3bb0a6c3 Mon Sep 17 00:00:00 2001 From: Glandos Date: Mon, 15 Nov 2021 22:17:44 +0100 Subject: [PATCH 4/6] add minimal test for 3.8 --- .github/workflows/test-docs.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test-docs.yml b/.github/workflows/test-docs.yml index 7bc420689..c92a6d3f2 100644 --- a/.github/workflows/test-docs.yml +++ b/.github/workflows/test-docs.yml @@ -57,6 +57,9 @@ jobs: - python-version: 3.7 dependencies: minimal database: mariadb + - python-version: 3.8 + dependencies: minimal + database: sqlite - python-version: 3.9 dependencies: minimal database: sqlite From 32bd802080032677a00b201746ec96560a898764 Mon Sep 17 00:00:00 2001 From: Glandos Date: Mon, 15 Nov 2021 22:18:34 +0100 Subject: [PATCH 5/6] raise flask_cors to 3.0.8 to work with python >= 3.8 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 81ef4cc7c..ef52832a6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -28,7 +28,7 @@ install_requires = debts>=0.5,<1 email_validator>=1.0,<2 Flask-Babel>=1.0,<3 - Flask-Cors>=3.0,<4 + Flask-Cors>=3.0.8,<4 Flask-Mail>=0.9.1,<1 Flask-Migrate>=2.5.3,<4 # Not following semantic versioning (e.g. https://github.com/miguelgrinberg/flask-migrate/commit/1af28ba273de6c88544623b8dc02dd539340294b) Flask-RESTful>=0.3.9,<1 From da95c4ae4258cc7a0c1370e7c7f5790557f1d6e6 Mon Sep 17 00:00:00 2001 From: Glandos Date: Mon, 15 Nov 2021 22:23:42 +0100 Subject: [PATCH 6/6] Revert "add minimal test for 3.8" This reverts commit f8f33be96e9fff036c67559357a038cc3bb0a6c3. --- .github/workflows/test-docs.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/test-docs.yml b/.github/workflows/test-docs.yml index c92a6d3f2..7bc420689 100644 --- a/.github/workflows/test-docs.yml +++ b/.github/workflows/test-docs.yml @@ -57,9 +57,6 @@ jobs: - python-version: 3.7 dependencies: minimal database: mariadb - - python-version: 3.8 - dependencies: minimal - database: sqlite - python-version: 3.9 dependencies: minimal database: sqlite