Merge "Stop testing Python 2"
This commit is contained in:
commit
af1c1a822a
11
.zuul.yaml
11
.zuul.yaml
@ -177,17 +177,15 @@
|
|||||||
templates:
|
templates:
|
||||||
- openstack-cover-jobs
|
- openstack-cover-jobs
|
||||||
- openstack-lower-constraints-jobs
|
- openstack-lower-constraints-jobs
|
||||||
- openstack-python-jobs
|
|
||||||
- openstack-python3-ussuri-jobs
|
- openstack-python3-ussuri-jobs
|
||||||
- publish-openstack-docs-pti
|
- publish-openstack-docs-pti
|
||||||
- periodic-stable-jobs
|
- periodic-stable-jobs
|
||||||
- check-requirements
|
- check-requirements
|
||||||
- integrated-gate
|
|
||||||
- integrated-gate-py3
|
- integrated-gate-py3
|
||||||
- release-notes-jobs-python3
|
- release-notes-jobs-python3
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- keystone-dsvm-functional:
|
- keystone-dsvm-py3-functional:
|
||||||
irrelevant-files: &irrelevant-files
|
irrelevant-files: &irrelevant-files
|
||||||
- ^.*\.rst$
|
- ^.*\.rst$
|
||||||
- ^api-ref/.*$
|
- ^api-ref/.*$
|
||||||
@ -195,11 +193,6 @@
|
|||||||
- ^etc/.*$
|
- ^etc/.*$
|
||||||
- ^keystone/tests/unit/.*$
|
- ^keystone/tests/unit/.*$
|
||||||
- ^releasenotes/.*$
|
- ^releasenotes/.*$
|
||||||
- keystone-dsvm-py3-functional:
|
|
||||||
irrelevant-files: *irrelevant-files
|
|
||||||
- keystone-dsvm-functional-federation-opensuse15:
|
|
||||||
voting: false
|
|
||||||
irrelevant-files: *irrelevant-files
|
|
||||||
- keystone-dsvm-py3-functional-federation-opensuse15:
|
- keystone-dsvm-py3-functional-federation-opensuse15:
|
||||||
voting: false
|
voting: false
|
||||||
irrelevant-files: *irrelevant-files
|
irrelevant-files: *irrelevant-files
|
||||||
@ -219,8 +212,6 @@
|
|||||||
- ^keystone/tests/unit/.*$
|
- ^keystone/tests/unit/.*$
|
||||||
- ^releasenotes/.*$
|
- ^releasenotes/.*$
|
||||||
- ^setup.cfg$
|
- ^setup.cfg$
|
||||||
- tempest-full:
|
|
||||||
irrelevant-files: *tempest-irrelevant-files
|
|
||||||
- tempest-full-py3:
|
- tempest-full-py3:
|
||||||
irrelevant-files: *tempest-irrelevant-files
|
irrelevant-files: *tempest-irrelevant-files
|
||||||
- neutron-grenade:
|
- neutron-grenade:
|
||||||
|
@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
Dropping the Python2 support in OpenStack Ussuri according to
|
||||||
|
`the TC deprecation timeline
|
||||||
|
<https://governance.openstack.org/tc/resolutions/20180529-python2-deprecation-timeline.html>`_
|
@ -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
|
||||||
|
20
tox.ini
20
tox.ini
@ -1,11 +1,12 @@
|
|||||||
[tox]
|
[tox]
|
||||||
minversion = 2.5.0
|
minversion = 2.5.0
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
envlist = py27,py37,pep8,api-ref,docs,genconfig,genpolicy,releasenotes,protection
|
envlist = py37,pep8,api-ref,docs,genconfig,genpolicy,releasenotes,protection
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command = pip install {opts} {packages}
|
install_command = pip install {opts} {packages}
|
||||||
|
basepython = python3
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
@ -20,14 +21,12 @@ whitelist_externals =
|
|||||||
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY PBR_VERSION
|
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY PBR_VERSION
|
||||||
|
|
||||||
[testenv:api-ref]
|
[testenv:api-ref]
|
||||||
basepython = python3
|
|
||||||
deps = -r{toxinidir}/doc/requirements.txt
|
deps = -r{toxinidir}/doc/requirements.txt
|
||||||
commands =
|
commands =
|
||||||
bash -c "rm -rf api-ref/build"
|
bash -c "rm -rf api-ref/build"
|
||||||
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:pep8]
|
[testenv:pep8]
|
||||||
basepython = python3
|
|
||||||
deps =
|
deps =
|
||||||
.[bandit]
|
.[bandit]
|
||||||
{[testenv]deps}
|
{[testenv]deps}
|
||||||
@ -40,14 +39,12 @@ commands =
|
|||||||
bandit -r keystone -x 'keystone/tests/*'
|
bandit -r keystone -x 'keystone/tests/*'
|
||||||
|
|
||||||
[testenv:fast8]
|
[testenv:fast8]
|
||||||
basepython = python3
|
|
||||||
envdir = {toxworkdir}/pep8
|
envdir = {toxworkdir}/pep8
|
||||||
commands =
|
commands =
|
||||||
{toxinidir}/tools/fast8.sh
|
{toxinidir}/tools/fast8.sh
|
||||||
passenv = FAST8_NUM_COMMITS
|
passenv = FAST8_NUM_COMMITS
|
||||||
|
|
||||||
[testenv:bandit]
|
[testenv:bandit]
|
||||||
basepython = python3
|
|
||||||
# NOTE(browne): This is required for the integration test job of the bandit
|
# NOTE(browne): This is required for the integration test job of the bandit
|
||||||
# project. Please do not remove.
|
# project. Please do not remove.
|
||||||
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
||||||
@ -56,7 +53,6 @@ deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/
|
|||||||
commands = bandit -r keystone -x 'keystone/tests/*'
|
commands = bandit -r keystone -x 'keystone/tests/*'
|
||||||
|
|
||||||
[testenv:cover]
|
[testenv:cover]
|
||||||
basepython = python3
|
|
||||||
# Also do not run test_coverage_ext tests while gathering coverage as those
|
# Also do not run test_coverage_ext tests while gathering coverage as those
|
||||||
# tests conflict with coverage.
|
# tests conflict with coverage.
|
||||||
setenv =
|
setenv =
|
||||||
@ -70,16 +66,13 @@ commands =
|
|||||||
coverage xml -o cover/coverage.xml
|
coverage xml -o cover/coverage.xml
|
||||||
|
|
||||||
[testenv:patch_cover]
|
[testenv:patch_cover]
|
||||||
basepython = python3
|
|
||||||
commands =
|
commands =
|
||||||
bash tools/cover.sh
|
bash tools/cover.sh
|
||||||
|
|
||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
basepython = python3
|
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
[testenv:debug]
|
[testenv:debug]
|
||||||
basepython = python3
|
|
||||||
commands =
|
commands =
|
||||||
find keystone -type f -name "*.pyc" -delete
|
find keystone -type f -name "*.pyc" -delete
|
||||||
oslo_debug_helper {posargs}
|
oslo_debug_helper {posargs}
|
||||||
@ -95,7 +88,6 @@ passenv =
|
|||||||
KSTEST_PROJECT_ID
|
KSTEST_PROJECT_ID
|
||||||
|
|
||||||
[testenv:functional]
|
[testenv:functional]
|
||||||
basepython = python3
|
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
setenv = OS_TEST_PATH=./keystone/tests/functional
|
setenv = OS_TEST_PATH=./keystone/tests/functional
|
||||||
commands =
|
commands =
|
||||||
@ -133,7 +125,6 @@ exclude=.venv,.git,.tox,build,dist,*lib/python*,*egg,tools,vendor,.update-venv,*
|
|||||||
max-complexity=24
|
max-complexity=24
|
||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
basepython = python3
|
|
||||||
deps =
|
deps =
|
||||||
-r{toxinidir}/doc/requirements.txt
|
-r{toxinidir}/doc/requirements.txt
|
||||||
.[ldap,memcache,mongodb]
|
.[ldap,memcache,mongodb]
|
||||||
@ -149,7 +140,6 @@ commands=
|
|||||||
# the workaround after this patch has merged:
|
# the workaround after this patch has merged:
|
||||||
# https://review.opendev.org/#/c/679860
|
# https://review.opendev.org/#/c/679860
|
||||||
[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 =
|
||||||
@ -163,16 +153,13 @@ commands =
|
|||||||
make -C doc/build/pdf
|
make -C doc/build/pdf
|
||||||
|
|
||||||
[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:genconfig]
|
[testenv:genconfig]
|
||||||
basepython = python3
|
|
||||||
commands = oslo-config-generator --config-file=config-generator/keystone.conf
|
commands = oslo-config-generator --config-file=config-generator/keystone.conf
|
||||||
|
|
||||||
[testenv:genpolicy]
|
[testenv:genpolicy]
|
||||||
basepython = python3
|
|
||||||
commands = oslopolicy-sample-generator --config-file config-generator/keystone-policy-generator.conf
|
commands = oslopolicy-sample-generator --config-file config-generator/keystone-policy-generator.conf
|
||||||
|
|
||||||
[hacking]
|
[hacking]
|
||||||
@ -182,7 +169,6 @@ import_exceptions =
|
|||||||
local-check-factory = keystone.tests.hacking.checks.factory
|
local-check-factory = keystone.tests.hacking.checks.factory
|
||||||
|
|
||||||
[testenv:bindep]
|
[testenv:bindep]
|
||||||
basepython = python3
|
|
||||||
# Do not install any requirements. We want this to be fast and work even if
|
# Do not install any requirements. We want this to be fast and work even if
|
||||||
# system dependencies are missing, since it's used to tell you what system
|
# system dependencies are missing, since it's used to tell you what system
|
||||||
# dependencies are missing! This also means that bindep must be installed
|
# dependencies are missing! This also means that bindep must be installed
|
||||||
@ -191,14 +177,12 @@ deps = bindep
|
|||||||
commands = bindep test
|
commands = bindep test
|
||||||
|
|
||||||
[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
|
||||||
.[ldap,memcache,mongodb]
|
.[ldap,memcache,mongodb]
|
||||||
|
|
||||||
[testenv:protection]
|
[testenv:protection]
|
||||||
basepython = python3
|
|
||||||
commands =
|
commands =
|
||||||
find keystone -type f -name "*.pyc" -delete
|
find keystone -type f -name "*.pyc" -delete
|
||||||
stestr run --test-path=./keystone/tests/protection {posargs}
|
stestr run --test-path=./keystone/tests/protection {posargs}
|
||||||
|
Loading…
Reference in New Issue
Block a user