Merge pull request #138 from cclauss/patch-2

Testing both Python 2 and Python 3
swisscom · Jul 5, 2017 · c9c9bf0 · c9c9bf0
2 parents a6eaf2b + d2de03c
commit c9c9bf0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,13 @@
 language: python
-python: "2.7"
+python:
+  - "2.7"
+  - "3.6"
 
 env:
   - TOX_ENV=py27-django18-pg
   - TOX_ENV=py27-django18-sqlite
-  - TOX_ENV=py34-django18-pg
-  - TOX_ENV=py34-django18-sqlite
+  - TOX_ENV=py36-django18-pg
+  - TOX_ENV=py36-django18-sqlite
 
 # Enable PostgreSQL usage
 addons:
@@ -14,6 +16,7 @@ addons:
 # Dependencies
 install:
   - pip install tox
+  - pip install tox-travis
   - pip install coveralls
 
 # Ensure PostgreSQL-DB to be configured correctly
@@ -25,7 +28,7 @@ before_script:
 
 # Run tests
 script:
-  tox -e $TOX_ENV
+  tox
 
 # Run coveralls
 after_success:

diff --git a/tox.ini b/tox.ini
@@ -5,7 +5,7 @@
 
 [tox]
 envlist =
-	py{27,34}-django{18}-{sqlite,pg}
+	py{27,36}-django{18}-{sqlite,pg}
 
 [testenv]
 deps =