Tests always act on current Django version

Change-Id: Ia10c2c2d229b95c79eb59b9a64885ad1409540bb
Karaage-Cluster · Sep 13, 2017 · f3847bd · f3847bd
1 parent 53674a4
commit f3847bd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,14 +11,9 @@ addons:
     - ldap-utils
 
 env:
- - DJANGO_VERSION=1.11.5 DATABASE_URL=postgres://postgres@/spud
- - DJANGO_VERSION=master DATABASE_URL=postgres://postgres@/spud
-
- - DJANGO_VERSION=1.11.5 DATABASE_URL=mysql://root:@localhost/spud
- - DJANGO_VERSION=master DATABASE_URL=mysql://root:@localhost/spud
-
- - DJANGO_VERSION=1.11.5 DATABASE_URL=sqlite://
- - DJANGO_VERSION=master DATABASE_URL=sqlite://
+ - DATABASE_URL=postgres://postgres@/spud
+ - DATABASE_URL=mysql://root:@localhost/spud
+ - DATABASE_URL=sqlite://
 
 install:
 # Install django master or version
@@ -44,7 +39,3 @@ script:
 
 matrix:
   fast_finish: true
-  allow_failures:
-      - env: DJANGO_VERSION=master DATABASE_URL=postgres://postgres@/spud
-      - env: DJANGO_VERSION=master DATABASE_URL=mysql://root:@localhost/spud
-      - env: DJANGO_VERSION=master DATABASE_URL=sqlite://
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -18,3 +18,4 @@ django-environ==0.4.4
 six==1.10.0
 slimit==0.8.1
 whitenoise==3.3.0
+Django==1.11.5
diff --git a/requirements/docker.txt b/requirements/docker.txt
@@ -1,5 +1,4 @@
 -r usage.txt
 cracklib==2.9.3
-Django==1.11.5
 gunicorn==19.7.1
 mysqlclient==1.3.12
diff --git a/tox.ini b/tox.ini
@@ -1,8 +1,8 @@
 [tox]
 downloadcache = {toxworkdir}/cache/
 envlist =
-    py35-django111,
-    py36-django111,
+    py35,
+    py36,
 
 [testenv]
 passenv = DATABASE_URL
@@ -22,6 +22,5 @@ commands =
     ./manage.py collectstatic --settings="karaage.plugins.kgusage.tests.settings" -v 2 --noinput
     python ./manage.py test --settings="karaage.plugins.kgusage.tests.settings" -v 2 karaage.plugins.kgusage
 deps =
-    django111: django==1.11.5
     cracklib
     -rrequirements/tests.txt