diff --git a/setup.cfg b/setup.cfg index a210ff4810e..718afb8697b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -16,7 +16,6 @@ classifier = Programming Language :: Python :: 2 Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 - Programming Language :: Python :: 3.4 Programming Language :: Python :: 3.5 [files] diff --git a/tox.ini b/tox.ini index d3138031fe9..06b7d9a8364 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = docs,py35,py34,py27,pep8 +envlist = docs,py35,py27,pep8 minversion = 2.3.1 skipsdist = True @@ -42,12 +42,6 @@ deps = {[testenv]deps} -r{toxinidir}/neutron/tests/functional/requirements.txt -[testenv:functional-py34] -basepython = python3.4 -setenv = {[testenv:functional]setenv} -deps = - {[testenv:functional]deps} - [testenv:functional-py35] basepython = python3.5 setenv = {[testenv:functional]setenv} @@ -65,16 +59,6 @@ commands = {toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin {toxinidir}/tools/ostestr_compat_shim.sh {posargs} -[testenv:dsvm-functional-py34] -basepython = python3.4 -setenv = {[testenv:dsvm-functional]setenv} -sitepackages={[testenv:dsvm-functional]sitepackages} -deps = - {[testenv:dsvm-functional]deps} -commands = - {toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin - {toxinidir}/tools/ostestr_compat_shim.sh {posargs} - [testenv:dsvm-functional-py35] basepython = python3.5 setenv = {[testenv:dsvm-functional]setenv}