[ussuri][goal] Drop python 2.7 support and testing

OpenStack is dropping the py2.7 support in ussuri cycle.

Tricircle is ready with python 3 and ok to drop the
python 2.7 support.

Complete discussion & schedule can be found in
- http://lists.openstack.org/pipermail/openstack-discuss/2019-October/010142.html
- https://etherpad.openstack.org/p/drop-python2-support

Ussuri Communtiy-wide goal:
https://governance.openstack.org/tc/goals/selected/ussuri/drop-py27.html

Change-Id: Ia1352479bf3148ca68c432acf30cd55290d8bd3e
This commit is contained in:
Ghanshyam Mann 2019-10-30 07:10:20 +00:00
parent c9f5ddaed1
commit b4377093b7
5 changed files with 11 additions and 40 deletions

View File

@ -1,15 +1,3 @@
- job:
name: tricircle-functional
parent: legacy-dsvm-base
run: playbooks/tricircle-dsvm-functional/run.yaml
post-run: playbooks/tricircle-dsvm-functional/post.yaml
timeout: 7800
required-projects:
- openstack/devstack-gate
- openstack/tricircle
- openstack/neutron
- openstack/networking-sfc
- job: - job:
name: tricircle-functional-python3 name: tricircle-functional-python3
parent: legacy-dsvm-base parent: legacy-dsvm-base
@ -53,7 +41,6 @@
- project: - project:
templates: templates:
- openstack-python-jobs-neutron
- openstack-python3-ussuri-jobs-neutron - openstack-python3-ussuri-jobs-neutron
- openstack-python3-ussuri-jobs - openstack-python3-ussuri-jobs
- check-requirements - check-requirements
@ -67,14 +54,10 @@
required-projects: required-projects:
- openstack/neutron - openstack/neutron
- openstack/networking-sfc - openstack/networking-sfc
- openstack-tox-py27:
required-projects:
- openstack/neutron
- openstack-tox-py36: - openstack-tox-py36:
required-projects: required-projects:
- openstack/neutron - openstack/neutron
- openstack/networking-sfc - openstack/networking-sfc
- tricircle-functional
- tricircle-functional-python3 - tricircle-functional-python3
- tricircle-multiregion - tricircle-multiregion
gate: gate:
@ -84,12 +67,8 @@
required-projects: required-projects:
- openstack/neutron - openstack/neutron
- openstack/networking-sfc - openstack/networking-sfc
- openstack-tox-py27:
required-projects:
- openstack/neutron
- openstack-tox-py36: - openstack-tox-py36:
required-projects: required-projects:
- openstack/neutron - openstack/neutron
- openstack/networking-sfc - openstack/networking-sfc
- tricircle-functional
- tricircle-multiregion - tricircle-multiregion

View File

@ -32,6 +32,7 @@
export PROJECTS="openstack/networking-sfc $PROJECTS" export PROJECTS="openstack/networking-sfc $PROJECTS"
export DEVSTACK_GATE_CONFIGDRIVE=0 export DEVSTACK_GATE_CONFIGDRIVE=0
export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_USE_PYTHON3=True
export DEVSTACK_GATE_TEMPEST=0 export DEVSTACK_GATE_TEMPEST=0
export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=0 export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=0
export DEVSTACK_GATE_TEMPEST_REGEX="tricircle.tempestplugin" export DEVSTACK_GATE_TEMPEST_REGEX="tricircle.tempestplugin"

View File

@ -0,0 +1,6 @@
---
upgrade:
- |
Python 2.7 support has been dropped. Last release of Tricircle
to support py2.7 is OpenStack Train. The minimum version of Python now
supported by Tricircle is Python 3.6.

View File

@ -12,8 +12,6 @@ classifier =
License :: OSI Approved :: Apache Software License License :: OSI Approved :: Apache Software License
Operating System :: POSIX :: Linux Operating System :: POSIX :: Linux
Programming Language :: Python Programming Language :: Python
Programming Language :: Python :: 2
Programming Language :: Python :: 2.7
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

21
tox.ini
View File

@ -1,9 +1,11 @@
[tox] [tox]
minversion = 2.0 minversion = 3.1.1
envlist = py27,py37,pypy,pep8 envlist = py37,pypy,pep8
skipsdist = True skipsdist = True
ignore_basepython_conflict = True
[testenv] [testenv]
basepython = python3
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
PYTHONWARNINGS=default::DeprecationWarning PYTHONWARNINGS=default::DeprecationWarning
passenv = TRACE_FAILONLY GENERATE_HASHES http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY passenv = TRACE_FAILONLY GENERATE_HASHES http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
@ -19,50 +21,41 @@ commands =
stestr slowest stestr slowest
[testenv:releasenotes] [testenv:releasenotes]
basepython = python3
commands = sphinx-build -a -W -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html commands = sphinx-build -a -W -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
[testenv:pep8] [testenv:pep8]
basepython = python3
deps = deps =
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands = flake8 commands = flake8
[testenv:venv] [testenv:venv]
basepython = python3
commands = {posargs} commands = {posargs}
[testenv:cover] [testenv:cover]
basepython = python3
commands = commands =
python setup.py testr --coverage --testr-args='{posargs}' python setup.py testr --coverage --testr-args='{posargs}'
coverage report --fail-under=70 --skip-covered coverage report --fail-under=70 --skip-covered
[testenv:genconfig] [testenv:genconfig]
basepython = python3
deps = deps =
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands = oslo-config-generator --config-file=etc/api-cfg-gen.conf commands = oslo-config-generator --config-file=etc/api-cfg-gen.conf
oslo-config-generator --config-file=etc/xjob-cfg-gen.conf oslo-config-generator --config-file=etc/xjob-cfg-gen.conf
[testenv:genpolicy] [testenv:genpolicy]
basepython = python3
deps = deps =
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands = oslopolicy-sample-generator --config-file=etc/policy-generator.conf commands = oslopolicy-sample-generator --config-file=etc/policy-generator.conf
[testenv:docs] [testenv:docs]
basepython = python3
deps = deps =
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands = python setup.py build_sphinx commands = python setup.py build_sphinx
[testenv:debug] [testenv:debug]
basepython = python3
commands = oslo_debug_helper {posargs} commands = oslo_debug_helper {posargs}
[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
@ -87,12 +80,6 @@ commands =
pip install -q -e "git+https://opendev.org/openstack/networking-sfc#egg=networking_sfc" pip install -q -e "git+https://opendev.org/openstack/networking-sfc#egg=networking_sfc"
pip install -q -e "git+https://opendev.org/openstack/neutron#egg=neutron" pip install -q -e "git+https://opendev.org/openstack/neutron#egg=neutron"
[testenv:py27-dev]
basepython = python2.7
commands =
{[testenv:dev]commands}
{[testenv]commands}
[testenv:py3-dev] [testenv:py3-dev]
basepython = python3 basepython = python3
commands = commands =