diff --git a/.zuul.yaml b/.zuul.yaml index d43343a..b1c8faf 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,6 +1,6 @@ - job: name: heat-functional-convg-queens - parent: heat-functional-convg-mysql-lbaasv2 + parent: heat-functional-convg-mysql-lbaasv2-py3 nodeset: legacy-ubuntu-xenial override-checkout: stable/queens vars: @@ -13,10 +13,11 @@ nodeset: legacy-ubuntu-xenial vars: branch_override: stable/queens + use_python3: 1 - job: name: heat-functional-convg-rocky - parent: heat-functional-convg-mysql-lbaasv2 + parent: heat-functional-convg-mysql-lbaasv2-py3 override-checkout: stable/rocky nodeset: legacy-ubuntu-xenial vars: @@ -29,10 +30,11 @@ nodeset: legacy-ubuntu-xenial vars: branch_override: stable/rocky + use_python3: 1 - job: name: heat-functional-convg-stein - parent: heat-functional-convg-mysql-lbaasv2 + parent: heat-functional-convg-mysql-lbaasv2-py3 override-checkout: stable/stein nodeset: legacy-ubuntu-xenial vars: @@ -45,10 +47,11 @@ nodeset: legacy-ubuntu-xenial vars: branch_override: stable/stein + use_python3: 1 - job: name: heat-functional-convg-train - parent: heat-functional-convg-mysql-lbaasv2 + parent: heat-functional-convg-mysql-lbaasv2-py3 override-checkout: stable/train nodeset: legacy-ubuntu-xenial vars: @@ -61,6 +64,7 @@ nodeset: legacy-ubuntu-xenial vars: branch_override: stable/train + use_python3: 1 - project: templates: diff --git a/setup.cfg b/setup.cfg index 3bdd080..8776610 100644 --- a/setup.cfg +++ b/setup.cfg @@ -13,10 +13,10 @@ 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.5 + Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 keywords = setup diff --git a/tox.ini b/tox.ini index 45e17be..cf89710 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,11 @@ [tox] -envlist = py27,py35,pep8 -minversion = 0.1 +envlist = py37,pep8 +minversion = 3.1.1 skipsdist = True +ignore_basepython_conflict = True [testenv] +basepython = python3 userdevelop = True setenv = VIRTUAL_ENV={envdir} deps = -r{toxinidir}/requirements.txt @@ -12,7 +14,6 @@ commands = bash -c 'if [ ! -d ./.testrepository ] ; then testr init ; fi' testr run {posargs} [testenv:pep8] -basepython = python3 setenv = PYTHONPATH = . commands = @@ -26,7 +27,6 @@ commands = check-uuid --fix --package heat_tempest_plugin [testenv:venv] -basepython = python3 commands = {posargs} [flake8]