Skip to content

Commit a82b5fc

Browse files
committed
Complete the test matrix for all supported Python/Django versions
Tox and Travis CI now test all supported versions of Python and Django. Tox no longer fails if Django master fails. As master is always in flux, it is guaranteed to pass. Document all of these supported version as trove classifiers. Allows library consumers to easily scan for available support.
1 parent a43bd5d commit a82b5fc

File tree

3 files changed

+47
-15
lines changed

3 files changed

+47
-15
lines changed

.travis.yml

Lines changed: 35 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,43 @@
11
language: python
22

3-
python:
4-
- "2.7"
5-
- "3.5"
6-
73
sudo: false
84

9-
env:
10-
- TOX_ENV=django18
11-
- TOX_ENV=django19
12-
- TOX_ENV=django110
13-
- TOX_ENV=django111
14-
- TOX_ENV=djangomaster
15-
165
matrix:
17-
fast_finish: true
18-
allow_failures:
19-
- env: TOX_ENV=djangomaster
6+
include:
7+
- python: 2.7
8+
env: TOX_ENV=py27-django18
9+
- python: 3.3
10+
env: TOX_ENV=py33-django18
11+
- python: 3.4
12+
env: TOX_ENV=py34-django18
13+
- python: 2.7
14+
env: TOX_ENV=py27-django19
15+
- python: 3.4
16+
env: TOX_ENV=py34-django19
17+
- python: 3.5
18+
env: TOX_ENV=py35-django19
19+
- python: 2.7
20+
env: TOX_ENV=py27-django110
21+
- python: 3.4
22+
env: TOX_ENV=py34-django110
23+
- python: 3.5
24+
env: TOX_ENV=py35-django110
25+
- python: 2.7
26+
env: TOX_ENV=py27-django111
27+
- python: 3.4
28+
env: TOX_ENV=py34-django111
29+
- python: 3.5
30+
env: TOX_ENV=py35-django111
31+
- python: 3.6
32+
env: TOX_ENV=py36-django111
33+
- python: 3.5
34+
env: TOX_ENV=py35-djangomaster
35+
- python: 3.6
36+
env: TOX_ENV=py36-djangomaster
37+
fast_finish: true
38+
allow_failures:
39+
- env: TOX_ENV=py35-djangomaster
40+
- env: TOX_ENV=py36-djangomaster
2041

2142
addons:
2243
apt:

setup.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ def read(*rnames):
4141
"Programming Language :: Python :: 2",
4242
"Programming Language :: Python :: 2.7",
4343
"Programming Language :: Python :: 3",
44+
"Programming Language :: Python :: 3.3",
45+
"Programming Language :: Python :: 3.4",
4446
"Programming Language :: Python :: 3.5",
47+
"Programming Language :: Python :: 3.6",
4548
"Topic :: Internet :: WWW/HTTP",
4649
"Topic :: Internet :: WWW/HTTP :: WSGI",
4750
"Topic :: Security",

tox.ini

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
[tox]
2-
envlist = py27-django{18,19,110,111}, py36-django{18,19,110,111,master}
2+
envlist =
3+
py{27,33,34,35}-django18
4+
py{27,34,35}-django19
5+
py{27,34,35}-django110
6+
py{27,34,35,36}-django111
7+
py{35,36}-djangomaster
38

49
[testenv]
510
commands =
@@ -11,3 +16,6 @@ deps =
1116
django110: Django>=1.10,<1.11
1217
django111: Django>=1.11,<2.0
1318
djangomaster: https://github.com/django/django/archive/master.tar.gz
19+
20+
ignore_outcome =
21+
djangomaster: True

0 commit comments

Comments
 (0)