From 6af7c385646638665424b5c115221baaaa76327d Mon Sep 17 00:00:00 2001
From: Iury Gregory Melo Ferreira <imelofer@redhat.com>
Date: Fri, 22 Nov 2019 15:47:18 +0100
Subject: [PATCH] Drop python 2.7 support and testing

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

tenks 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://review.opendev.org/#/c/691178/

Change-Id: I2b133661a4986d715513d5629b247f1086b0ddbc
---
 releasenotes/notes/drop-py-2-7-d311573543d0e3ba.yaml |  6 ++++++
 setup.cfg                                            |  2 --
 test-requirements.txt                                |  2 --
 tox.ini                                              | 10 ++--------
 zuul.d/project.yaml                                  |  1 -
 5 files changed, 8 insertions(+), 13 deletions(-)
 create mode 100644 releasenotes/notes/drop-py-2-7-d311573543d0e3ba.yaml

diff --git a/releasenotes/notes/drop-py-2-7-d311573543d0e3ba.yaml b/releasenotes/notes/drop-py-2-7-d311573543d0e3ba.yaml
new file mode 100644
index 0000000..c93fdc9
--- /dev/null
+++ b/releasenotes/notes/drop-py-2-7-d311573543d0e3ba.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    Python 2.7 support has been dropped. Last release of tenks to support
+    Python 2.7 is OpenStack Train. The minimum version of Python now supported
+    by tenks is Python 3.6.
diff --git a/setup.cfg b/setup.cfg
index 84dddad..3cf73b9 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 ab67516..ef07ccd 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,6 +5,4 @@
 ansible-lint>=3.0.0 # MIT
 coverage>=4.5.1 # Apache-2.0
 flake8>=3.5.0 # MIT
-# Required for Python 2
-mock>=2.0.0 # BSD
 stestr>=1.0.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index d1c1108..8497a35 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,10 @@
 [tox]
 minversion = 2.0
-envlist = py3,py27,pep8,alint,cover
+envlist = py3,pep8,alint,cover
 skipsdist = True
 
 [testenv]
+basepython = python3
 usedevelop = True
 install_command = pip install {opts} {packages}
 passenv =
@@ -25,12 +26,10 @@ commands =
   stestr run {posargs}
 
 [testenv:pep8]
-basepython = python2.7
 commands =
   flake8 {posargs}
 
 [testenv:docs]
-basepython = python3
 deps =
     -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -r{toxinidir}/requirements.txt
@@ -38,14 +37,12 @@ deps =
 commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:pdf-docs]
-basepython = python3
 deps = {[testenv:docs]deps}
 whitelist_externals = make
 commands = sphinx-build -W -b latex doc/source doc/build/pdf
            make -C doc/build/pdf
 
 [testenv:venv]
-basepython = python3
 deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/test-requirements.txt
@@ -53,7 +50,6 @@ deps =
 commands = {posargs}
 
 [testenv:cover]
-basepython = python3
 setenv =
     VIRTUAL_ENV={envdir}
     PYTHON=coverage run --source tenks,ansible --parallel-mode
@@ -66,7 +62,6 @@ commands =
     coverage xml -o cover/coverage.xml
 
 [testenv:alint]
-basepython = python2.7
 # ansible-lint doesn't support custom modules, so add ours to the Ansible path.
 setenv = ANSIBLE_LIBRARY = {toxinidir}/ansible/action_plugins/
 # Exclude roles downloaded from Galaxy (in the form 'author.role') from
@@ -76,7 +71,6 @@ commands = bash -c "ansible-lint \
                           -not -path '{toxinidir}/ansible/roles/*.*/*' -print)"
 
 [testenv:releasenotes]
-basepython = python3
 deps =
     -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -r{toxinidir}/requirements.txt
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 704001d..3a2a438 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -2,7 +2,6 @@
 - project:
     templates:
       - openstack-cover-jobs
-      - openstack-python-jobs
       - openstack-python3-ussuri-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3