Merge pull request #68 from goodtune/test-pypy

Add pypy testing
revsys · Nov 1, 2017 · 2632fe0 · 2632fe0
2 parents c673276 + e5566f2
commit 2632fe0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,8 @@ python:
   - "3.4"
   - "3.5"
   - "3.6"
+  - "pypy"
+  - "pypy3"
 
 install:
   - pip install tox-travis

diff --git a/tox.ini b/tox.ini
@@ -1,23 +1,17 @@
 [tox]
 envlist =
-    py{27}-dj{18,19,110,111}
-    py{34}-dj{18,19,110,111,20}
+    py{27,py}-dj{18,19,110,111}
+    py{34,py3}-dj{18,19,110,111,20}
     py{35}-dj{18,19,110,111,20}
     py{36}-dj{111,20}
-    py{27}-dj{18,19,110,111}-drf
-    py{34}-dj{18,19,110,111,20}-drf
+    py{27,py}-dj{18,19,110,111}-drf
+    py{34,py3}-dj{18,19,110,111,20}-drf
     py{35}-dj{18,19,110,111,20}-drf
     py{36}-dj{111,20}-drf
 
 skip_missing_interpreters = True
 
 [testenv]
-basepython =
-    py27: python2.7
-    py34: python3.4
-    py35: python3.5
-    py36: python3.6
-
 deps =
     dj18: Django<1.9
     dj19: Django<1.10