From ed2c1e37672c5f90a8f820c49d014525298dc1c5 Mon Sep 17 00:00:00 2001 From: Eric Brown Date: Mon, 9 Jan 2017 10:08:07 -0800 Subject: [PATCH] Remove references to Python 3.4 Now that there exists only a gate job for Python 3.5 and not 3.4, we should remove those references to the 3.4 that is untested. Change-Id: I2a00ead626d9eced96487ee82b5d7857126d8355 --- setup.cfg | 1 - tox.ini | 22 +--------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/setup.cfg b/setup.cfg index 4fdfad846..31f6d4468 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 e42e80893..838865fb0 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 2.0 -envlist = py35,py34,py27,pep8,bandit +envlist = py35,py27,pep8,bandit [testenv] setenv = @@ -34,13 +34,6 @@ setenv = TRANSPORT_DRIVER=rabbit commands = pifpaf run rabbitmq -- python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}' -[testenv:py34-func-rabbit] -setenv = - {[testenv]setenv} - TRANSPORT_DRIVER=rabbit -basepython = python3.4 -commands = pifpaf run rabbitmq -- python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}' - [testenv:py35-func-rabbit] setenv = {[testenv]setenv} @@ -70,16 +63,6 @@ setenv = WORKDIR={toxworkdir} commands = {toxinidir}/setup-test-env-amqp1.sh python setup.py testr --slowest --testr-args='oslo_messaging.tests.functional' -[testenv:py34-func-amqp1] -basepython = python3.4 -setenv = - {[testenv]setenv} - TRANSPORT_URL=amqp://stackqpid:secretqpid@127.0.0.1:65123// - AMQP1_BACKEND=qpidd - ENVNAME={envname} - WORKDIR={toxworkdir} -commands = {toxinidir}/setup-test-env-amqp1.sh python setup.py testr --slowest --testr-args='oslo_messaging.tests.functional' - [testenv:py35-func-amqp1] basepython = python3.5 setenv = @@ -93,9 +76,6 @@ commands = {toxinidir}/setup-test-env-amqp1.sh python setup.py testr --slowest - [testenv:py27-func-zmq] commands = {toxinidir}/setup-test-env-zmq.sh python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}' -[testenv:py34-func-zmq] -commands = {toxinidir}/setup-test-env-zmq.sh python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}' - [testenv:py35-func-zmq] commands = {toxinidir}/setup-test-env-zmq.sh python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}'