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

This commit is contained in:
Zuul 2019-12-25 05:03:01 +00:00 committed by Gerrit Code Review
commit 286ba01c16
9 changed files with 12 additions and 20 deletions

View File

@ -111,8 +111,7 @@
templates: templates:
- check-requirements - check-requirements
- openstack-lower-constraints-jobs - openstack-lower-constraints-jobs
- openstack-python-jobs - openstack-python3-ussuri-jobs
- openstack-python3-train-jobs
- periodic-stable-jobs - periodic-stable-jobs
- publish-openstack-docs-pti - publish-openstack-docs-pti
- release-notes-jobs-python3 - release-notes-jobs-python3

View File

@ -2,7 +2,6 @@
# 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.
openstackdocstheme>=1.18.1 # Apache-2.0 openstackdocstheme>=1.18.1 # Apache-2.0
sphinx!=1.6.6,!=1.6.7,>=1.6.3,<2.0.0;python_version=='2.7' # BSD
sphinx!=1.6.6,!=1.6.7,>=1.6.3;python_version>='3.4' # BSD sphinx!=1.6.6,!=1.6.7,>=1.6.3;python_version>='3.4' # BSD
sphinxcontrib-apidoc>=0.2.0 # BSD sphinxcontrib-apidoc>=0.2.0 # BSD
reno>=2.5.0 # Apache-2.0 reno>=2.5.0 # Apache-2.0

View File

@ -32,6 +32,7 @@
enable_plugin zaqar https://opendev.org/openstack/zaqar enable_plugin zaqar https://opendev.org/openstack/zaqar
# Enable Zaqar Tempest plugin # Enable Zaqar Tempest plugin
TEMPEST_PLUGINS='/opt/stack/new/zaqar-tempest-plugin' TEMPEST_PLUGINS='/opt/stack/new/zaqar-tempest-plugin'
USE_PYTHON3="True"
EOF EOF
executable: /bin/bash executable: /bin/bash

View File

@ -48,7 +48,7 @@
export DEVSTACK_GATE_EXERCISES=0 export DEVSTACK_GATE_EXERCISES=0
export DEVSTACK_GATE_PREPOPULATE_USERS=0 export DEVSTACK_GATE_PREPOPULATE_USERS=0
export DEVSTACK_GATE_USE_PYTHON3=False export DEVSTACK_GATE_USE_PYTHON3=True
export USE_KEYSTONE_V2API=0 export USE_KEYSTONE_V2API=0
export RALLY_SCENARIO=$ZUUL_SHORT_PROJECT_NAME-zaqar export RALLY_SCENARIO=$ZUUL_SHORT_PROJECT_NAME-zaqar

View File

@ -32,6 +32,7 @@
enable_plugin zaqar https://opendev.org/openstack/zaqar enable_plugin zaqar https://opendev.org/openstack/zaqar
# Enable Zaqar Tempest plugin # Enable Zaqar Tempest plugin
TEMPEST_PLUGINS='/opt/stack/new/zaqar-tempest-plugin' TEMPEST_PLUGINS='/opt/stack/new/zaqar-tempest-plugin'
USE_PYTHON3="True"
EOF EOF
executable: /bin/bash executable: /bin/bash

View File

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

View File

@ -28,8 +28,6 @@ oslo.utils>=3.33.0 # Apache-2.0
oslo.policy>=1.30.0 # Apache-2.0 oslo.policy>=1.30.0 # Apache-2.0
osprofiler>=1.4.0 # Apache-2.0 osprofiler>=1.4.0 # Apache-2.0
SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
enum34>=1.0.4;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD
trollius>=2.1;python_version=='2.7' # Apache-2.0
autobahn>=0.17.1 # MIT License autobahn>=0.17.1 # MIT License
requests>=2.14.2 # Apache-2.0 requests>=2.14.2 # Apache-2.0
futurist>=1.2.0 # Apache-2.0 futurist>=1.2.0 # Apache-2.0

View File

@ -13,8 +13,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

14
tox.ini
View File

@ -1,9 +1,10 @@
[tox] [tox]
minversion = 2.0 minversion = 2.0
envlist = py27,py37,pep8 envlist = py37,pep8
skipsdist = True skipsdist = True
[testenv] [testenv]
basepython = python3
usedevelop = True usedevelop = True
install_command = pip install {opts} {packages} install_command = pip install {opts} {packages}
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
@ -22,30 +23,25 @@ commands =
whitelist_externals = find whitelist_externals = find
[testenv:integration] [testenv:integration]
basepython = python3
setenv = {[testenv]setenv} setenv = {[testenv]setenv}
ZAQAR_TEST_INTEGRATION=1 ZAQAR_TEST_INTEGRATION=1
OS_TEST_PATH=./zaqar/tests/functional OS_TEST_PATH=./zaqar/tests/functional
commands = stestr run --serial --slowest {posargs} commands = stestr run --serial --slowest {posargs}
[testenv:pep8] [testenv:pep8]
basepython = python3
commands = commands =
doc8 doc/source doc8 doc/source
flake8 flake8
[testenv:genconfig] [testenv:genconfig]
basepython = python3
commands = commands =
oslo-config-generator --config-file etc/oslo-config-generator/zaqar.conf oslo-config-generator --config-file etc/oslo-config-generator/zaqar.conf
[testenv:genpolicy] [testenv:genpolicy]
basepython = python3
commands = commands =
oslopolicy-sample-generator --config-file etc/zaqar-policy-generator.conf oslopolicy-sample-generator --config-file etc/zaqar-policy-generator.conf
[testenv:cover] [testenv:cover]
basepython = python3
setenv = setenv =
{[testenv]setenv} {[testenv]setenv}
PYTHON=coverage run --source zaqar --parallel-mode PYTHON=coverage run --source zaqar --parallel-mode
@ -56,11 +52,9 @@ commands =
coverage xml -o cover/coverage.xml coverage xml -o cover/coverage.xml
[testenv:venv] [testenv:venv]
basepython = python3
commands = {posargs} commands = {posargs}
[testenv:docs] [testenv:docs]
basepython = python3
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
@ -68,7 +62,6 @@ commands =
sphinx-build -W -b html doc/source doc/build/html sphinx-build -W -b html doc/source doc/build/html
[testenv:api-ref] [testenv:api-ref]
basepython = python3
# This environment is called from CI scripts to test and publish # This environment is called from CI scripts to test and publish
# the API Ref to docs.openstack.org. # the API Ref to docs.openstack.org.
# #
@ -82,11 +75,9 @@ commands =
sphinx-build -W -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html sphinx-build -W -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html
[testenv:debug] [testenv:debug]
basepython = python3
commands = oslo_debug_helper {posargs} commands = oslo_debug_helper {posargs}
[testenv:releasenotes] [testenv:releasenotes]
basepython = python3
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
@ -113,7 +104,6 @@ max-line-length = 80
local-check-factory = zaqar.hacking.checks.factory local-check-factory = zaqar.hacking.checks.factory
[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