Merge pull request #16 from kako-nawao/issues-14-15

Add Python 3.6+Django 1.10 to build
kako-nawao · Mar 12, 2017 · 3f41844 · 3f41844
2 parents 7e9734a + e33e6d6
commit 3f41844
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,12 +6,17 @@ branches:
 # Build definition; language, deps, scripts
 language: python
 python:
-  - "3.5"
+  - 2.7
+  - 3.4
+  - 3.5
+  - 3.6
 install:
   - pip install -r requirements/dev.txt
-  - pip install coveralls
 script:
-  - tox
+  - if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then tox -e py27-dj18,py27-dj19,py27-dj110; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == 3.4 ]]; then tox -e py34-dj18,py34-dj19,py34-dj110; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then tox -e py35-dj18,py35-dj19,py35-dj110; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then tox -e py36-dj18,py36-dj19,py36-dj110; fi
 after_success:
+  - pip install coveralls
   - coveralls
-  - coverage erase
diff --git a/tox.ini b/tox.ini
@@ -1,10 +1,11 @@
 [tox]
-envlist = py{27,34,35}-dj{18,19}
+envlist = py{27,34,35,36}-dj{18,19,110}
 
 [testenv]
 deps =
     dj18: django==1.8
     dj19: django==1.9
+    dj110: django==1.10
     py27: mock
     factory_boy
     coverage