Merge pull request #92 from jerrykan/python35

Add py35 environment to tox/travis.
2016-04-13 10:42:19 -03:00 · 2016-04-13 10:42:19 -03:00 · 10a7e85c19
parent 32950bc655 31632442bd
commit 10a7e85c19
2 changed files with 6 additions and 1 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -2,10 +2,15 @@ language: python
 python:
  - "2.7"
  - "3.4"
+  - "3.5"
 env:
  - DJANGO=1.7
  - DJANGO=1.8
  - DJANGO=1.9
+matrix:
+  exclude:
+    - python: "3.5"
+      env: DJANGO=1.7
 install:
  - pip install -q django==$DJANGO
  - pip install -e .
--- a/tox.ini
+++ b/tox.ini
@ -1,7 +1,7 @@
 [tox]

 envlist=
-    clean,py{27,34}-django{17,18,19},stats
+    clean,py{27,34}-django{17,18,19},py35-django{18,19},stats

 [testenv]