summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author= <maarcin.gebala@gmail.com>2017-10-03 17:54:53 +0200
committer= <maarcin.gebala@gmail.com>2017-10-03 17:54:53 +0200
commita8bac698375d268a17e447144ff5c059e689a059 (patch)
treed86e87dab6ab1b71b2afc12993efcac5d63ec29d
parentd6ed72244b27596c4c5ba92cb1278a1524d229f7 (diff)
downloaddjango-payments-taler-a8bac698375d268a17e447144ff5c059e689a059.tar.gz
django-payments-taler-a8bac698375d268a17e447144ff5c059e689a059.tar.bz2
django-payments-taler-a8bac698375d268a17e447144ff5c059e689a059.zip
Update test envs: drop django<1.11; add django>=2.0
-rw-r--r--.travis.yml18
-rw-r--r--tox.ini5
2 files changed, 11 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml
index 3084b34..a49faa9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,24 +5,24 @@ install:
script:
- tox
env:
- - TOXENV=py27-django18
- - TOXENV=py27-django110
- TOXENV=py27-django111
- - TOXENV=py34-django18
- - TOXENV=py34-django110
- TOXENV=py34-django111
+ - TOXENV=py34-django20
- TOXENV=py34-django_master
- - TOXENV=py35-django18
- - TOXENV=py35-django110
- TOXENV=py35-django111
+ - TOXENV=py35-django20
- TOXENV=py35-django_master
+ - TOXENV=py36-django111
+ - TOXENV=py36-django20
+ - TOXENV=py36-django_master
matrix:
allow_failures:
- - env: TOXENV=py27-django111
- - env: TOXENV=py34-django111
- - env: TOXENV=py35-django111
+ - env: TOXENV=py34-django20
- env: TOXENV=py34-django_master
+ - env: TOXENV=py35-django20
- env: TOXENV=py35-django_master
+ - env: TOXENV=py36-django20
+ - env: TOXENV=py36-django_master
after_success:
- codecov
addons:
diff --git a/tox.ini b/tox.ini
index 22a5672..57fef32 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,13 +1,12 @@
[tox]
-envlist = py{27,34,35}-django{18,110,111} py{34,35}-django_master
+envlist = py27-django111 py{34,35,36}-django{111,20,_master}
[testenv]
usedevelop=True
deps=
coverage
- django18: django>=1.8,<1.9a0
- django110: django>=1.10,<1.11a0
django111: django>=1.11a1,<1.12
+ django20: Django>=2.0a1,<2.1
django_master: https://github.com/django/django/archive/master.tar.gz
mock
pytest