Merge "Drop python 2.7 support and testing"

2019-12-16 02:42:17 +00:00 · 2019-12-16 02:42:17 +00:00 · 9387369cd7
parent 431319ee4d e3c903cfce
commit 9387369cd7
5 changed files with 7 additions and 5 deletions
--- a/.zuul.yaml
+++ b/.zuul.yaml
@ -2,7 +2,6 @@
    templates:
      - openstack-cover-jobs
      - openstack-lower-constraints-jobs
-      - openstack-python-jobs
      - openstack-python3-ussuri-jobs
      - publish-openstack-docs-pti
      - check-requirements
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@ -3,5 +3,4 @@
 # process, which may cause wedges in the gate later.

 openstackdocstheme>=1.18.1 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.5,<2.0.0;python_version=='2.7' # BSD
 sphinx!=1.6.6,!=1.6.7,>=1.6.5;python_version>='3.4' # BSD
--- a/releasenotes/notes/drop-py-2-7-f7078b44cf99cae1.yaml
+++ b/releasenotes/notes/drop-py-2-7-f7078b44cf99cae1.yaml
@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    Python 2.7 support has been dropped. Last release of python-watcherclient
+    to support py2.7 is OpenStack Train. The minimum version of Python now
+    supported by python-watcherclient is Python 3.6.
--- 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
--- a/tox.ini
+++ b/tox.ini
@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = py36,py37,py27,pep8
+envlist = py36,py37,pep8
 skipsdist = True

 [testenv]