From a1e667d8b7fdfabe9752e60c904d74a33a6d8e02 Mon Sep 17 00:00:00 2001 From: "H. Shay" Date: Thu, 16 Dec 2021 10:12:29 -0800 Subject: [PATCH 1/5] remove python 3.6 and postgres 9.6 from github workflow --- .github/workflows/tests.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 21c9ee7823c7..a65d42f7eeaf 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -76,7 +76,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"] + python-version: ["3.7", "3.8", "3.9", "3.10"] database: ["sqlite"] toxenv: ["py"] include: @@ -85,9 +85,9 @@ jobs: toxenv: "py-noextras" # Oldest Python with PostgreSQL - - python-version: "3.6" + - python-version: "3.7" database: "postgres" - postgres-version: "9.6" + postgres-version: "9.10" toxenv: "py" # Newest Python with newest PostgreSQL @@ -167,7 +167,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["pypy-3.6"] + python-version: ["pypy-3.7"] steps: - uses: actions/checkout@v2 @@ -291,8 +291,8 @@ jobs: strategy: matrix: include: - - python-version: "3.6" - postgres-version: "9.6" + - python-version: "3.7" + postgres-version: "9.10" - python-version: "3.10" postgres-version: "14" From d8d1f46429bc88fa2072011eb505238542b21a01 Mon Sep 17 00:00:00 2001 From: "H. Shay" Date: Thu, 16 Dec 2021 10:16:28 -0800 Subject: [PATCH 2/5] remove python 3.6 env from tox --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index cfe6a0694269..769e42219c27 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = packaging, py36, py37, py38, py39, check_codestyle, check_isort +envlist = packaging, py37, py38, py39, check_codestyle, check_isort # we require tox>=2.3.2 for the fix to https://github.com/tox-dev/tox/issues/208 minversion = 2.3.2 From 9c464950a407445af678c42aae040e7238dda57c Mon Sep 17 00:00:00 2001 From: "H. Shay" Date: Thu, 16 Dec 2021 10:24:11 -0800 Subject: [PATCH 3/5] newsfragment --- changelog.d/11595.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/11595.misc diff --git a/changelog.d/11595.misc b/changelog.d/11595.misc new file mode 100644 index 000000000000..57e54db5a9df --- /dev/null +++ b/changelog.d/11595.misc @@ -0,0 +1 @@ +Drop EOL python 3.6 and postgres 9.6 from CI. \ No newline at end of file From 1634862791dfd27ad905b7a8da979457680abdff Mon Sep 17 00:00:00 2001 From: "H. Shay" Date: Thu, 16 Dec 2021 11:09:39 -0800 Subject: [PATCH 4/5] correct postgres version --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a65d42f7eeaf..cb72e1a233ec 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -87,7 +87,7 @@ jobs: # Oldest Python with PostgreSQL - python-version: "3.7" database: "postgres" - postgres-version: "9.10" + postgres-version: "10" toxenv: "py" # Newest Python with newest PostgreSQL @@ -292,7 +292,7 @@ jobs: matrix: include: - python-version: "3.7" - postgres-version: "9.10" + postgres-version: "10" - python-version: "3.10" postgres-version: "14" From aff7a7612515f7d045825fb174a1efb1ca59db2a Mon Sep 17 00:00:00 2001 From: "H. Shay" Date: Thu, 16 Dec 2021 11:44:50 -0800 Subject: [PATCH 5/5] add py310 to tox env list --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 769e42219c27..2ffca14b2278 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = packaging, py37, py38, py39, check_codestyle, check_isort +envlist = packaging, py37, py38, py39, py310, check_codestyle, check_isort # we require tox>=2.3.2 for the fix to https://github.com/tox-dev/tox/issues/208 minversion = 2.3.2