[ussuri][goal] Cleanup for python 2.7 drop

OpenStack is dropping the py2.7 support in ussuri cycle.

puppet-* repos have to cleanup the requirement and tox
for py2.7 drop.

Complete discussion & schedule can be found in
- http://lists.openstack.org/pipermail/openstack-discuss/2019-October/010142.html
- https://etherpad.openstack.org/p/drop-python2-support

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

Change-Id: I75097408ed14484092229567246d6fd276848e59

diff --git a/doc/requirements.txt b/doc/requirements.txt
index 1d9bc5a6c0881ae888941f7234d2d647ce2674c9..3c906b8259f36655a1f47f66d370fcf2dd2e0758 100644 (file)
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,6 +1,5 @@
 # This is required for the docs build jobs
-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,!=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
 openstackdocstheme>=1.20.0 # Apache-2.0
 
 # This is required for the releasenotes build jobs

diff --git a/tox.ini b/tox.ini
index 99999cca48e2d375f1b08387bbd3a809f5ca14fc..5099a0d39fe37ac49cd42dd53b06721bc2a7ccdd 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,13 @@
 [tox]
-minversion = 2.0
+minversion = 3.1
 skipsdist = True
 envlist = releasenotes
+ignore_basepython_conflict = True
 
 [testenv]
+basepython = python3
 install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
 
 [testenv:releasenotes]
-basepython = python3
 deps = -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html