diff --git a/.zuul.yaml b/.zuul.yaml index 33783bfa..5e150d0f 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -4,7 +4,6 @@ - openstack-cover-jobs - openstack-lower-constraints-jobs - openstack-python-jobs - - openstack-python35-jobs - openstack-python36-jobs check: jobs: diff --git a/setup.cfg b/setup.cfg index c2b7c9eb..27002a92 100644 --- a/setup.cfg +++ b/setup.cfg @@ -13,7 +13,7 @@ classifier = Operating System :: POSIX :: Linux Programming Language :: Python Programming Language :: Python :: 2.7 - Programming Language :: Python :: 3.5 + Programming Language :: Python :: 3.6 [global] setup-hooks = diff --git a/tox.ini b/tox.ini index 8e4b2c41..c8cae1d1 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{27,35},pep8,cover +envlist = py{27,36},pep8,cover minversion = 2.5 skipsdist = True @@ -30,15 +30,6 @@ commands = {[testenv]commands} stestr run {posargs} -[testenv:py35] -basepython = python3.5 -setenv = - {[testenv]setenv} - BLACKLIST_FILE={toxinidir}/test-blacklist-py3.txt -commands = - {[testenv]commands} - stestr run --blacklist-file {env:BLACKLIST_FILE} {posargs} - [testenv:py36] basepython = python3.6 setenv = @@ -103,9 +94,9 @@ ignore = H101,H301,H404,H405 [testenv:lower-constraints] basepython = python3 -setenv = {[testenv:py35]setenv} +setenv = {[testenv:py36]setenv} deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt -commands = {[testenv:py35]commands} +commands = {[testenv:py36]commands}