From 5a723bc7a91434ffdb2c81ffda1053ccaf06bc0e Mon Sep 17 00:00:00 2001
From: pengyuesheng <pengyuesheng@gohighsec.com>
Date: Fri, 27 Dec 2019 15:51:18 +0800
Subject: [PATCH] Drop python 2.7 support and testing

Ussuri Communtiy-wide goal:
https://governance.openstack.org/tc/goals/selected/ussuri/drop-py27.html

Switch jobs to use ussuri template, otherwise pep8 is not run.

Note: This repo has no releasenotes, so releasenotes are not added.

Co-Authored-By: Andreas Jaeger <aj@suse.com>
Change-Id: I5e06e582795bb6a4fc252f7bd8c57993289e4ef5
---
 .zuul.yaml            | 3 +--
 doc/requirements.txt  | 3 +--
 requirements.txt      | 3 +--
 setup.cfg             | 3 +--
 test-requirements.txt | 2 --
 tox.ini               | 8 +-------
 6 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index c5652cf9..a3a7daae 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,6 +2,5 @@
     templates:
       - check-requirements
       - openstack-lower-constraints-jobs
-      - openstack-python-jobs
-      - openstack-python36-jobs
+      - openstack-python-ussuri-jobs
       - periodic-stable-jobs
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 49b050e2..85011b0c 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,4 +1,3 @@
-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,!=2.1.0;python_version>='3.4'  # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2,!=2.1.0 # BSD
 openstackdocstheme>=1.19.0 # Apache-2.0
 sphinx-feature-classification>=0.2.0 # Apache-2.0
diff --git a/requirements.txt b/requirements.txt
index 1f490be5..b134c899 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,8 +10,7 @@ oslo.serialization!=2.19.1,>=2.21.1 # Apache-2.0
 oslo.utils>=3.37.0 # Apache-2.0
 os-resource-classes>=0.1.0 # Apache-2.0
 pypowervm>=1.1.23 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,<2.0.0,>=1.6.2;python_version=='2.7' # BSD
-sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4'  # BSD
+sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD
 python-swiftclient>=3.2.0 # Apache-2.0
 taskflow>=2.16.0 # Apache-2.0
 setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0,>=21.0.0 # PSF/ZPL
diff --git a/setup.cfg b/setup.cfg
index 0e5244bd..661763f3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -12,10 +12,9 @@ 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
 
 [files]
 packages =
diff --git a/test-requirements.txt b/test-requirements.txt
index 963ddbdb..bdfd2a3a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,8 +6,6 @@ bashate>=0.5.1 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 oslotest>=3.2.0 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,<2.0.0,>=1.6.2;python_version=='2.7' # BSD
-sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4'  # BSD
 stestr>=1.0.0 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
diff --git a/tox.ini b/tox.ini
index 7441bded..ee221c0e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.1.1
-envlist = py36,py27,pep8
+envlist = py36,pep8
 skipsdist = True
 # Automatic envs (pyXX) will use the python version appropriate to that
 # env and ignore basepython inherited from [testenv]. That's what we
@@ -29,12 +29,6 @@ whitelist_externals =
   bash
 commands =
 
-[testenv:py27]
-commands =
-  {[testenv]commands}
-  stestr run {posargs}
-  stestr slowest
-
 [testenv:py36]
 commands =
   {[testenv]commands}