diff --git a/setup.cfg b/setup.cfg index 3f91458..9565431 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 3f501a8..5294392 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,11 @@ [tox] -minversion = 2.0 +minversion = 3.1.1 skipsdist = True -envlist = py27,py37,pep8 +envlist = py37,pep8 [testenv] usedevelop = True +basepython = python3 install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages} setenv = VIRTUAL_ENV={envdir} deps = -r{toxinidir}/test-requirements.txt @@ -12,7 +13,6 @@ deps = -r{toxinidir}/test-requirements.txt commands = stestr run --slowest {posargs} [testenv:venv] -basepython = python3 commands = {posargs} [testenv:docs] @@ -24,12 +24,10 @@ commands = sphinx-build -W --keep-going -b html doc/source doc/build/html [testenv:pep8] -basepython = python3 deps = flake8 commands = flake8 [testenv:cover] -basepython = python3 setenv = PYTHON=coverage run --source tripleo_repos --parallel-mode commands =