Fix reqs for tox, add DRF to envs

carltongibson · Sep 20, 2016 · 69f6cf8 · 69f6cf8
1 parent cff0b7c
commit 69f6cf8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,7 +18,7 @@ env:
   - DJANGO="django>=1.8.0,<1.9.0" REST_FRAMEWORK="djangorestframework>=3.3,<3.4"
 
 install:
-  - travis_retry pip install -Ur requirements/travis-ci.txt
+  - travis_retry pip install -Ur requirements/test-ci.txt
   - travis_retry pip install $DJANGO $REST_FRAMEWORK
 
 script:

diff --git a/requirements/travis-ci.txt → requirements/test-ci.txt b/requirements/travis-ci.txt → requirements/test-ci.txt
diff --git a/tox.ini b/tox.ini
@@ -1,8 +1,8 @@
 [tox]
 envlist =
-       {py27,py33,py34,py35}-django18,
-       {py27,py34,py35}-django{19,110},
-       {py27,py34,py35}-django-latest
+       {py27,py33,py34,py35}-django18-restframework{33,34},
+       {py27,py34,py35}-django{19,110}-restframework34,
+       {py27,py34,py35}-django-latest-restframework34
 
 
 [testenv]
@@ -21,4 +21,6 @@ deps =
     django19: django>=1.9.0,<1.10.0
     django110: django>=1.10.0,<1.11.0
     django-latest: https://github.com/django/django/archive/master.tar.gz
-    -rrequirements/test.txt
+    restframework33: djangorestframework>=3.3,<3.4
+    restframework34: djangorestframework>=3.4,<3.5
+    -rrequirements/test-ci.txt