diff options
| author | Shay <hillerys@element.io> | 2021-12-21 11:37:04 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-21 11:37:04 -0800 |
| commit | 87da37374a68b935fe8a9378a7d369448461c128 (patch) | |
| tree | a1d4f717dcd02f0e403670c4da04f811f93d54a4 | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-87da37374a68b935fe8a9378a7d369448461c128.tar.xz | |
Drop EOL python 3.6 from CI (#11595)
* remove python 3.6 and postgres 9.6 from github workflow * remove python 3.6 env from tox * newsfragment * correct postgres version * add py310 to tox env list
| -rw-r--r-- | .github/workflows/tests.yml | 12 | ||||
| -rw-r--r-- | changelog.d/11595.misc | 1 | ||||
| -rw-r--r-- | tox.ini | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 21c9ee7823..cb72e1a233 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: "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: "10" - python-version: "3.10" postgres-version: "14" diff --git a/changelog.d/11595.misc b/changelog.d/11595.misc new file mode 100644 index 0000000000..57e54db5a9 --- /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 diff --git a/tox.ini b/tox.ini index cfe6a06942..2ffca14b22 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, 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 |