From 45c47fb9c0ab9cd37d9765fe815c6e00499c50ca Mon Sep 17 00:00:00 2001
From: Akihiro Motoki <amotoki@gmail.com>
Date: Wed, 13 Jun 2018 20:27:36 +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: I4bf1a19f46a895f3569d7a79739ac1a7ebf91cbc
---
 .zuul.yaml | 8 ++------
 tox.ini    | 8 ++++----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 40b372a..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 e30db45..9b5988d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py35,py27,pep8,py35dj20
+envlist = py35,py27,pep8
 minversion = 2.3.2
 skipsdist = True
 
@@ -35,10 +35,10 @@ 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
+  pip install django>=1.11,<2
   {[unit_tests]commands}
 
 [testenv:docs]