summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlton Gibson <carlton.gibson@noumenal.es>2016-03-19 20:31:31 +0100
committerCarlton Gibson <carlton.gibson@noumenal.es>2016-03-19 20:37:26 +0100
commit774ac5aa635e49136d28706d2c500677df727ab6 (patch)
tree87e6d794df163e7c784fd8b9e0861cd158e99623
parentd82f0f3e67842dfca657cf18473ae08d5016735c (diff)
downloaddjango-appconf-774ac5aa635e49136d28706d2c500677df727ab6.tar.gz
Drop EOL Django versions from Travis
-rw-r--r--.travis.yml8
-rw-r--r--tox.ini15
2 files changed, 5 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml
index c5ac896..f81ed9b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,18 +2,12 @@ sudo: false
language: python
env:
- TOXENV=flake8-py27
- - TOXENV=flake8-py33
- - TOXENV=py26-dj14
- - TOXENV=py27-dj14
- - TOXENV=py27-dj17
+ - TOXENV=flake8-py34
- TOXENV=py27-dj18
- TOXENV=py27-dj19
- TOXENV=py27-dj110
- - TOXENV=py32-dj17
- TOXENV=py32-dj18
- - TOXENV=py33-dj17
- TOXENV=py33-dj18
- - TOXENV=py34-dj17
- TOXENV=py34-dj18
- TOXENV=py34-dj19
- TOXENV=py34-dj110
diff --git a/tox.ini b/tox.ini
index 65c47ce..ad05c03 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,15 +4,13 @@ usedevelop = True
minversion = 1.8
envlist =
flake8-py27,
- flake8-py33,
- py{26,27}-dj14,
- py{27,32,33,34}-dj{17,18},
+ flake8-py34,
+ py{27,32,33,34}-dj18,
py{27,34,35}-dj19,
py{27,34,35}-dj110
[testenv]
basepython =
- py26: python2.6
py27: python2.7
py32: python3.2
py33: python3.3
@@ -25,14 +23,9 @@ setenv =
DJANGO_SETTINGS_MODULE=tests.test_settings
deps =
flake8
- py{26,27,33,34,35,pypy}: coverage
+ py{27,33,34,35,pypy}: coverage
py32: coverage==3.7.1 # latest coverage support py3.2
django-discover-runner
- dj13: https://github.com/django/django/archive/stable/1.3.x.zip#egg=django
- dj14: https://github.com/django/django/archive/stable/1.4.x.zip#egg=django
- dj15: https://github.com/django/django/archive/stable/1.5.x.zip#egg=django
- dj16: https://github.com/django/django/archive/stable/1.6.x.zip#egg=django
- dj17: https://github.com/django/django/archive/stable/1.7.x.zip#egg=django
dj18: https://github.com/django/django/archive/stable/1.8.x.tar.gz#egg=django
dj19: https://github.com/django/django/archive/stable/1.9.x.tar.gz#egg=django
dj110: https://github.com/django/django/archive/master.tar.gz#egg=django
@@ -45,7 +38,7 @@ commands =
commands = flake8 appconf
deps = flake8
-[testenv:flake8-py33]
+[testenv:flake8-py34]
commands = flake8 appconf
deps = flake8