From 6afba68e6b001230bdfba7bb44df82a388730ed8 Mon Sep 17 00:00:00 2001
From: Akihiro Motoki <amotoki@gmail.com>
Date: Tue, 12 Jun 2018 23:56:30 +0900
Subject: [PATCH] Add python3 django 1.11 job instead of django 2.0 job

Django 2.0 is now used in tox py35 job, so there is no need for
py35dj20 job. Instead, Django 1.11 with python3 is not covered.

- py35dj20 job is dropped from tox.ini.
- python3-django111 is added to tox.ini.
  python3 is specified to basepython to avoid a specific python version.
- .zuul.yaml is updated to consume horizon-openstack-tox-python3-django111
  and drop horizon-openstack-tox-py35dj20.

Change-Id: I46bff5b942a31b2c33679e2f4414e003510f2687
---
 .zuul.yaml | 8 ++------
 tox.ini    | 8 ++++----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index f6c1ef6..afda607 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -4,14 +4,10 @@
         - openstack-tox-lower-constraints:
             required-projects:
               - openstack/horizon
-        - horizon-openstack-tox-py35dj20:
-            required-projects:
-              openstack/horizon
+        - horizon-openstack-tox-python3-django111
     gate:
       jobs:
         - openstack-tox-lower-constraints:
             required-projects:
               - openstack/horizon
-        - horizon-openstack-tox-py35dj20:
-            required-projects:
-              openstack/horizon
+        - horizon-openstack-tox-python3-django111
diff --git a/tox.ini b/tox.ini
index aef13f9..fdf08a9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -30,11 +30,11 @@ commands =
   coverage xml --omit '.tox/cover/*' -o 'cover/coverage.xml'
   coverage html --omit '.tox/cover/*' -d 'cover/htmlcov'
 
-[testenv:py35dj20]
-basepython = python3.5
+[testenv:py3-dj111]
+basepython = python3
 commands =
-  pip install django>=2.0,<2.1
-  python manage.py test {posargs} --settings=blazar_dashboard.test.settings
+  pip install django>=1.11,<2
+  {[testenv]commands}
 
 [testenv:eslint]
 whitelist_externals = npm