diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml index acddd25794..99124f71f9 100644 --- a/.zuul.d/jobs.yaml +++ b/.zuul.d/jobs.yaml @@ -23,18 +23,6 @@ vars: tox_envlist: py27-check-uc -- job: - name: requirements-tox-py35-check-uc - parent: openstack-tox - description: | - Run test for requirements project. - - Uses tox with the ``py35-check-uc`` environment. - files: ^upper-constraints.*txt$ - nodeset: ubuntu-xenial - vars: - tox_envlist: py35-check-uc - - job: name: requirements-tox-py36-check-uc parent: openstack-tox-py36 diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index 974026e85c..a217ca461c 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -2,7 +2,6 @@ templates: - openstack-pypy-jobs-nonvoting - openstack-python-jobs - - openstack-python35-jobs - openstack-python36-jobs check: jobs: @@ -23,9 +22,7 @@ - requirements-tox-bindep: voting: false - requirements-tox-py27-check-uc - - requirements-tox-py35-check-uc - - requirements-tox-py36-check-uc: - voting: false + - requirements-tox-py36-check-uc - requirements-tox-validate-projects: voting: false - cross-cinder-py27 @@ -76,7 +73,7 @@ - openstack-tox-validate - requirements-tox-babel - requirements-tox-py27-check-uc - - requirements-tox-py35-check-uc + - requirements-tox-py36-check-uc - cross-cinder-py27 - cross-cinder-py36 - cross-glance-py27 diff --git a/setup.cfg b/setup.cfg index 7409a7712d..e2f43f3f2b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -18,7 +18,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 cd6a7182f6..22db546649 100644 --- a/tox.ini +++ b/tox.ini @@ -20,12 +20,6 @@ install_command = pip install -U {opts} -c {toxinidir}/upper-constraints.txt {pa deps = -r{toxinidir}/upper-constraints.txt commands = check-conflicts {toxinidir}/upper-constraints.txt {toxinidir}/upper-constraints-xfails.txt -[testenv:py35-check-uc] -basepython = python3.5 -install_command = pip install -U {opts} -c {toxinidir}/upper-constraints.txt {packages} -deps = -r{toxinidir}/upper-constraints.txt -commands = check-conflicts {toxinidir}/upper-constraints.txt {toxinidir}/upper-constraints-xfails.txt - [testenv:py36-check-uc] basepython = python3.6 install_command = pip install -U {opts} -c {toxinidir}/upper-constraints.txt {packages}