Skip to content

Commit

Permalink
Merge pull request #229 from pipermerriam/support-matrix-updates
Browse files Browse the repository at this point in the history
Update testing and support matrix
  • Loading branch information
blag authored Jan 8, 2020
2 parents 1b00814 + 8ee08a5 commit 14b405e
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 72 deletions.
57 changes: 26 additions & 31 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,37 +41,6 @@ matrix:
env: TOX_ENV=py27-with-tornado-falcon
- python: "2.7"
env: TOX_ENV=py27-with-werkzeug
# 3.4
- python: "3.4"
arch: arm64
env: TOX_ENV=py34
- python: "3.4"
arch: arm64
env: TOX_ENV=py34-with-django19
- python: "3.4"
arch: arm64
env: TOX_ENV=py34-with-django110
- python: "3.4"
arch: arm64
env: TOX_ENV=py34-with-django111
- python: "3.4"
arch: arm64
env: TOX_ENV=py34-with-tornado-falcon
- python: "3.4"
arch: arm64
env: TOX_ENV=py34-with-werkzeug
- python: "3.4"
env: TOX_ENV=py34
- python: "3.4"
env: TOX_ENV=py34-with-django19
- python: "3.4"
env: TOX_ENV=py34-with-django110
- python: "3.4"
env: TOX_ENV=py34-with-django111
- python: "3.4"
env: TOX_ENV=py34-with-tornado-falcon
- python: "3.4"
env: TOX_ENV=py34-with-werkzeug
# 3.5
- python: "3.5"
arch: arm64
Expand Down Expand Up @@ -165,6 +134,32 @@ matrix:
env: TOX_ENV=py37-with-tornado-falcon
- python: "3.7"
env: TOX_ENV=py37-with-werkzeug
# 3.8
- python: "3.8"
arch: arm64
env: TOX_ENV=py38
- python: "3.8"
arch: arm64
env: TOX_ENV=py38-with-django22
- python: "3.8"
arch: arm64
env: TOX_ENV=py38-with-django30
- python: "3.8"
arch: arm64
env: TOX_ENV=py38-with-tornado-falcon
- python: "3.8"
arch: arm64
env: TOX_ENV=py38-with-werkzeug
- python: "3.8"
env: TOX_ENV=py38
- python: "3.8"
env: TOX_ENV=py38-with-django22
- python: "3.8"
env: TOX_ENV=py38-with-django30
- python: "3.8"
env: TOX_ENV=py38-with-tornado-falcon
- python: "3.8"
env: TOX_ENV=py38-with-werkzeug
cache:
pip: true
install:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
],
)
73 changes: 33 additions & 40 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@ envlist=
py27-with-tornado-falcon,
py27-with-werkzeug,
py2-with-webob,
py34,
py34-with-django19,
py34-with-django110,
py34-with-django111,
py34-with-tornado-falcon,
py34-with-werkzeug,
py35,
py35-with-django19,
py35-with-django110,
Expand All @@ -31,6 +25,11 @@ envlist=
py37-with-django111,
py37-with-tornado-falcon,
py37-with-werkzeug,
py38,
py38-with-django22,
py38-with-django30,
py38-with-tornado-falcon,
py38-with-werkzeug,
py3-with-webob,
flake8

Expand Down Expand Up @@ -83,40 +82,6 @@ deps =
-r{toxinidir}/requirements-dev.txt
webob

[testenv:py34]
basepython=python3.4

[testenv:py34-with-django19]
basepython=python3.4
deps =
-r{toxinidir}/requirements-dev.txt
django>=1.9.0,<1.10.0

[testenv:py34-with-django110]
basepython=python3.4
deps =
-r{toxinidir}/requirements-dev.txt
django>=1.10.0,<1.11.0

[testenv:py34-with-django111]
basepython=python3.4
deps =
-r{toxinidir}/requirements-dev.txt
django>=1.11.0,<1.12.0

[testenv:py34-with-tornado-falcon]
basepython=python3.4
deps =
-r{toxinidir}/requirements-dev.txt
tornado
falcon

[testenv:py34-with-werkzeug]
basepython=python3.4
deps =
-r{toxinidir}/requirements-dev.txt
werkzeug

[testenv:py35]
basepython=python3.5

Expand Down Expand Up @@ -219,6 +184,34 @@ deps =
-r{toxinidir}/requirements-dev.txt
werkzeug

[testenv:py38]
basepython=python3.8

[testenv:py38-with-django22]
basepython=python3.8
deps =
-r{toxinidir}/requirements-dev.txt
django>=2.2.8,<2.3

[testenv:py38-with-django30]
basepython=python3.8
deps =
-r{toxinidir}/requirements-dev.txt
django>=3.0,<3.1

[testenv:py38-with-tornado-falcon]
basepython=python3.8
deps =
-r{toxinidir}/requirements-dev.txt
tornado
falcon

[testenv:py38-with-werkzeug]
basepython=python3.8
deps =
-r{toxinidir}/requirements-dev.txt
werkzeug

[testenv:py3-with-webob]
basepython=python3.5
deps =
Expand Down

0 comments on commit 14b405e

Please sign in to comment.