Skip to content

Commit 0e99bcf

Browse files
committed
Travis/tox: drop Python 3.3; shrink Travis matrix
Discontinue support/testing for Python 3.3 with Django 1.8. Closes #99 Focus Travis testing on currently-supported Django/Python combinations. (But keep a few older ones in the matrix, too.)
1 parent 3cadaca commit 0e99bcf

File tree

2 files changed

+17
-19
lines changed

2 files changed

+17
-19
lines changed

.travis.yml

+16-18
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,14 @@ matrix:
1313
include:
1414
- { env: LINT_AND_DOCS=true, python: 3.6 }
1515

16-
# Anymail supports the same python versions as Django, excluding Python 3.2, but adding pypy.
16+
# Anymail supports the same Python versions as Django, plus PyPy.
1717
# https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django
1818

1919
# Live API integration tests are only run on a few, representative Python/Django version
2020
# combinations, to avoid rapidly consuming the testing accounts' entire send allotments.
2121

22-
# Django 1.8: Python 2.7, 3.3, 3.4, 3.5
23-
- { env: DJANGO=1.8 RUN_LIVE_TESTS=true, python: 2.7 }
24-
- { env: DJANGO=1.8, python: 3.3 }
25-
- { env: DJANGO=1.8, python: 3.4 }
26-
- { env: DJANGO=1.8, python: 3.5 }
27-
- { env: DJANGO=1.8, python: pypy }
28-
# Django 1.9: Python 2.7, 3.4, 3.5
29-
- { env: DJANGO=1.9, python: 2.7 }
30-
- { env: DJANGO=1.9, python: 3.4 }
31-
- { env: DJANGO=1.9, python: 3.5 }
32-
- { env: DJANGO=1.9, python: pypy }
33-
# Django 1.10: Python 2.7, 3.4, 3.5
34-
- { env: DJANGO=1.10, python: 2.7 }
35-
- { env: DJANGO=1.10, python: 3.4 }
36-
- { env: DJANGO=1.10, python: 3.5 }
37-
- { env: DJANGO=1.10, python: pypy }
3822
# Django 1.11: Python 2.7, 3.4, 3.5, or 3.6
39-
- { env: DJANGO=1.11, python: 2.7 }
23+
- { env: DJANGO=1.11 RUN_LIVE_TESTS=true, python: 2.7 }
4024
- { env: DJANGO=1.11, python: 3.4 }
4125
- { env: DJANGO=1.11, python: 3.5 }
4226
- { env: DJANGO=1.11, python: 3.6 }
@@ -52,6 +36,20 @@ matrix:
5236
- { env: DJANGO=master, python: 3.6 }
5337
- { env: DJANGO=master, python: 3.7-dev }
5438

39+
# Obsolete Django versions (no longer supported by Django)
40+
# Anymail tries to support these, but doesn't test every possible combination...
41+
# Django 1.8: Python 2.7, 3.3, 3.4, 3.5
42+
- { env: DJANGO=1.8, python: 2.7 }
43+
- { env: DJANGO=1.8, python: 3.4 }
44+
- { env: DJANGO=1.8, python: 3.5 }
45+
- { env: DJANGO=1.8, python: pypy }
46+
# Django 1.9: Python 2.7, 3.4, 3.5
47+
- { env: DJANGO=1.9, python: 2.7 }
48+
- { env: DJANGO=1.9, python: 3.5 }
49+
# Django 1.10: Python 2.7, 3.4, 3.5
50+
- { env: DJANGO=1.10, python: 2.7 }
51+
- { env: DJANGO=1.10, python: 3.5 }
52+
5553
allow_failures:
5654
- env: DJANGO=2.1
5755
python: 3.5

tox.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ envlist =
1010
django111-py{27,34,35,36,py2}
1111
django110-py{27,34,35,py2}
1212
django19-py{27,34,35,py2}
13-
django18-py{33,34,35,py2}
13+
django18-py{34,35,py2}
1414
# ... then prereleases (if available):
1515
#django21-py{35,36}
1616
djangoMaster-py{36,37}

0 commit comments

Comments
 (0)