From 7bad0f93bbda1238fa3d853ce428f92d8606b360 Mon Sep 17 00:00:00 2001
From: Eric Fried <openstack@fried.cc>
Date: Fri, 25 Oct 2019 09:24:35 -0500
Subject: [PATCH] Drop python2 support and testing

Change-Id: I1ce77e223674013754408b2db42b1fb6e80bb32b
---
 .zuul.yaml                                               | 4 +---
 playbooks/os-vif-ovs/run.yaml                            | 1 +
 .../notes/drop-python2-support-7a4bc7d31253c1e5.yaml     | 4 ++++
 setup.cfg                                                | 5 +++--
 tox.ini                                                  | 9 +--------
 5 files changed, 10 insertions(+), 13 deletions(-)
 create mode 100644 releasenotes/notes/drop-python2-support-7a4bc7d31253c1e5.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index d9a97b9d..7916b5d0 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -39,8 +39,7 @@
       devstack_plugins:
         neutron: https://opendev.org/openstack/neutron.git
       devstack_localrc:
-        # TODO(sean-k-mooney) move all tempest jobs to py3 by default.
-        # USE_PYTHON3: true
+        USE_PYTHON3: true
         FORCE_CONFIG_DRIVE: true
         ENABLE_VOLUME_MULTIATTACH: true
         # NOTE(sean-k-mooney) we do not have to set
@@ -118,7 +117,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/playbooks/os-vif-ovs/run.yaml b/playbooks/os-vif-ovs/run.yaml
index 06640f67..ac3fef76 100644
--- a/playbooks/os-vif-ovs/run.yaml
+++ b/playbooks/os-vif-ovs/run.yaml
@@ -27,6 +27,7 @@
         cmd: |
           set -e
           set -x
+          export DEVSTACK_GATE_USE_PYTHON3=true
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_FULL=1
diff --git a/releasenotes/notes/drop-python2-support-7a4bc7d31253c1e5.yaml b/releasenotes/notes/drop-python2-support-7a4bc7d31253c1e5.yaml
new file mode 100644
index 00000000..9fd7dee1
--- /dev/null
+++ b/releasenotes/notes/drop-python2-support-7a4bc7d31253c1e5.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    Python 2 is no longer supported. Python 3 is required.
diff --git a/setup.cfg b/setup.cfg
index 67d874f4..1afefa66 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,6 +5,7 @@ description-file = README.rst
 author = OpenStack
 author-email = openstack-discuss@lists.openstack.org
 home-page = https://docs.openstack.org/os-vif/latest/
+python-requires = >=3.6
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -12,11 +13,11 @@ 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 :: Only
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
+    Programming Language :: Python :: Implementation :: CPython
 
 [files]
 packages =
diff --git a/tox.ini b/tox.ini
index fda5d243..3bd467f2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.1.1
-envlist = py37,py27,pep8
+envlist = py37,pep8
 skipsdist = True
 ignore_basepython_conflict = True
 
@@ -29,13 +29,6 @@ deps =
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/doc/requirements.txt
 
-[testenv:functional-py27]
-basepython = python2.7
-setenv =
-    {[testenv]setenv}
-commands =
-    stestr run --black-regex ".tests.unit" '{posargs}'
-
 [testenv:functional]
 setenv =
     {[testenv]setenv}