From 75fb547bdbabfd8c8794f80e6ae7ea1984bb4205 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Sat, 16 Nov 2019 00:27:02 +0000
Subject: [PATCH] [ussuri][goal] Drop python 2.7 support and testing

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

murano-pkg-check 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: I7b85365d357e37a10b501a8687fe86ded4b98095
---
 .zuul.yaml                                           |  3 +--
 doc/requirements.txt                                 |  1 -
 releasenotes/notes/drop-py-2-7-2ca7102bd0ea9a88.yaml |  6 ++++++
 setup.cfg                                            |  2 --
 test-requirements.txt                                |  1 -
 tox.ini                                              | 11 ++---------
 6 files changed, 9 insertions(+), 15 deletions(-)
 create mode 100644 releasenotes/notes/drop-py-2-7-2ca7102bd0ea9a88.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index f772b2c..24414e1 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,5 +3,4 @@
       - check-requirements
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
-      - openstack-python-jobs
-      - openstack-python3-train-jobs
+      - openstack-python3-ussuri-jobs
diff --git a/doc/requirements.txt b/doc/requirements.txt
index c88db2a..58c9a76 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,5 +1,4 @@
 # doc build requirements
-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,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD
 sphinxcontrib-httpdomain>=1.3.0 # BSD
 reno>=2.5.0 # Apache-2.0
diff --git a/releasenotes/notes/drop-py-2-7-2ca7102bd0ea9a88.yaml b/releasenotes/notes/drop-py-2-7-2ca7102bd0ea9a88.yaml
new file mode 100644
index 0000000..3f90fe0
--- /dev/null
+++ b/releasenotes/notes/drop-py-2-7-2ca7102bd0ea9a88.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    Python 2.7 support has been dropped. Last release of murano-pkg-check
+    to support python 2.7 is OpenStack Train. The minimum version of Python now
+    supported by murano-pkg-check is Python 3.6.
diff --git a/setup.cfg b/setup.cfg
index c9b5e10..9a269d4 100644
--- a/setup.cfg
+++ b/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.6
     Programming Language :: Python :: 3.7
diff --git a/test-requirements.txt b/test-requirements.txt
index 856557a..d871a96 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,7 +6,6 @@ hacking<0.12,>=0.11.0 # Apache-2.0
 
 coverage!=4.4,>=4.0 # Apache-2.0
 python-subunit>=1.0.0 # Apache-2.0/BSD
-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
 openstackdocstheme>=1.18.1 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 18b6418..6d2e160 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,10 @@
 [tox]
 minversion = 2.0
-envlist = py37,py27,pep8
+envlist = py37,pep8
 skipsdist = True
 
 [testenv]
+basepython = python3
 usedevelop = True
 whitelist_externals = bash
                       find
@@ -17,15 +18,12 @@ deps =
 commands = stestr run {posargs}
 
 [testenv:pep8]
-basepython = python3
 commands = flake8 {posargs}
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [testenv:cover]
-basepython = python3
 setenv =
     {[testenv]setenv}
     PYTHON=coverage run --source muranopkgcheck --parallel-mode
@@ -36,14 +34,12 @@ commands =
     coverage xml -o cover/coverage.xml
 
 [testenv:docs]
-basepython = python3
 deps = -r{toxinidir}/doc/requirements.txt
 commands =
     python tools/gen_errors.py
     python setup.py build_sphinx
 
 [testenv:pdf-docs]
-basepython = python3
 deps = {[testenv:docs]deps}
 whitelist_externals =
   make
@@ -53,12 +49,10 @@ commands =
 
 
 [testenv:releasenotes]
-basepython = python3
 commands =
   sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [testenv:debug]
-basepython = python3
 commands =
     find . -type f -name "*.pyc" -delete
     oslo_debug_helper -t muranopkgcheck/tests {posargs}
@@ -72,7 +66,6 @@ builtins = _
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build
 
 [testenv:lower-constraints]
-basepython = python3
 deps =
   -c{toxinidir}/lower-constraints.txt
   -r{toxinidir}/test-requirements.txt