From b6d3d31674b49c6b94b6bdc5f637ed3c66f0c2a6 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Wed, 30 Oct 2019 05:19:00 +0000
Subject: [PATCH] Drop python 2.7 support and testing

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

pythn-vitrageclient 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: I6f4cc04134130a3fa36bb65492b01dff63f94e32
---
 .zuul.yaml                                          |  1 -
 doc/requirements.txt                                |  1 -
 .../notes/drop-py-2-7-4a355df72edbe12c.yaml         |  6 ++++++
 requirements.txt                                    |  1 -
 setup.cfg                                           |  2 --
 tox.ini                                             | 13 ++++---------
 6 files changed, 10 insertions(+), 14 deletions(-)
 create mode 100644 releasenotes/notes/drop-py-2-7-4a355df72edbe12c.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index 4248c12..3912d77 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
       - openstackclient-plugin-jobs
       - publish-openstack-docs-pti
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 855a717..a7a6f9d 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,7 +1,6 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-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
 openstackdocstheme>=1.24.0 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
diff --git a/releasenotes/notes/drop-py-2-7-4a355df72edbe12c.yaml b/releasenotes/notes/drop-py-2-7-4a355df72edbe12c.yaml
new file mode 100644
index 0000000..20f45bc
--- /dev/null
+++ b/releasenotes/notes/drop-py-2-7-4a355df72edbe12c.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    Python 2.7 support has been dropped. Last release of python-vitrageclient
+    to support py2.7 is OpenStack Train. The minimum version of Python now
+    supported by python-vitrageclient is Python 3.6.
diff --git a/requirements.txt b/requirements.txt
index 514f212..5121058 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,6 +9,5 @@ osc-lib>=1.8.0 # Apache-2.0
 oslo.utils>=3.33.0 # Apache-2.0
 keystoneauth1>=3.4.0 # Apache-2.0
 iso8601>=0.1.11 # MIT
-networkx<2.3,>=2.0;python_version<'3.0'  # BSD
 networkx>=2.3;python_version>='3.4'  # BSD
 pydot>=1.4.1 # BSD
diff --git a/setup.cfg b/setup.cfg
index 1354f1d..3393fe8 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/tox.ini b/tox.ini
index 1c992ac..a9d2832 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,11 @@
 [tox]
-minversion = 2.3.1
-envlist = py27,py37,pep8
+minversion = 3.1.1
+envlist = py37,pep8
 skipsdist = True
+ignore_basepython_conflict = True
 
 [testenv]
+basepython = python3
 usedevelop = True
 install_command = pip install {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
@@ -15,19 +17,15 @@ commands = /bin/rm -f .testrepository/times.dbm
            python setup.py test --slowest --testr-args='{posargs}'
 
 [testenv:pep8]
-basepython = python3
 commands = flake8
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [testenv:cover]
-basepython = python3
 commands = python setup.py test --coverage --testr-args='{posargs}'
 
 [testenv:docs]
-basepython = python3
 deps =
        -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
        -r{toxinidir}/requirements.txt
@@ -35,7 +33,6 @@ deps =
 commands = sphinx-build -b html doc/source doc/build/html
 
 [testenv:debug]
-basepython = python3
 commands = oslo_debug_helper {posargs}
 
 [flake8]
@@ -47,7 +44,6 @@ builtins = _
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
 
 [testenv:releasenotes]
-basepython = python3
 deps =
        -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
        -r{toxinidir}/requirements.txt
@@ -55,7 +51,6 @@ deps =
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [testenv:lower-constraints]
-basepython = python3
 deps =
   -c{toxinidir}/lower-constraints.txt
   -r{toxinidir}/test-requirements.txt