diff --git a/.zuul.yaml b/.zuul.yaml index f3848fb..c11af82 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -3,7 +3,7 @@ - openstack-specs-jobs check: jobs: - - openstack-tox-py27 + - openstack-tox-py36 gate: jobs: - - openstack-tox-py27 + - openstack-tox-py36 diff --git a/requirements.txt b/requirements.txt index c5b4edf..2131709 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ openstackdocstheme>=1.11.0 -sphinx!=1.6.6,!=1.6.7,<2.0.0;python_version=='2.7' # BSD sphinx!=1.6.6,!=1.6.7;python_version>='3.4' # BSD testrepository>=0.0.18 testtools>=0.9.34 diff --git a/tests/test_titles.py b/tests/test_titles.py index 95eee8a..ba25617 100644 --- a/tests/test_titles.py +++ b/tests/test_titles.py @@ -111,7 +111,7 @@ class TestTitles(testtools.TestCase): # Get the current release directory - since we're moving up # alphabetically, grab the highest name in the spec directory generator = os.walk('specs') - dirname, subdirs, files = generator.next() + dirname, subdirs, files = next(generator) current_release = max(subdirs) found = False for dirname, subdirs, files in generator: diff --git a/tox.ini b/tox.ini index a9df6eb..f8b9999 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,10 @@ [tox] minversion = 1.6 -envlist = docs,py27 +envlist = docs,py3 skipsdist = True [testenv] +basepython = python3 usedevelop = True install_command = pip install -U {opts} {packages} setenv = VIRTUAL_ENV={envdir} @@ -11,11 +12,9 @@ deps = -r{toxinidir}/requirements.txt commands = python setup.py testr --slowest --testr-args='{posargs}' [testenv:venv] -basepython = python3 commands = {posargs} [testenv:docs] -basepython = python3 commands = python setup.py build_sphinx [testenv:spelling] @@ -23,4 +22,4 @@ deps = -r{toxinidir}/requirements.txt sphinxcontrib-spelling PyEnchant -commands = sphinx-build -b spelling doc/source doc/build/spelling \ No newline at end of file +commands = sphinx-build -b spelling doc/source doc/build/spelling