From 767836bbd02920401191a1aabd8a13f55c13858a Mon Sep 17 00:00:00 2001
From: Luigi Toscano <ltoscano@redhat.com>
Date: Sun, 26 Jan 2020 21:58:30 +0100
Subject: [PATCH] [ussuri][goal] Drop python 2.7 support and testing

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

sahara plugins do works with python 3 and the sahara core
does not support python 2.7 anymore anyway.

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: I1200d729cbd6bf3b603482362be9161d6bd8b652
---
 .zuul.yaml                                    |  1 -
 .../notes/drop-py2-7-c775190f167ab9df.yaml    |  6 ++++++
 setup.cfg                                     |  2 --
 tox.ini                                       | 19 ++++++-------------
 4 files changed, 12 insertions(+), 16 deletions(-)
 create mode 100644 releasenotes/notes/drop-py2-7-c775190f167ab9df.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index 9aacae5..f583f99 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,7 +2,6 @@
     templates:
       - check-requirements
       - openstack-lower-constraints-jobs
-      - openstack-python-jobs
       - openstack-python3-ussuri-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
diff --git a/releasenotes/notes/drop-py2-7-c775190f167ab9df.yaml b/releasenotes/notes/drop-py2-7-c775190f167ab9df.yaml
new file mode 100644
index 0000000..70927b4
--- /dev/null
+++ b/releasenotes/notes/drop-py2-7-c775190f167ab9df.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    Python 2.7 support has been dropped. Last release of sahara and its plugins
+    to support python 2.7 is OpenStack Train. The minimum version of Python now
+    supported by sahara and its plugins is Python 3.6.
diff --git a/setup.cfg b/setup.cfg
index 1273950..489b3c7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,8 +5,6 @@ description-file = README.rst
 license = Apache Software License
 classifiers =
     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/tox.ini b/tox.ini
index 864eea5..3100f13 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,13 @@
 [tox]
-envlist = py27,py37,pep8
-minversion = 2.0
+envlist = py37,pep8
+minversioon = 3.1.1
 skipsdist = True
+# this allows tox to infer the base python from the environment name
+# and override any basepython configured in this file
+ignore_basepython_conflict = true
 
 [testenv]
+basepython = python3
 usedevelop = True
 install_command = pip install {opts} {packages}
 setenv =
@@ -16,10 +20,6 @@ deps =
 commands = stestr run {posargs}
 passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
 
-[testenv:debug-py27]
-basepython = python2.7
-commands = oslo_debug_helper -t sahara_plugin_mapr/tests/unit {posargs}
-
 [testenv:debug-py36]
 basepython = python3.6
 commands = oslo_debug_helper -t sahara_plugin_mapr/tests/unit {posargs}
@@ -29,7 +29,6 @@ basepython = python3.7
 commands = oslo_debug_helper -t sahara_plugin_mapr/tests/unit {posargs}
 
 [testenv:pep8]
-basepython = python3
 deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/requirements.txt
@@ -42,11 +41,9 @@ commands =
     bash -c "find sahara_plugin_mapr -iname '*.sh' -print0 | xargs -0 bashate -v"
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [testenv:docs]
-basepython = python3
 deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/doc/requirements.txt
@@ -57,7 +54,6 @@ whitelist_externals =
     rm
 
 [testenv:pdf-docs]
-basepython = python3
 deps = {[testenv:docs]deps}
 commands =
     rm -rf doc/build/pdf
@@ -68,7 +64,6 @@ whitelist_externals =
     rm
 
 [testenv:releasenotes]
-basepython = python3
 deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/doc/requirements.txt
@@ -78,7 +73,6 @@ commands =
 whitelist_externals = rm
 
 [testenv:debug]
-basepython = python3
 # It runs tests from the specified dir (default is sahara_plugin_mapr/tests)
 # in interactive mode, so, you could use pbr for tests debug.
 # Example usage: tox -e debug -- -t sahara_plugin_mapr/tests/unit some.test.path
@@ -105,7 +99,6 @@ enable-extensions=H904,H106,H203,H204,H205
 ignore=E123,E226,E402,E731,W503,W504,W605
 
 [testenv:lower-constraints]
-basepython = python3
 deps =
   -c{toxinidir}/lower-constraints.txt
   -r{toxinidir}/test-requirements.txt