From 9190e35dc6cd63e546eb446673fb4e2dd404ff80 Mon Sep 17 00:00:00 2001
From: Akihiro Motoki <amotoki@gmail.com>
Date: Wed, 13 Jun 2018 19:30:57 +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: Ib6f271d9cc8446875d6284a1f7d9f17aab90c47c
---
 .zuul.yaml |  8 ++------
 tox.ini    | 16 ++++++++--------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 4193d51b..22caa929 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,17 +1,13 @@
 - project:
     check:
       jobs:
-        - horizon-openstack-tox-py35dj20:
-            required-projects:
-              openstack/horizon
+        - horizon-openstack-tox-python3-django111
         - openstack-tox-lower-constraints:
             required-projects:
               openstack/horizon
     gate:
       jobs:
-        - horizon-openstack-tox-py35dj20:
-            required-projects:
-              openstack/horizon
+        - horizon-openstack-tox-python3-django111
         - openstack-tox-lower-constraints:
             required-projects:
               openstack/horizon
diff --git a/tox.ini b/tox.ini
index 76142afe..6f2359b0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = pep8,py27-local,py35-local,py35dj20-local,eslint,karma-local,docs-local,releasenotes,lower-constraints-local
+envlist = pep8,py27-local,py35-local,py3-dj111-local,eslint,karma-local,docs-local,releasenotes,lower-constraints-local
 minversion = 2.3.2
 skipsdist = True
 
@@ -60,17 +60,17 @@ commands =
   {[testenv:hz-local]commands}
   {[testenv]commands}
 
-[testenv:py35dj20]
-basepython = python3.5
+[testenv:py3-dj111]
+basepython = python3
 commands =
-  {[testenv:hz-local]commands}
-  {[testenv]commands}
+  pip install django>=1.11,<2
+    {[testenv]commands}
 
-[testenv:py35dj20-local]
-basepython = python3.5
+[testenv:py3-dj111-local]
+basepython = python3
 commands =
   {[testenv:hz-local]commands}
-  pip install -U django>=2.0,<2.1
+  pip install django>=1.11,<2
   {[testenv]commands}
 
 [testenv:eslint]