Merge pull request #270 from johngian/fix-ci

Fix CI
mozilla · Aug 9, 2018 · 25776ef · 25776ef
2 parents be2eb1e + 70305ff
commit 25776ef
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -73,7 +73,15 @@ jobs:
         name: testoidcsetup
         environment:
           - TEST_OIDC_ALGO=rs
-          - DJANGO_VERSION=Django>=2.0.0
+          - DJANGO_VERSION=Django>=2.0.0,<2.1
+    <<: *common_steps
+  e2e_test_py3_rs_django210:
+    docker:
+      - image: mozillaparsys/oidc_e2e_setup:py3
+        name: testoidcsetup
+        environment:
+          - TEST_OIDC_ALGO=rs
+          - DJANGO_VERSION=Django>=2.1.0,<2.2
     <<: *common_steps
   e2e_test_py2_hs_django111:
     docker:
@@ -97,7 +105,15 @@ jobs:
         name: testoidcsetup
         environment:
           - TEST_OIDC_ALGO=hs
-          - DJANGO_VERSION=Django>=2.0.0
+          - DJANGO_VERSION=Django>=2.0.0,<2.1
+    <<: *common_steps
+  e2e_test_py3_hs_django210:
+    docker:
+      - image: mozillaparsys/oidc_e2e_setup:py3
+        name: testoidcsetup
+        environment:
+          - TEST_OIDC_ALGO=hs
+          - DJANGO_VERSION=Django>=2.1.0,<2.2
     <<: *common_steps
 
 workflows:

diff --git a/tox.ini b/tox.ini
@@ -2,14 +2,16 @@
 envlist =
     lint
     py{27,34,35,36}-django111
-    py{34,35,36}-django200
+    py{34,35,36,37}-django200
+    py{35,36,37}-django210
 
 [travis]
 python =
   2.7: py27
   3.4: py34
   3.5: py35
-  3.6: py36, coverage, lint
+  3.6: py36
+  3.7: py37, coverage, lint
 
 [testenv]
 commands = django-admin.py test
@@ -20,8 +22,10 @@ deps =
     -r{toxinidir}/tests/requirements.txt
     django111: Django>=1.11,<2.0.0
     django111: djangorestframework>=3.4
-    django200: Django>=2.0.0
+    django200: Django>=2.0.0,<2.1
     django200: djangorestframework>=3.7
+    django210: Django>=2.1.0,<2.2
+    django210: djangorestframework>=3.7
 
 [testenv:coverage]
 commands =