Merge pull request #2 from jackuoll/add-expected-workers-command

Remove python 3.6 and django 2.2 as they are causing travis ci to fail
NZME · Jul 23, 2019 · 1a56577 · 1a56577
2 parents 8ae74e9 + bb1fcdc
commit 1a56577
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,17 +6,12 @@ python:
   - "3.5"
 
 env: 
-  - TOX_ENV=py36-django-18
   - TOX_ENV=py35-django-18
   - TOX_ENV=py27-django-18
-  - TOX_ENV=py36-django-19
   - TOX_ENV=py35-django-19
   - TOX_ENV=py27-django-19
-  - TOX_ENV=py36-django-111
   - TOX_ENV=py35-django-111
   - TOX_ENV=py27-django-111
-  - TOX_ENV=py36-django-22
-  - TOX_ENV=py35-django-22
 
 matrix:
   fast_finish: true

diff --git a/tox.ini b/tox.ini
@@ -1,9 +1,8 @@
 [tox]
 envlist =
-    {py27,py35,py36}-django-18
-    {py27,py35,py36}-django-19
-    {py27,py35,py36}-django-111
-    {py35,py36}-django-22
+    {py27,py35}-django-18
+    {py27,py35}-django-19
+    {py27,py35}-django-111
 
 [testenv]
 setenv =
@@ -13,9 +12,7 @@ deps =
     django-18: Django>=1.8,<1.9
     django-19: Django>=1.9,<1.10
     django-111: Django>=1.11,<2.0
-    django-22: Django>=2.2,<2.3
     -r{toxinidir}/requirements_test.txt
 basepython =
-    py36: python3.6
     py35: python3.5
     py27: python2.7