Revert "[ussuri][goal] Drop python 2.7 support and testing"

This reverts commit 69a14917e5f98f82dd1f4cdf33a49e6f3f708c13.

Change-Id: I2521022b59b30b62d297c33b12cc7165389752c2

5 files changed, 13 insertions, 14 deletions

diff --git a/.zuul.yaml b/.zuul.yaml
index dfb9258..5aef811 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -13,6 +13,7 @@
 - project:
     templates:
       - check-requirements
+      - openstack-python-jobs
       - openstack-python3-train-jobs
       - openstackclient-plugin-jobs
       - publish-openstack-docs-pti
diff --git a/doc/source/contributor/testing.rst b/doc/source/contributor/testing.rst
index d8a524b..03da8f3 100644
--- a/doc/source/contributor/testing.rst
+++ b/doc/source/contributor/testing.rst
@@ -23,8 +23,8 @@ with the following command:
 
 .. code-block:: bash
 
-    # Executes tests on Python 3.7
-    tox -e py37
+    # Executes tests on Python 2.7
+    tox -e py27
 
 .. note::
 
@@ -40,11 +40,11 @@ with the following command:
 
         # runs a single test with the function named
         # test_should_entity_str
-        tox -e py37 -- test_should_entity_str
+        tox -e py27 -- test_should_entity_str
 
         # runs only tests in the WhenTestingSecrets class and
         # the WhenTestingOrderManager class
-        tox -e p37 -- '(WhenTestingSecrets|WhenTestingOrderManager)'
+        tox -e py27 -- '(WhenTestingSecrets|WhenTestingOrderManager)'
 
     The function name or class specified must be one located in the
     `barbicanclient/tests` directory.
diff --git a/releasenotes/notes/drop-py-2-7-50042a0e2227c095.yaml b/releasenotes/notes/drop-py-2-7-50042a0e2227c095.yaml
deleted file mode 100644
index 274952d..0000000
--- a/releasenotes/notes/drop-py-2-7-50042a0e2227c095.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-upgrade:
-  - |
-    Python 2.7 support has been dropped. Last release of python-barbicanclient
-    to support python 2.7 is OpenStack Train. The minimum version of Python now
-    supported is Python 3.6.
diff --git a/setup.cfg b/setup.cfg
index 2c28be5..a11a2b4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,6 +13,8 @@ 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 a6347e9..eaacdd5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,9 @@
 [tox]
-minversion = 3.1.1
-envlist = py37,py36,pep8
+minversion = 2.0
+envlist = py27,py36,py37,pep8
 skipsdist = True
-ignore_basepython_conflict = True
 
 [testenv]
-basepython = python3
 usedevelop = True
 install_command = pip install {opts} {packages}
 setenv =
@@ -27,12 +25,15 @@ commands =
 whitelist_externals = rm
 
 [testenv:debug]
+basepython = python3
 commands = oslo_debug_helper -t barbicanclient/tests {posargs}
 
 [testenv:pep8]
+basepython = python3
 commands = flake8 {posargs}
 
 [testenv:venv]
+basepython = python3
 commands = {posargs}
 
 [testenv:docs]
@@ -44,6 +45,7 @@ commands=
 whitelist_externals = rm
 
 [testenv:pdf-docs]
+basepython = python3
 deps = {[testenv:docs]deps}
 whitelist_externals =
   make