From b13aff57d83e209c1220daa4d96af401692869a3 Mon Sep 17 00:00:00 2001 From: Adit Sarfaty Date: Sun, 27 Oct 2019 15:08:33 +0200 Subject: [PATCH] Stop testing python 2 Since it's no longer supported past Train, lets stop running the tests. Please also see the related neutron patch: I1c171ab906a3b4c66558163ad26947ebf710a276 Change-Id: Iea431ea4cd56400d0867bdb4212f1c72f7cf6c72 --- .zuul.yaml | 3 +-- setup.cfg | 2 -- tox.ini | 9 ++------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index cd947ae4..145d7470 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,6 +1,5 @@ - project: templates: - openstack-lower-constraints-jobs - - openstack-python-jobs - - openstack-python3-train-jobs + - openstack-python3-ussuri-jobs - check-requirements diff --git a/setup.cfg b/setup.cfg index 67c6262e..0ce80154 100644 --- a/setup.cfg +++ b/setup.cfg @@ -13,8 +13,6 @@ classifier = License :: OSI Approved :: Apache Software License Operating System :: POSIX :: Linux Programming Language :: Python - Programming Language :: Python :: 2 - Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 diff --git a/tox.ini b/tox.ini index 16b3957a..d9fce799 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,11 @@ [tox] -envlist = py27,py37,pep8 +envlist = py37,pep8 minversion = 2.0 skipsdist = True [testenv] install_command = pip install {opts} {packages} +basepython = python3 setenv = VIRTUAL_ENV={envdir} PYTHONWARNINGS=default::DeprecationWarning passenv = TRACE_FAILONLY GENERATE_HASHES http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY @@ -26,7 +27,6 @@ setenv = {[testenv]setenv} commands = false [testenv:functional] -basepython = python3 setenv = {[testenv]setenv} {[testenv:common]setenv} OS_TEST_PATH=./vmware_nsxlib/tests/functional @@ -36,7 +36,6 @@ deps = -r{toxinidir}/vmware_nsxlib/tests/functional/requirements.txt [testenv:dsvm-functional] -basepython = python3 setenv = {[testenv]setenv} OS_SUDO_TESTING=1 OS_FAIL_ON_MISSING_DEPS=1 @@ -53,7 +52,6 @@ sitepackages = True commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html [testenv:pep8] -basepython = python3 deps = {[testenv]deps} commands = @@ -70,7 +68,6 @@ deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/ commands = bandit -r vmware_nsxlib -n 5 -ll [testenv:cover] -basepython = python3 commands = python setup.py test --coverage --coverage-package-name=vmware_nsxlib --testr-args='{posargs}' coverage report @@ -79,7 +76,6 @@ commands = commands = {posargs} [testenv:docs] -basepython = python3 deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/doc/requirements.txt commands = sphinx-build -b html doc/source doc/build/html @@ -108,7 +104,6 @@ commands = check-uuid --fix [testenv:lower-constraints] -basepython = python3 deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt