Skip to content

Commit

Permalink
Updated CI matrix. (#1074)
Browse files Browse the repository at this point in the history
* Stopped testing against Django 3.0.
* Stopped testing against Python 3.5.
* Added Python 3.10 to test matrix.
  • Loading branch information
carltongibson committed Nov 22, 2021
1 parent e1229c1 commit d697fba
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 18 deletions.
16 changes: 4 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ jobs:
fail-fast: false
matrix:
versions:
- python: 3.5
toxenv: py35-2.2.X
- python: 3.6
toxenv: py36-2.2.X
- python: 3.7
Expand All @@ -24,15 +22,6 @@ jobs:
- python: 3.9
toxenv: py39-2.2.X

- python: 3.6
toxenv: py36-3.0.X
- python: 3.7
toxenv: py37-3.0.X
- python: 3.8
toxenv: py38-3.0.X
- python: 3.9
toxenv: py39-3.0.X

- python: 3.6
toxenv: py36-3.1.X
- python: 3.7
Expand All @@ -50,12 +39,15 @@ jobs:
toxenv: py38-3.2.X
- python: 3.9
toxenv: py39-3.2.X
- python: "3.10"
toxenv: py310-3.2.X

- python: 3.8
toxenv: py38-4.0.X
- python: 3.9
toxenv: py39-4.0.X

- python: "3.10"
toxenv: py310-4.0.X

runs-on: ubuntu-latest
steps:
Expand Down
10 changes: 4 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
[tox]
envlist =
{py35,py36,py37,py38,py39}-2.2.X
{py36,py37,py38,py39}-3.0.X
{py36,py37,py38,py39}-2.2.X
{py36,py37,py38,py39}-3.1.X
{py36,py37,py38,py39}-3.2.X
{py38,py39}-4.0.X
{py36,py37,py38,py39,py310}-3.2.X
{py38,py39,,py310}-4.0.X
[testenv]
basepython =
py35: python3.5
py36: python3.6
py37: python3.7
py38: python3.8
py39: python3.9
py310: python3.10
usedevelop = true
setenv =
CPPFLAGS=-O0
Expand All @@ -21,7 +20,6 @@ commands =
make test
deps =
2.2.X: Django>=2.2,<2.3
3.0.X: Django>=3.0,<3.1
3.1.X: Django>=3.1,<3.2
3.2.X: Django>=3.2,<4.0
4.0.X: Django>=4.0a1,<5.0
Expand Down

0 comments on commit d697fba

Please sign in to comment.