Merge "Drop Python 2 Support"
This commit is contained in:
commit
d9ac7173f1
|
@ -3,7 +3,6 @@
|
||||||
- check-requirements
|
- check-requirements
|
||||||
- openstack-cover-jobs-neutron
|
- openstack-cover-jobs-neutron
|
||||||
- openstack-lower-constraints-jobs-neutron
|
- openstack-lower-constraints-jobs-neutron
|
||||||
- openstack-python-jobs-neutron
|
|
||||||
- openstack-python3-ussuri-jobs-neutron
|
- openstack-python3-ussuri-jobs-neutron
|
||||||
- periodic-stable-jobs-neutron
|
- periodic-stable-jobs-neutron
|
||||||
- publish-openstack-docs-pti
|
- publish-openstack-docs-pti
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
# The order of packages is significant, because pip processes them in the order
|
# The order of packages is significant, because pip processes them in the order
|
||||||
# of appearance. Changing the order has an impact on the overall integration
|
# of appearance. Changing the order has an impact on the overall integration
|
||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
|
sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
|
||||||
sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
|
|
||||||
sphinxcontrib-apidoc>=0.2.0 # BSD
|
sphinxcontrib-apidoc>=0.2.0 # BSD
|
||||||
sphinxmark>=0.1.14 # Apache-2.0
|
sphinxmark>=0.1.14 # Apache-2.0
|
||||||
openstackdocstheme>=1.18.1 # Apache-2.0
|
openstackdocstheme>=1.18.1 # Apache-2.0
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
Python 2.7 support has been dropped. The minimum version of Python now
|
||||||
|
supported by neutron-fwaas is Python 3.6.
|
|
@ -6,6 +6,7 @@ description-file =
|
||||||
author = OpenStack
|
author = OpenStack
|
||||||
author-email = openstack-discuss@lists.openstack.org
|
author-email = openstack-discuss@lists.openstack.org
|
||||||
home-page = https://docs.openstack.org/neutron-fwaas/latest/
|
home-page = https://docs.openstack.org/neutron-fwaas/latest/
|
||||||
|
python-requires = >=3.6
|
||||||
classifier =
|
classifier =
|
||||||
Environment :: OpenStack
|
Environment :: OpenStack
|
||||||
Intended Audience :: Information Technology
|
Intended Audience :: Information Technology
|
||||||
|
@ -16,6 +17,7 @@ classifier =
|
||||||
Programming Language :: Python :: 3
|
Programming Language :: Python :: 3
|
||||||
Programming Language :: Python :: 3.6
|
Programming Language :: Python :: 3.6
|
||||||
Programming Language :: Python :: 3.7
|
Programming Language :: Python :: 3.7
|
||||||
|
Programming Language :: Python :: 3 :: Only
|
||||||
|
|
||||||
[files]
|
[files]
|
||||||
packages =
|
packages =
|
||||||
|
|
21
tox.ini
21
tox.ini
|
@ -1,9 +1,10 @@
|
||||||
[tox]
|
[tox]
|
||||||
envlist = py27,py37,pep8,pylint
|
envlist = py37,pep8,pylint
|
||||||
minversion = 2.0
|
minversion = 3.1.1
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
|
basepython = python3
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
PYTHONWARNINGS=default::DeprecationWarning
|
PYTHONWARNINGS=default::DeprecationWarning
|
||||||
OS_LOG_CAPTURE={env:OS_LOG_CAPTURE:true}
|
OS_LOG_CAPTURE={env:OS_LOG_CAPTURE:true}
|
||||||
|
@ -27,7 +28,6 @@ setenv = OS_TEST_TIMEOUT=180
|
||||||
commands = false
|
commands = false
|
||||||
|
|
||||||
[testenv:dsvm]
|
[testenv:dsvm]
|
||||||
basepython = python3
|
|
||||||
# Fake job to define environment variables shared between dsvm jobs
|
# Fake job to define environment variables shared between dsvm jobs
|
||||||
setenv = OS_SUDO_TESTING=1
|
setenv = OS_SUDO_TESTING=1
|
||||||
OS_ROOTWRAP_CMD=sudo {envdir}/bin/neutron-rootwrap {envdir}/etc/neutron/rootwrap.conf
|
OS_ROOTWRAP_CMD=sudo {envdir}/bin/neutron-rootwrap {envdir}/etc/neutron/rootwrap.conf
|
||||||
|
@ -37,7 +37,6 @@ setenv = OS_SUDO_TESTING=1
|
||||||
commands = false
|
commands = false
|
||||||
|
|
||||||
[testenv:functional]
|
[testenv:functional]
|
||||||
basepython = python3
|
|
||||||
setenv = {[testenv]setenv}
|
setenv = {[testenv]setenv}
|
||||||
{[testenv:common]setenv}
|
{[testenv:common]setenv}
|
||||||
OS_TEST_PATH=./neutron_fwaas/tests/functional
|
OS_TEST_PATH=./neutron_fwaas/tests/functional
|
||||||
|
@ -46,7 +45,6 @@ commands =
|
||||||
stestr run {posargs}
|
stestr run {posargs}
|
||||||
|
|
||||||
[testenv:dsvm-fullstack]
|
[testenv:dsvm-fullstack]
|
||||||
basepython = python3
|
|
||||||
setenv = {[testenv]setenv}
|
setenv = {[testenv]setenv}
|
||||||
{[testenv:common]setenv}
|
{[testenv:common]setenv}
|
||||||
{[testenv:dsvm]setenv}
|
{[testenv:dsvm]setenv}
|
||||||
|
@ -60,7 +58,6 @@ commands =
|
||||||
|
|
||||||
|
|
||||||
[testenv:api]
|
[testenv:api]
|
||||||
basepython = python3
|
|
||||||
sitepackages=True
|
sitepackages=True
|
||||||
setenv =
|
setenv =
|
||||||
OS_TEST_PATH=./neutron_fwaas/tests/tempest_plugin/tests/api/
|
OS_TEST_PATH=./neutron_fwaas/tests/tempest_plugin/tests/api/
|
||||||
|
@ -70,7 +67,6 @@ commands =
|
||||||
stestr run {posargs}
|
stestr run {posargs}
|
||||||
|
|
||||||
[testenv:scenario]
|
[testenv:scenario]
|
||||||
basepython = python3
|
|
||||||
sitepackages=True
|
sitepackages=True
|
||||||
setenv =
|
setenv =
|
||||||
OS_TEST_PATH=./neutron_fwaas/tests/tempest_plugin/tests/scenario/
|
OS_TEST_PATH=./neutron_fwaas/tests/tempest_plugin/tests/scenario/
|
||||||
|
@ -80,7 +76,6 @@ commands =
|
||||||
stestr run {posargs}
|
stestr run {posargs}
|
||||||
|
|
||||||
[testenv:dsvm-functional]
|
[testenv:dsvm-functional]
|
||||||
basepython = python3
|
|
||||||
setenv =
|
setenv =
|
||||||
OS_TEST_PATH=./neutron_fwaas/tests/functional
|
OS_TEST_PATH=./neutron_fwaas/tests/functional
|
||||||
OS_SUDO_TESTING=1
|
OS_SUDO_TESTING=1
|
||||||
|
@ -97,12 +92,10 @@ commands =
|
||||||
stestr run {posargs}
|
stestr run {posargs}
|
||||||
|
|
||||||
[testenv:releasenotes]
|
[testenv:releasenotes]
|
||||||
basepython = python3
|
|
||||||
deps = -r{toxinidir}/doc/requirements.txt
|
deps = -r{toxinidir}/doc/requirements.txt
|
||||||
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
|
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python3
|
|
||||||
commands =
|
commands =
|
||||||
flake8
|
flake8
|
||||||
doc8 {posargs}
|
doc8 {posargs}
|
||||||
|
@ -113,7 +106,6 @@ commands =
|
||||||
whitelist_externals = sh
|
whitelist_externals = sh
|
||||||
|
|
||||||
[testenv:cover]
|
[testenv:cover]
|
||||||
basepython = python3
|
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
LANGUAGE=en_US
|
LANGUAGE=en_US
|
||||||
PYTHON=coverage run --source neutron_fwaas --omit='*tests*' --parallel-mode
|
PYTHON=coverage run --source neutron_fwaas --omit='*tests*' --parallel-mode
|
||||||
|
@ -126,12 +118,10 @@ commands =
|
||||||
coverage xml -o cover/coverage.xml
|
coverage xml -o cover/coverage.xml
|
||||||
|
|
||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
basepython = python3
|
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
deps = -r{toxinidir}/doc/requirements.txt
|
deps = -r{toxinidir}/doc/requirements.txt
|
||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
basepython = python3
|
|
||||||
deps = -r{toxinidir}/doc/requirements.txt
|
deps = -r{toxinidir}/doc/requirements.txt
|
||||||
whitelist_externals =
|
whitelist_externals =
|
||||||
rm
|
rm
|
||||||
|
@ -140,7 +130,6 @@ commands =
|
||||||
sphinx-build -W -b html doc/source doc/build/html
|
sphinx-build -W -b html doc/source doc/build/html
|
||||||
|
|
||||||
[testenv:pdf-docs]
|
[testenv:pdf-docs]
|
||||||
basepython = python3
|
|
||||||
envdir = {toxworkdir}/docs
|
envdir = {toxworkdir}/docs
|
||||||
deps = {[testenv:docs]deps}
|
deps = {[testenv:docs]deps}
|
||||||
whitelist_externals =
|
whitelist_externals =
|
||||||
|
@ -182,7 +171,6 @@ exclude = .venv,.git,.tox,dist,doc,*lib/python*,.tmp,*egg,build,tools,.ropeproje
|
||||||
import-order-style = pep8
|
import-order-style = pep8
|
||||||
|
|
||||||
[testenv:pylint]
|
[testenv:pylint]
|
||||||
basepython = python3
|
|
||||||
deps =
|
deps =
|
||||||
{[testenv]deps}
|
{[testenv]deps}
|
||||||
pylint
|
pylint
|
||||||
|
@ -194,14 +182,12 @@ import_exceptions = neutron_fwaas._i18n
|
||||||
local-check-factory = neutron_lib.hacking.checks.factory
|
local-check-factory = neutron_lib.hacking.checks.factory
|
||||||
|
|
||||||
[testenv:genconfig]
|
[testenv:genconfig]
|
||||||
basepython = python3
|
|
||||||
commands = {toxinidir}/tools/generate_config_file_samples.sh
|
commands = {toxinidir}/tools/generate_config_file_samples.sh
|
||||||
|
|
||||||
[testenv:genpolicy]
|
[testenv:genpolicy]
|
||||||
commands = oslopolicy-sample-generator --config-file=etc/oslo-policy-generator/policy.conf
|
commands = oslopolicy-sample-generator --config-file=etc/oslo-policy-generator/policy.conf
|
||||||
|
|
||||||
[testenv:lower-constraints]
|
[testenv:lower-constraints]
|
||||||
basepython = python3
|
|
||||||
deps =
|
deps =
|
||||||
-c{toxinidir}/lower-constraints.txt
|
-c{toxinidir}/lower-constraints.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
@ -214,7 +200,6 @@ commands =
|
||||||
pip install -q -e "git+https://git.openstack.org/openstack/neutron#egg=neutron"
|
pip install -q -e "git+https://git.openstack.org/openstack/neutron#egg=neutron"
|
||||||
|
|
||||||
[testenv:py3-dev]
|
[testenv:py3-dev]
|
||||||
basepython = python3
|
|
||||||
commands =
|
commands =
|
||||||
{[testenv:dev]commands}
|
{[testenv:dev]commands}
|
||||||
{[testenv]commands}
|
{[testenv]commands}
|
||||||
|
|
Loading…
Reference in New Issue