Merge "Drop python 2.7 support and testing"

4 files changed, 11 insertions, 17 deletions

diff --git a/.zuul.yaml b/.zuul.yaml
index 7a01b6f..f4cae42 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,8 +2,7 @@
     templates:
       - check-requirements
       - openstack-lower-constraints-jobs
-      - openstack-python-jobs
-      - openstack-python3-train-jobs
+      - openstack-python3-ussuri-jobs
       - openstackclient-plugin-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
diff --git a/releasenotes/notes/drop-py-2-7-4ca3cf6a8ab8ca34.yaml b/releasenotes/notes/drop-py-2-7-4ca3cf6a8ab8ca34.yaml
new file mode 100644
index 0000000..aadd31b
--- /dev/null
+++ b/releasenotes/notes/drop-py-2-7-4ca3cf6a8ab8ca34.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    Python 2.7 support has been dropped. Last release of python-troveclient
+    to support py2.7 is OpenStack Train. The minimum version of Python now
+    supported by python-troveclient is Python 3.6.
diff --git a/setup.cfg b/setup.cfg
index 57c55bc..f3695e3 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 2156e3b..f31d0cc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,13 @@
 # Python Trove Client
 
 [tox]
-envlist = py27,py37,pypy,pep8
-minversion = 2.0
+envlist = py37,pypy,pep8
+minversion = 3.1.1
 skipsdist = True
+ignore_basepython_conflict = True
 
 [testenv]
+basepython = python3
 setenv = VIRTUAL_ENV={envdir}
          NOSE_WITH_OPENSTACK=1
          NOSE_OPENSTACK_COLOR=1
@@ -24,23 +26,15 @@ whitelist_externals = find
                       rm
 
 [testenv:debug]
-basepython = python3
-commands = oslo_debug_helper -t troveclient/tests {posargs}
-
-[testenv:debug-py27]
-basepython = python2.7
 commands = oslo_debug_helper -t troveclient/tests {posargs}
 
 [testenv:pep8]
-basepython = python3
 commands = flake8
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [testenv:cover]
-basepython = python3
 setenv =
     PYTHON=coverage run --source troveclient --parallel-mode
 commands =
@@ -52,7 +46,6 @@ commands =
     coverage report
 
 [testenv:docs]
-basepython = python3
 deps =
        -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
        -r{toxinidir}/requirements.txt
@@ -62,7 +55,6 @@ commands =
   sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:releasenotes]
-basepython = python3
 deps =
        -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
        -r{toxinidir}/requirements.txt
@@ -77,7 +69,6 @@ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,releasenotes
 
 
 [testenv:lower-constraints]
-basepython = python3
 deps =
   -c{toxinidir}/lower-constraints.txt
   -r{toxinidir}/test-requirements.txt