From 18862bb5fae50a385538840d1ee146636a6410c0 Mon Sep 17 00:00:00 2001
From: Madhuri Kumari <madhuri.kumari@intel.com>
Date: Fri, 22 Nov 2019 15:35:24 +0530
Subject: [PATCH] Drop python 2.7 support and testing

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

ironic-python-agent 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: Ifd0e0b99bb82a7d7e82d6c14309468196f5734fc
---
 .../notes/drop-python2-2006fd8a4a6de56d.yaml      |  7 +++++++
 setup.cfg                                         |  2 --
 test-requirements.txt                             |  1 -
 tox.ini                                           | 15 ++-------------
 zuul.d/project.yaml                               |  1 -
 5 files changed, 9 insertions(+), 17 deletions(-)
 create mode 100644 releasenotes/notes/drop-python2-2006fd8a4a6de56d.yaml

diff --git a/releasenotes/notes/drop-python2-2006fd8a4a6de56d.yaml b/releasenotes/notes/drop-python2-2006fd8a4a6de56d.yaml
new file mode 100644
index 000000000..fdf11b93c
--- /dev/null
+++ b/releasenotes/notes/drop-python2-2006fd8a4a6de56d.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    Python 2.7 support has been dropped. Last release of
+    ironic-python-agent to support Python 2.7 is OpenStack Train. The
+    minimum version of Python now supported by ironic-python-agent is
+    Python 3.6.
diff --git a/setup.cfg b/setup.cfg
index e287f18f1..f8b7174f3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,8 +14,6 @@ classifier =
     License :: OSI Approved :: Apache Software License
     Operating System :: OS Independent
     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 afc80a2b7..2d9741663 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -13,7 +13,6 @@ bandit!=1.6.0,>=1.1.0,<2.0.0 # Apache-2.0
 
 # Doc requirements
 doc8>=0.6.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-pecanwsme>=0.8.0 # Apache-2.0
 openstackdocstheme>=1.20.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index e4c22c6b1..45de473f9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,12 @@
 [tox]
 minversion = 2.0
 skipsdist = True
-envlist = py3,py27,functional,pep8
+envlist = py3,functional,pep8
 
 [testenv]
 usedevelop = True
 install_command = pip install -U {opts} {packages}
+basepython = python3
 setenv =
   VIRTUAL_ENV={envdir}
   PYTHONDONTWRITEBYTECODE = 1
@@ -20,7 +21,6 @@ commands = stestr run {posargs}
 passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
 
 [testenv:functional]
-basepython = python3
 usedevelop = True
 # Define virtualenv directory, port to use for functional testing, and number
 # of seconds to wait for the agent to come alive during functional testing.
@@ -33,7 +33,6 @@ setenv =
 commands = stestr run {posargs}
 
 [testenv:pep8]
-basepython = python3
 whitelist_externals = bash
 commands =
   flake8 {posargs:ironic_python_agent imagebuild}
@@ -43,7 +42,6 @@ commands =
   doc8 doc/source README.rst
 
 [testenv:cover]
-basepython = python3
 setenv = VIRTUAL_ENV={envdir}
          PYTHON=coverage run --source ironic_python_agent --omit='*tests*' --parallel-mode
 commands =
@@ -54,24 +52,20 @@ commands =
   coverage html -d ./cover --omit='*tests*'
 
 [testenv:venv]
-basepython = python3
 setenv = PYTHONHASHSEED=0
 commands = {posargs:}
 
 [testenv:debug]
-basepython = python3
 envdir = {toxworkdir}/venv
 commands = oslo_debug_helper -t ironic_python_agent/tests/unit {posargs}
 
 [testenv:docs]
-basepython = python3
 setenv = PYTHONHASHSEED=0
 sitepackages = False
 commands =
   python setup.py build_sphinx
 
 [testenv:pdf-docs]
-basepython = python3
 whitelist_externals = make
 setenv = PYTHONHASHSEED=0
 sitepackages = False
@@ -80,7 +74,6 @@ commands =
   make -C doc/build/pdf
 
 [testenv:releasenotes]
-basepython = python3
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [flake8]
@@ -102,14 +95,12 @@ enable-extensions=H106,H203,H204,H205,H210,H904
 import_exceptions = ironic.openstack.common.gettextutils._,testtools.matchers
 
 [testenv:checkconfig]
-basepython = python3
 sitepackages = False
 envdir = {toxworkdir}/venv
 commands =
   {toxinidir}/tools/config/check_uptodate.sh
 
 [testenv:genconfig]
-basepython = python3
 sitepackages = False
 envdir = {toxworkdir}/venv
 commands =
@@ -117,14 +108,12 @@ commands =
 
 
 [testenv:lower-constraints]
-basepython = python3
 deps =
   -c{toxinidir}/lower-constraints.txt
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
 
 [testenv:bandit]
-basepython = python3
 deps = -r{toxinidir}/test-requirements.txt
 commands = bandit -r ironic_python_agent -x tests -n5 -ll -c tools/bandit.yml
 
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index b735fa6a6..acd548a6d 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -1,6 +1,5 @@
 - project:
     templates:
-      - openstack-python-jobs
       - openstack-python3-ussuri-jobs
       - openstack-cover-jobs
       - publish-openstack-docs-pti