[ussuri][goal] Drop python 2.7 support and testing
OpenStack is dropping the py2.7 support in ussuri cycle. Solum 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 Depends-On: https://review.opendev.org/#/c/693631/ Change-Id: If6bdeb65a08e4b0329e78a23ccdb642dfd308dde
This commit is contained in:
Ghanshyam Mann
zhurong
parent
4ffc8057d8
commit
3384d14117
20
.zuul.yaml
20
.zuul.yaml
|
|
@ -2,16 +2,15 @@
|
|||
templates:
|
||||
- openstack-cover-jobs
|
||||
- openstack-lower-constraints-jobs
|
||||
- openstack-python-jobs
|
||||
- openstack-python3-train-jobs
|
||||
- openstack-python3-ussuri-jobs
|
||||
- publish-openstack-docs-pti
|
||||
- release-notes-jobs-python3
|
||||
- check-requirements
|
||||
check:
|
||||
jobs:
|
||||
- solum-devstack-centos:
|
||||
voting: false
|
||||
- solum-devstack
|
||||
- solum-devstack-centos-7
|
||||
- solum-devstack-py3
|
||||
- solum-tempest-ipv6-only
|
||||
- solum-tox-bandit-baseline:
|
||||
voting: false
|
||||
|
|
@ -24,17 +23,13 @@
|
|||
- solum-tempest-ipv6-only
|
||||
|
||||
- job:
|
||||
name: solum-devstack-centos-7
|
||||
name: solum-devstack-centos
|
||||
parent: solum-tempest-base
|
||||
nodeset: devstack-single-node-centos-7
|
||||
|
||||
- job:
|
||||
name: solum-devstack-py3
|
||||
name: solum-devstack
|
||||
parent: solum-tempest-base
|
||||
voting: false
|
||||
vars:
|
||||
devstack_localrc:
|
||||
DEVSTACK_GATE_USE_PYTHON3: True
|
||||
|
||||
|
||||
- job:
|
||||
|
|
@ -73,6 +68,7 @@
|
|||
tls-proxy: false
|
||||
devstack_localrc:
|
||||
TEMPEST_PLUGINS: '/opt/stack/solum-tempest-plugin'
|
||||
USE_PYTHON3: True
|
||||
tempest_test_regex: application_deployment
|
||||
tox_envlist: all
|
||||
|
||||
|
|
@ -86,10 +82,6 @@
|
|||
timeout: 7800
|
||||
vars: *base_vars
|
||||
|
||||
- job:
|
||||
name: solum-devstack
|
||||
parent: solum-tempest-base
|
||||
|
||||
- job:
|
||||
# Security testing for known issues
|
||||
name: solum-tox-bandit-baseline
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
# 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
|
||||
# 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,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD
|
||||
openstackdocstheme>=1.20.0 # Apache-2.0
|
||||
sphinxcontrib-pecanwsme>=0.8.0 # Apache-2.0
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
---
|
||||
upgrade:
|
||||
- |
|
||||
Python 2.7 support has been dropped. Last release of Solum
|
||||
to support python 2.7 is OpenStack Train. The minimum version of Python now
|
||||
supported by Solum is Python 3.6.
|
||||
|
|
@ -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
|
||||
|
|
|
|||
15
tox.ini
15
tox.ini
|
|
@ -1,9 +1,10 @@
|
|||
[tox]
|
||||
minversion = 2.0
|
||||
envlist = py27,py37,pep8
|
||||
envlist = py37,pep8
|
||||
skipsdist = True
|
||||
|
||||
[testenv]
|
||||
basepython = python3
|
||||
usedevelop = True
|
||||
install_command = pip install -U {opts} {packages}
|
||||
setenv =
|
||||
|
|
@ -20,17 +21,14 @@ commands =
|
|||
stestr run {posargs}
|
||||
|
||||
[testenv:pep8]
|
||||
basepython = python3
|
||||
commands =
|
||||
flake8
|
||||
{toxinidir}/tools/check_for_alembic_branches.sh
|
||||
|
||||
[testenv:venv]
|
||||
basepython = python3
|
||||
commands = {posargs}
|
||||
|
||||
[testenv:cover]
|
||||
basepython = python3
|
||||
setenv =
|
||||
{[testenv]setenv}
|
||||
PYTHON=coverage run --source solum --parallel-mode
|
||||
|
|
@ -41,11 +39,9 @@ commands =
|
|||
coverage xml -o cover/coverage.xml
|
||||
|
||||
[testenv:debug]
|
||||
basepython = python3
|
||||
commands = oslo_debug_helper -t solum/tests {posargs}
|
||||
|
||||
[testenv:docs]
|
||||
basepython = python3
|
||||
deps =
|
||||
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
||||
-r{toxinidir}/requirements.txt
|
||||
|
|
@ -53,7 +49,6 @@ deps =
|
|||
commands = sphinx-build -W -b html doc/source doc/build/html
|
||||
|
||||
[testenv:pdf-docs]
|
||||
basepython = python3
|
||||
deps = {[testenv:docs]deps}
|
||||
whitelist_externals =
|
||||
make
|
||||
|
|
@ -62,17 +57,14 @@ commands =
|
|||
make -C doc/build/pdf
|
||||
|
||||
[testenv:genconfig]
|
||||
basepython = python3
|
||||
commands =
|
||||
oslo-config-generator --config-file=etc/solum/config-generator.conf
|
||||
|
||||
[testenv:genpolicy]
|
||||
basepython = python3
|
||||
commands =
|
||||
oslopolicy-sample-generator --config-file=etc/solum/policy-generator.conf
|
||||
|
||||
[testenv:releasenotes]
|
||||
basepython = python3
|
||||
deps =
|
||||
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
||||
-r{toxinidir}/requirements.txt
|
||||
|
|
@ -89,18 +81,15 @@ import_exceptions = solum.i18n
|
|||
local-check-factory = solum.hacking.checks.factory
|
||||
|
||||
[testenv:lower-constraints]
|
||||
basepython = python3
|
||||
deps =
|
||||
-c{toxinidir}/lower-constraints.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
-r{toxinidir}/requirements.txt
|
||||
|
||||
[testenv:bandit]
|
||||
basepython = python3
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
commands = bandit -r solum -n5 -x tests -ll
|
||||
|
||||
[testenv:bandit-baseline]
|
||||
basepython = python3
|
||||
envdir = {toxworkdir}/bandit
|
||||
commands = bandit-baseline -r solum -n5 -x tests -ii -ll
|
||||
|
|
|
|||
Loading…
Reference in New Issue