From e3e9135fbaede7469a86d4aad2b5aaeb7ec0e37a Mon Sep 17 00:00:00 2001
From: Akihiro Motoki <amotoki@gmail.com>
Date: Wed, 13 Jun 2018 19:28:02 +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: I50713dab7f944cbb9cbead3f00c95be7bb9c623e
---
 .zuul.yaml |  8 ++------
 tox.ini    | 11 ++++++-----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 4e4562be..d0095843 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -6,17 +6,13 @@
         - 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
 
 - job:
     name: manila-ui-dsvm
diff --git a/tox.ini b/tox.ini
index 86a2d7bd..99cdf590 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py27,py35,pep8,py27dj19,py27dj110,py35dj20
+envlist = py27,py35,pep8,py27dj19,py27dj110,py3-dj111
 skipsdist = True
 
 [testenv]
@@ -40,10 +40,11 @@ basepython = python2.7
 commands = pip install django>=1.10,<1.11
            /bin/bash run_tests.sh -N --no-pep8 {posargs}
 
-[testenv:py35dj20]
-basepython = python3.5
-commands = pip install django>=2.0,<2.1
-           /bin/bash run_tests.sh -N --no-pep8 {posargs}
+[testenv:py3-dj111]
+basepython = python3
+commands =
+  pip install django>=1.11,<2
+  {[testenv]commands}
 
 [testenv:cover]
 commands = {toxinidir}/tools/cover.sh {posargs}