diff --git a/.zuul.yaml b/.zuul.yaml index 7acd53209..170111275 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -17,7 +17,6 @@ - openstack-cover-jobs - openstack-lower-constraints-jobs - openstack-python-jobs - - openstack-python35-jobs - openstack-python36-jobs - openstack-python37-jobs - publish-openstack-docs-pti diff --git a/doc/source/contributor/testing.rst b/doc/source/contributor/testing.rst index 1b285745e..b699f4ada 100644 --- a/doc/source/contributor/testing.rst +++ b/doc/source/contributor/testing.rst @@ -11,14 +11,14 @@ test targets that can be run to validate the code. ``tox -e py27`` Traditional unit testing (Python 2.7). -``tox -e py35`` - Traditional unit testing (Python 3.5). +``tox -e py36`` + Traditional unit testing (Python 3.6). ``tox -e functional`` Live functional testing against an existing OpenStack instance. (Python 2.7) -``tox -e functional-py35`` - Live functional testing against an existing OpenStack instance. (Python 3.5) +``tox -e functional-py36`` + Live functional testing against an existing OpenStack instance. (Python 3.6) ``tox -e cover`` Generate a coverage report on unit testing. diff --git a/setup.cfg b/setup.cfg index 8ef6c1695..6fc6ba6ce 100644 --- a/setup.cfg +++ b/setup.cfg @@ -19,7 +19,6 @@ classifier = Programming Language :: Python :: 2 Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 [files] diff --git a/tox.ini b/tox.ini index 0e6b4bbeb..ee01ddd57 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,5 @@ -# noted to use py35 you need virtualenv >= 1.11.4 [tox] -envlist = py35,py27,pep8,docs +envlist = py36,py27,pep8,docs minversion = 2.0 skipsdist = True @@ -66,8 +65,8 @@ commands = stestr --test-path=./novaclient/tests/functional run --concurrency=1 {posargs} python novaclient/tests/functional/hooks/check_resources.py -[testenv:functional-py35] -basepython = python3.5 +[testenv:functional-py36] +basepython = python3.6 passenv = OS_NOVACLIENT_TEST_NETWORK commands = stestr --test-path=./novaclient/tests/functional run --concurrency=1 {posargs}