From d6a59f8f80ce16ff1005a8cb737311e3192a8c7d Mon Sep 17 00:00:00 2001
From: Shu Muto <shu.mutow@gmail.com>
Date: Thu, 14 Jun 2018 13:20:44 +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.
- py3-dj111 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.

Also, change basepython from python3.5 to python3 for docs and js jobs.

Change-Id: I04d3d4c3520150293951fb5e09e7d4513a1ca1ca
---
 {{cookiecutter.repo_name}}/.zuul.yaml |  8 ++-----
 {{cookiecutter.repo_name}}/tox.ini    | 32 +++++++++++++--------------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/{{cookiecutter.repo_name}}/.zuul.yaml b/{{cookiecutter.repo_name}}/.zuul.yaml
index c7ead66..840ece9 100644
--- a/{{cookiecutter.repo_name}}/.zuul.yaml
+++ b/{{cookiecutter.repo_name}}/.zuul.yaml
@@ -1,9 +1,7 @@
 - project:
     check:
       jobs:
-        - horizon-openstack-tox-py35dj20:
-            required-projects:
-              openstack/horizon
+        - horizon-openstack-tox-python3-django111
         - nodejs-npm-run-lint:
             vars:
               node_version: 4
@@ -16,9 +14,7 @@
               openstack/horizon
     gate:
       jobs:
-        - horizon-openstack-tox-py35dj20:
-            required-projects:
-              openstack/horizon
+        - horizon-openstack-tox-python3-django111
         - nodejs-npm-run-lint:
             vars:
               node_version: 4
diff --git a/{{cookiecutter.repo_name}}/tox.ini b/{{cookiecutter.repo_name}}/tox.ini
index a9dd5dc..fe1648c 100644
--- a/{{cookiecutter.repo_name}}/tox.ini
+++ b/{{cookiecutter.repo_name}}/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = pep8,py27-local,py35-local,py35dj20-local,eslint,karma-local,docs-local,releasenotes
+envlist = pep8,py27-local,py35-local,py3-dj111-local,eslint,karma-local,docs-local,releasenotes
 minversion = 2.3.2
 skipsdist = True
 
@@ -29,7 +29,7 @@ commands =
 commands = {posargs}
 
 [testenv:pep8]
-basepython = python3.5
+basepython = python3
 commands = flake8 {posargs}
 
 [flake8]
@@ -37,6 +37,7 @@ exclude = .venv,.git,.tox,dist,*lib/python*,*egg,build,node_modules
 max-complexity = 20
 
 [testenv:cover]
+basepython = python3
 commands =
   coverage erase
   coverage run {toxinidir}/manage.py test {{cookiecutter.module_name}} --settings={{cookiecutter.module_name}}.test.settings {posargs} --exclude-dir={{cookiecutter.module_name}}/test/integration_tests {posargs}
@@ -46,9 +47,6 @@ commands =
 # NOTE(shu-mutow): On CI infra, horizon will be installed
 # according to job setting. but on local, we need to install
 # horizon from master branch.
-[testenv:py27]
-basepython = python2.7
-
 [testenv:py27-local]
 basepython = python2.7
 commands =
@@ -61,21 +59,21 @@ commands =
   {[testenv:hz-local]commands}
   {[testenv]commands}
 
-[testenv:py35dj20]
-basepython = python3.5
+[testenv:py3-dj111]
+basepython = python3
 commands =
-  {[testenv:hz-local]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]
-basepython = python3.5
+basepython = python3
 whitelist_externals =
   npm
 commands =
@@ -86,7 +84,7 @@ commands =
 # from master branch into py35 environment for testing javascripts.
 # Horizon from master is needed to be cloned into ../horizon on both local and CI.
 [testenv:karma]
-basepython = python3.5
+basepython = python3
 whitelist_externals =
   {[testenv:eslint]whitelist_externals}
 commands =
@@ -94,14 +92,14 @@ commands =
   npm run test
 
 [testenv:karma-local]
-basepython = python3.5
+basepython = python3
 whitelist_externals =
   {[testenv:eslint]whitelist_externals}
 commands =
   {[testenv:karma]commands}
 
 [testenv:docs]
-basepython = python3.5
+basepython = python3
 deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
   -r{toxinidir}/doc/requirements.txt
@@ -109,7 +107,7 @@ commands=
   sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:docs-local]
-basepython = python3.5
+basepython = python3
 deps =
   {[testenv:docs]deps}
 commands=
@@ -117,7 +115,7 @@ commands=
   {[testenv:docs]commands}
 
 [testenv:releasenotes]
-basepython = python3.5
+basepython = python3
 deps =
   {[testenv:docs]deps}
 commands =