From f8a51b3e4ff4a0c851d23a8c247e38ac612e3718 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Wed, 30 Oct 2019 03:11:18 +0000
Subject: [PATCH] [ussuri][goal] Drop python 2.7 support and testing

OpenStack is dropping the py2.7 support in ussuri cycle.

zaqar-ui is ready with python 3 and ok to drop the
python 2.7 support.

Complete discussion & schedule can be found in
- http://lists.openstack.org/pipermail/openstack-discuss/2019-October/010142.html
- https://etherpad.openstack.org/p/drop-python2-support

Ussuri Communtiy-wide goal:
https://governance.openstack.org/tc/goals/selected/ussuri/drop-py27.html

Depends-On: https://review.opendev.org/#/c/693631/

Change-Id: Ia3f663e1271deb7a7aef6ee5fa1b17569fa5ce0e
---
 .zuul.yaml                                    |  2 +-
 doc/requirements.txt                          |  1 -
 .../notes/drop-py-2-7-d9e918f5c9f3bb33.yaml   |  6 ++++++
 setup.cfg                                     |  2 --
 tox.ini                                       | 20 ++-----------------
 5 files changed, 9 insertions(+), 22 deletions(-)
 create mode 100644 releasenotes/notes/drop-py-2-7-d9e918f5c9f3bb33.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index c748c07..2ed7c7f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -4,7 +4,7 @@
       - check-requirements
       - horizon-non-primary-django-jobs
       - horizon-nodejs10-jobs
-      - openstack-python-jobs-horizon
+      - openstack-python3-ussuri-jobs-horizon
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
     check:
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 68aab85..4049654 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -10,7 +10,6 @@
 mock>=2.0.0 # BSD
 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
 sphinxcontrib-apidoc>=0.2.0  # BSD
 
diff --git a/releasenotes/notes/drop-py-2-7-d9e918f5c9f3bb33.yaml b/releasenotes/notes/drop-py-2-7-d9e918f5c9f3bb33.yaml
new file mode 100644
index 0000000..d85d52f
--- /dev/null
+++ b/releasenotes/notes/drop-py-2-7-d9e918f5c9f3bb33.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    Python 2.7 support has been dropped. Last release of zaqar-ui
+    to support py2.7 is OpenStack Train. The minimum version of Python now
+    supported by zaqar-ui is Python 3.6.
diff --git a/setup.cfg b/setup.cfg
index 9d90535..48b4875 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,8 +14,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.6
 
diff --git a/tox.ini b/tox.ini
index 7966cfd..9e7c9dc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,10 @@
 [tox]
-envlist = pep8,py27-local,py3-{dj111,dj22},eslint,karma-local,docs-local,releasenotes,lower-constraints-local
+envlist = pep8,py3-{dj111,dj22},eslint,karma-local,docs-local,releasenotes,lower-constraints-local
 minversion = 2.3.2
 skipsdist = True
 
 [testenv]
+basepython = python3
 usedevelop = True
 setenv = VIRTUAL_ENV={envdir}
          NOSE_WITH_OPENSTACK=1
@@ -28,11 +29,9 @@ commands =
   pip install -e ../horizon
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [testenv:pep8]
-basepython = python3
 commands = flake8 {posargs}
 
 [flake8]
@@ -42,7 +41,6 @@ max-complexity = 20
 
 
 [testenv:cover]
-basepython = python3
 commands =
   coverage erase
   coverage run {toxinidir}/manage.py test zaqar_ui
@@ -52,12 +50,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-local]
-basepython = python2.7
-commands =
-  {[testenv:hz-local]commands}
-  {[testenv]commands}
-
 [testenv:py36-local]
 basepython = python3.6
 commands =
@@ -65,7 +57,6 @@ commands =
   {[testenv]commands}
 
 [testenv:eslint]
-basepython = python3
 whitelist_externals =
   npm
 commands =
@@ -76,7 +67,6 @@ commands =
 # from master branch into python3.x environment for testing javascripts.
 # Horizon from master is needed to be cloned into ../horizon on both local and CI.
 [testenv:karma]
-basepython = python3
 whitelist_externals =
   {[testenv:eslint]whitelist_externals}
 commands =
@@ -84,14 +74,12 @@ commands =
   npm run test
 
 [testenv:karma-local]
-basepython = python3
 whitelist_externals =
   {[testenv:eslint]whitelist_externals}
 commands =
   {[testenv:karma]commands}
 
 [testenv:docs]
-basepython = python3
 deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
   -r{toxinidir}/doc/requirements.txt
@@ -99,7 +87,6 @@ commands=
   sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:docs-local]
-basepython = python3
 deps =
   {[testenv:docs]deps}
 commands=
@@ -107,21 +94,18 @@ commands=
   {[testenv:docs]commands}
 
 [testenv:releasenotes]
-basepython = python3
 deps =
   {[testenv:docs]deps}
 commands =
   sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [testenv:lower-constraints]
-basepython = python3
 deps =
   -c{toxinidir}/lower-constraints.txt
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
 
 [testenv:lower-constraints-local]
-basepython = python3
 deps =
   {[testenv:lower-constraints]deps}
 commands =