aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml58
-rw-r--r--tox.ini14
2 files changed, 42 insertions, 30 deletions
diff --git a/.travis.yml b/.travis.yml
index a49faa9..65c0ad3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,34 +1,32 @@
-language: python
sudo: false
-install:
- - pip install tox codecov
-script:
- - tox
+language: python
+python:
+ - "2.7"
+ - "3.4"
+ - "3.5"
+ - "3.6"
env:
- - TOXENV=py27-django111
- - TOXENV=py34-django111
- - TOXENV=py34-django20
- - TOXENV=py34-django_master
- - TOXENV=py35-django111
- - TOXENV=py35-django20
- - TOXENV=py35-django_master
- - TOXENV=py36-django111
- - TOXENV=py36-django20
- - TOXENV=py36-django_master
+ - DJANGO="1.11"
+ - DJANGO="2.0"
+ - DJANGO="master"
matrix:
allow_failures:
- - 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:
- apt:
- sources:
- - deadsnakes
- packages:
- - python3.5
- - python3.5-dev
+ - python: "2.7"
+ env: DJANGO="2.0"
+ - python: "2.7"
+ env: DJANGO="master"
+ - python: "3.4"
+ env: DJANGO="2.0"
+ - python: "3.4"
+ env: DJANGO="master"
+ - python: "3.5"
+ env: DJANGO="2.0"
+ - python: "3.5"
+ env: DJANGO="master"
+ - python: "3.6"
+ env: DJANGO="2.0"
+ - python: "3.6"
+ env: DJANGO="master"
+after_success: codecov
+install: pip install tox-travis codecov
+script: tox
diff --git a/tox.ini b/tox.ini
index 57fef32..61030ec 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,3 +16,17 @@ commands=coverage run setup.py test
[pytest]
testpaths = payments
DJANGO_SETTINGS_MODULE = test_settings
+
+[travis]
+python =
+ 2.7: py27
+ 3.4: py34
+ 3.5: py35
+ 3.6: py36
+unignore_outcomes = True
+
+[travis:env]
+DJANGO =
+ 1.11: django111
+ 2.0: django2.0
+ master: django_master