From 99f5b075a7c8d7db698ef1e7a676d4888a2a395e Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Sat, 16 Nov 2019 00:27:07 +0000
Subject: [PATCH] [ussuri][goal] Drop python 2.7 support and testing

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

yaql 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: If9e9f5a1302d9cf7a0f8e18e6007492942765337
---
 .zuul.yaml                                           | 3 +--
 releasenotes/notes/drop-py-2-7-4a209eed5ea87ecd.yaml | 6 ++++++
 setup.cfg                                            | 2 --
 tox.ini                                              | 8 ++------
 4 files changed, 9 insertions(+), 10 deletions(-)
 create mode 100644 releasenotes/notes/drop-py-2-7-4a209eed5ea87ecd.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index 6d800c7..0cdc483 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,5 +1,4 @@
 - project:
     templates:
       - build-openstack-docs-pti
-      - openstack-python-jobs
-      - openstack-python3-train-jobs
+      - openstack-python3-ussuri-jobs
diff --git a/releasenotes/notes/drop-py-2-7-4a209eed5ea87ecd.yaml b/releasenotes/notes/drop-py-2-7-4a209eed5ea87ecd.yaml
new file mode 100644
index 0000000..621ed7a
--- /dev/null
+++ b/releasenotes/notes/drop-py-2-7-4a209eed5ea87ecd.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    Python 2.7 support has been dropped. Last release of yaql
+    to support python 2.7 is OpenStack Train. The minimum version of Python now
+    supported by yaql is Python 3.6.
diff --git a/setup.cfg b/setup.cfg
index 967b426..be9be73 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 b889176..e3a9dd6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,10 @@
 [tox]
 minversion = 2.0
-envlist = py27,py37,pypy,pep8
+envlist = py37,pypy,pep8
 skipsdist = True
 
 [testenv]
+basepython = python3
 usedevelop = True
 install_command = pip install -U {opts} {packages}
 setenv =
@@ -13,23 +14,18 @@ deps = -r{toxinidir}/requirements.txt
 commands = python setup.py testr --slowest --testr-args='{posargs}'
 
 [testenv:pep8]
-basepython = python3
 commands = flake8
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [testenv:cover]
-basepython = python3
 commands = python setup.py testr --coverage --testr-args='{posargs}'
 
 [testenv:docs]
-basepython = python3
 commands = python setup.py build_sphinx
 
 [testenv:releasenotes]
-basepython = python3
 commands = sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [flake8]