diff --git a/doc/source/conf.py b/doc/source/conf.py index 1074cd5..915e879 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -74,7 +74,7 @@ copyright = u'2016, DreamHost' # # The short X.Y version. version = subprocess.Popen(['sh', '-c', 'cd ../..; python setup.py --version'], - stdout=subprocess.PIPE).stdout.read() + stdout=subprocess.PIPE).stdout.read().decode('utf-8') version = version.strip() # The full version, including alpha/beta/rc tags. release = version diff --git a/tox.ini b/tox.ini index 1a5b0a7..006d0ad 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,6 @@ minversion = 2.0 envlist = py35,py27,pep8,docs [testenv] -basepython = python3 install_command = pip install {opts} {packages} deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} @@ -16,6 +15,7 @@ commands = python setup.py testr --testr-args='{posargs}' basepython = python2.7 [testenv:venv] +basepython = python3 deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -r{toxinidir}/test-requirements.txt @@ -24,6 +24,7 @@ deps = commands = {posargs} [testenv:pep8] +basepython = python3 deps = -r{toxinidir}/test-requirements.txt flake8 @@ -34,6 +35,7 @@ commands = bandit -r stevedore -x tests -n5 [testenv:docs] +basepython = python3 deps = -r{toxinidir}/doc/requirements.txt commands = sphinx-build -W -b html doc/source doc/build/html @@ -43,12 +45,14 @@ show-source = True exclude=.venv,.git,.tox,dist,*lib/python*,*egg,build [testenv:releasenotes] +basepython = python3 deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -r{toxinidir}/doc/requirements.txt commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html [testenv:lower-constraints] +basepython = python3 deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt