Merge "[ussuri][goal] Drop python2.7 support"

.zuul.yaml

@@ -3,8 +3,7 @@
       - publish-openstack-docs-pti
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
-      - openstack-python-jobs
+      - openstack-python3-ussuri-jobs
-      - openstack-python3-train-jobs
       - check-requirements
       - release-notes-jobs-python3
     check:

doc/requirements.txt

@@ -2,7 +2,6 @@
 # of appearance. Changing the order has an impact on the overall integration
 # 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.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
 reno>=2.5.0 # Apache-2.0
 sphinxcontrib-programoutput>=0.11  # BSD

releasenotes/notes/drop-python2-support-71c7b9e1dcf8c890.yaml

@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    Python 2.7 support has been dropped. The last release of
+    openstack/python-manilaclient to support python 2.7 is OpenStack Train
+    (python-manilaclient version 1.29.x). The minimum version of Python now
+    supported by openstack/python-manilaclient is Python 3.6.

setup.cfg

@@ -15,8 +15,6 @@ classifier =
    License :: OSI Approved :: Apache Software License
    Operating System :: OS Independent
    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

tox.ini

@@ -1,10 +1,11 @@
 [tox]
 distribute = False
-envlist = py27,py37,pep8
+envlist = py3,pep8
 minversion = 2.0
 skipsdist = True
 
 [testenv]
+basepython = python3
 install_command = pip install {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
          OS_STDOUT_CAPTURE=1
@@ -21,25 +22,17 @@ commands =
   stestr slowest
 
 [testenv:debug]
-basepython = python3
-commands = oslo_debug_helper -t manilaclient/tests {posargs}
-
-[testenv:debug-py27]
-basepython = python2.7
 commands = oslo_debug_helper -t manilaclient/tests {posargs}
 
 [testenv:pep8]
-basepython = python3
 commands =
   flake8
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [testenv:docs]
 usedevelop = True
-basepython = python3
 deps =
        -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
        -r{toxinidir}/requirements.txt
@@ -51,7 +44,6 @@ commands =
 
 [testenv:pdf-docs]
 usedevelop = True
-basepthon = python3
 deps = {[testenv:docs]deps}
 whitelist_externals =
   make
@@ -60,7 +52,6 @@ commands =
   make -C doc/build/pdf
 
 [testenv:releasenotes]
-basepython = python3
 deps =
        -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
        -r{toxinidir}/requirements.txt
@@ -72,7 +63,6 @@ commands =
          -b html releasenotes/source releasenotes/build/html
 
 [testenv:functional]
-basepython = python3
 setenv =
   {[testenv]setenv}
   OS_TEST_PATH = ./manilaclient/tests/functional
@@ -83,14 +73,12 @@ commands =
   stestr run {posargs}
 
 [testenv:genconfig]
-basepython = python3
 whitelist_externals = bash
 commands =
   {envdir}/bin/python setup.py install
   {envdir}/bin/oslo-config-generator --config-file etc/oslo-config-generator/manilaclient.conf
 
 [testenv:cover]
-basepython = python3
 setenv =
   {[testenv]setenv}
   PYTHON=coverage run --source manilaclient --parallel-mode
@@ -112,7 +100,6 @@ enable-extensions = H106,H203,H904
 exclude = .venv,.tox,dist,doc,*egg,build
 
 [testenv:lower-constraints]
-basepython = python3
 deps =
   -c{toxinidir}/lower-constraints.txt
   -r{toxinidir}/test-requirements.txt