Add support for ussuri

Add support for stable/ussuri branch

Change-Id: I24fd7eac29d034a44499210fa9751044eabcecf5

.zuul.yaml

@@ -14,34 +14,42 @@
         - openstack-tox-pep8:
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/train
-        - openstack-tox-py27:
-            required-projects:
-              - name: openstack/requirements
-                override-checkout: stable/train
+                override-checkout: stable/ussuri
         - openstack-tox-py35:
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/train
+                override-checkout: stable/ussuri
+        - openstack-tox-py36:
+            required-projects:
+              - name: openstack/requirements
+                override-checkout: stable/ussuri
+        - openstack-tox-py37:
+            required-projects:
+              - name: openstack/requirements
+                override-checkout: stable/ussuri
         - test-release-openstack:
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/train
+                override-checkout: stable/ussuri
     gate:
       jobs:
         - openstack-tox-pep8:
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/train
-        - openstack-tox-py27:
-            required-projects:
-              - name: openstack/requirements
-                override-checkout: stable/train
+                override-checkout: stable/ussuri
         - openstack-tox-py35:
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/train
+                override-checkout: stable/ussuri
+        - openstack-tox-py36:
+            required-projects:
+              - name: openstack/requirements
+                override-checkout: stable/ussuri
+        - openstack-tox-py37:
+            required-projects:
+              - name: openstack/requirements
+                override-checkout: stable/ussuri
         - test-release-openstack:
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/train
+                override-checkout: stable/ussuri

doc/requirements.txt

@@ -7,7 +7,6 @@
 # be installed in a specific order.
 openstackdocstheme>=1.18.1 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
 sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
 
 # The below is rewquired to build testing module reference

setup.cfg

@@ -13,8 +13,6 @@ classifier =
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
     Programming Language :: Python
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.3
     Programming Language :: Python :: 3.4

tox.ini

@@ -1,9 +1,10 @@
 [tox]
-envlist = py26,py27,pep8,py35,py3-dj111
+envlist = pep8,py35,py36,py37,py3-dj111
 minversion = 2.3.2
 skipsdist = True
 
 [testenv]
+basepython = python3
 usedevelop = True
 install_command = pip install {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
@@ -11,13 +12,12 @@ setenv = VIRTUAL_ENV={envdir}
 # random hash seed successfully.
          PYTHONHASHSEED=0
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train}
+    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
 commands = /bin/bash run_tests.sh -N --no-pep8 {posargs}
 
 [testenv:pep8]
-basepython = python3
 # NOTE: Due to doc dependencies, we don't share envdir with "venv".
 # sphinx (precisely Pygments) needs to be installed to make doc8 work properly
 deps =
@@ -30,11 +30,9 @@ commands =
   /bin/bash run_tests.sh -N --pep8
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [testenv:cover]
-basepython = python3
 envdir = {toxworkdir}/venv
 commands =
   coverage erase
@@ -43,31 +41,12 @@ commands =
   coverage xml
   coverage html
 
-[testenv:py27dj14]
-basepython = python2.7
-commands = pip install django>=1.4,<1.5
-           /bin/bash run_tests.sh -N --no-pep8 {posargs}
-
-[testenv:py27dj15]
-basepython = python2.7
-commands = pip install django>=1.5,<1.6
-           /bin/bash run_tests.sh -N --no-pep8 {posargs}
-
-[testenv:py27integration]
-basepython = python2.7
-commands = /bin/bash run_tests.sh -N --integration --selenium-headless {posargs}
-
-[testenv:py26integration]
-basepython = python2.6
-commands = /bin/bash run_tests.sh -N --integration --selenium-headless {posargs}
-
 [testenv:jshint]
 commands = nodeenv -p
            npm install jshint -g
            /bin/bash run_tests.sh -N --jshint
 
 [testenv:docs]
-basepython = python3
 # We need to install horizon dependecies to build module references
 deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train}
@@ -77,17 +56,14 @@ setenv = DJANGO_SETTINGS_MODULE=openstack_dashboard.test.settings
 commands = python setup.py build_sphinx
 
 [testenv:py3-dj21]
-basepython = python3
 commands = pip install django>=2.1<2.2
            /bin/bash run_tests.sh -N --no-pep8 {posargs}
 
 [testenv:py3-dj111]
-basepython = python3
 commands = pip install django>=1.11,<2
            /bin/bash run_tests.sh -N --no-pep8 {posargs}
 
 [testenv:py3integration]
-basepython = python3
 envdir = {toxworkdir}/venv
 # Run integration tests only
 setenv =