From b70afb9bf6538748f74262431e3342cc77b9369e Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Fri, 15 Nov 2019 16:30:45 +0000
Subject: [PATCH] [ussuri][goal] Drop python 2.7 support and testing

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

monasca-common 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

Change-Id: Ibf95dffdebe47c8ea4a8a8a666ac6f66d9b4c774
---
 .zuul.yaml                                      |  6 +-----
 README.rst                                      |  2 +-
 .../notes/drop-py-2-7-d932d947c945a645.yaml     |  6 ++++++
 setup.cfg                                       |  1 -
 tox.ini                                         | 17 ++---------------
 5 files changed, 10 insertions(+), 22 deletions(-)
 create mode 100644 releasenotes/notes/drop-py-2-7-d932d947c945a645.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index 3ed59478..2572345c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,13 +3,11 @@
       - check-requirements
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
-      - openstack-python-jobs
       - openstack-python3-train-jobs
     check:
       jobs:
-        - monasca-tempest-python2-influxdb
         - monasca-tempest-python3-influxdb
-        - monasca-tempest-python2-cassandra
+        - monasca-tempest-python3-cassandra
         - monasca-tempest-java-cassandra
         - monascalog-tempest
         - build-monasca-common-docker-base-image
@@ -17,9 +15,7 @@
     gate:
       queue: monasca
       jobs:
-        - monasca-tempest-python2-influxdb
         - monasca-tempest-python3-influxdb
-        - monasca-tempest-python2-cassandra
         - monasca-tempest-java-cassandra
         - monascalog-tempest
         - legacy-monasca-common-maven-build
diff --git a/README.rst b/README.rst
index 6fa24d49..7e7ccd24 100644
--- a/README.rst
+++ b/README.rst
@@ -26,7 +26,7 @@ To run the unit tests use:
 
 ::
 
-   $ tox -e py27,py35
+   $ tox -e py35
 
 For information on contributing, see `Contribution Guidelines`_.
 
diff --git a/releasenotes/notes/drop-py-2-7-d932d947c945a645.yaml b/releasenotes/notes/drop-py-2-7-d932d947c945a645.yaml
new file mode 100644
index 00000000..34a77b7d
--- /dev/null
+++ b/releasenotes/notes/drop-py-2-7-d932d947c945a645.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    Python 2.7 support has been dropped. Last release of monasca-common
+    to support python 2.7 is OpenStack Train. The minimum version of Python now
+    supported by monasca-common is Python 3.6.
diff --git a/setup.cfg b/setup.cfg
index 93a5148c..1ea5a708 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -12,7 +12,6 @@ classifier =
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
     Programming Language :: Python
-    Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
diff --git a/tox.ini b/tox.ini
index a36a81c4..6ac74ea2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,10 @@
 [tox]
-envlist = py27,py37,pep8,cover
+envlist = py37,pep8,cover
 minversion = 2.5
 skipsdist = True
 
 [testenv]
+basepython = python3
 usedevelop = True
 setenv = VIRTUAL_ENV={envdir}
          OS_TEST_PATH=monasca_common/tests
@@ -24,12 +25,6 @@ deps =
 commands =
   find {toxinidir} -type f -name '*.pyc' -delete
 
-[testenv:py27]
-basepython = python2.7
-commands =
-  {[testenv]commands}
-  stestr run {posargs}
-
 [testenv:py36]
 basepython = python3.6
 setenv =
@@ -40,7 +35,6 @@ commands =
   stestr run --blacklist-file {env:BLACKLIST_FILE} {posargs}
 
 [testenv:cover]
-basepython = python3
 setenv =
     PYTHON=coverage run --source monasca_common --parallel-mode
 commands =
@@ -51,33 +45,27 @@ commands =
     coverage xml -o cover/coverage.xml
 
 [testenv:debug]
-basepython = python3
 commands =
   {[testenv]commands}
   oslo_debug_helper -t {env:OS_TEST_PATH} {posargs}
 
 [testenv:bandit]
-basepython = python3
 # B101(assert_ussed) - Validation uses asserts because of performance reasons
 # monasca_common/kafka_lib is a clone of kafka-python and will be deleted in the future
 commands = bandit -r monasca_common -n5 -s B101 -x monasca_common/tests -x monasca_common/kafka_lib
 
 [testenv:flake8]
-basepython = python3
 commands = flake8 monasca_common
 
 [testenv:pep8]
-basepython = python3
 commands =
   {[testenv:flake8]commands}
   {[testenv:bandit]commands}
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [testenv:bindep]
-basepython = python3
 deps = bindep
 commands = bindep test
 
@@ -93,7 +81,6 @@ show-source = True
 ignore = H101,H301,H404,H405
 
 [testenv:lower-constraints]
-basepython = python3
 setenv = {[testenv:py36]setenv}
 deps =
   -c{toxinidir}/lower-constraints.txt