[ussuri][goal] Drop python 2.7 support and testing
This drops python2.7 support for cloudkittyclient. Even if this should be done between milestone-1 and milestone-2, zuul jobs running on python2 are currently broken since nova dropped python2.7 support. Depends-On: https://review.opendev.org/#/c/693631/ Change-Id: I7615601540419e45259291a7bfce1cc038c27986
This commit is contained in:
parent
9c3bd770f2
commit
9424e67f21
33
.zuul.yaml
33
.zuul.yaml
|
@ -21,6 +21,8 @@
|
||||||
cloudkitty: https://opendev.org/openstack/cloudkitty
|
cloudkitty: https://opendev.org/openstack/cloudkitty
|
||||||
devstack_localrc:
|
devstack_localrc:
|
||||||
CLOUDKITTY_FETCHER: keystone
|
CLOUDKITTY_FETCHER: keystone
|
||||||
|
DEVSTACK_GATE_USE_PYTHON3: "True"
|
||||||
|
USE_PYTHON3: True
|
||||||
devstack_services:
|
devstack_services:
|
||||||
ck-api: true
|
ck-api: true
|
||||||
horizon: false
|
horizon: false
|
||||||
|
@ -39,34 +41,11 @@
|
||||||
vars:
|
vars:
|
||||||
tox_envlist: functional-v2
|
tox_envlist: functional-v2
|
||||||
|
|
||||||
- job:
|
|
||||||
name: cloudkittyclient-devstack-functional-base-py3
|
|
||||||
parent: cloudkittyclient-devstack-functional-base
|
|
||||||
description: |
|
|
||||||
Job for cloudkittyclient functional tests, ran in python3.
|
|
||||||
vars:
|
|
||||||
devstack_localrc:
|
|
||||||
DEVSTACK_GATE_USE_PYTHON3: "True"
|
|
||||||
USE_PYTHON3: "True"
|
|
||||||
|
|
||||||
- job:
|
|
||||||
name: cloudkittyclient-devstack-functional-v1-client-py3
|
|
||||||
parent: cloudkittyclient-devstack-functional-base-py3
|
|
||||||
vars:
|
|
||||||
tox_envlist: functional-v1
|
|
||||||
|
|
||||||
- job:
|
|
||||||
name: cloudkittyclient-devstack-functional-v2-client-py3
|
|
||||||
parent: cloudkittyclient-devstack-functional-base-py3
|
|
||||||
vars:
|
|
||||||
tox_envlist: functional-v2
|
|
||||||
|
|
||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- openstack-lower-constraints-jobs
|
- openstack-lower-constraints-jobs
|
||||||
- check-requirements
|
- check-requirements
|
||||||
- openstack-cover-jobs
|
- openstack-cover-jobs
|
||||||
- openstack-python-jobs
|
|
||||||
- openstack-python3-ussuri-jobs
|
- openstack-python3-ussuri-jobs
|
||||||
- openstackclient-plugin-jobs
|
- openstackclient-plugin-jobs
|
||||||
- publish-openstack-docs-pti
|
- publish-openstack-docs-pti
|
||||||
|
@ -76,17 +55,9 @@
|
||||||
voting: true
|
voting: true
|
||||||
- cloudkittyclient-devstack-functional-v2-client:
|
- cloudkittyclient-devstack-functional-v2-client:
|
||||||
voting: true
|
voting: true
|
||||||
- cloudkittyclient-devstack-functional-v1-client-py3:
|
|
||||||
voting: true
|
|
||||||
- cloudkittyclient-devstack-functional-v2-client-py3:
|
|
||||||
voting: true
|
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
- cloudkittyclient-devstack-functional-v1-client:
|
- cloudkittyclient-devstack-functional-v1-client:
|
||||||
voting: true
|
voting: true
|
||||||
- cloudkittyclient-devstack-functional-v2-client:
|
- cloudkittyclient-devstack-functional-v2-client:
|
||||||
voting: true
|
voting: true
|
||||||
- cloudkittyclient-devstack-functional-v1-client-py3:
|
|
||||||
voting: true
|
|
||||||
- cloudkittyclient-devstack-functional-v2-client-py3:
|
|
||||||
voting: true
|
|
||||||
|
|
|
@ -3,8 +3,7 @@
|
||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
|
|
||||||
openstackdocstheme>=1.30.0 # Apache-2.0
|
openstackdocstheme>=1.30.0 # Apache-2.0
|
||||||
sphinx>=1.8.0,<2.0.0;python_version=='2.7' # BSD
|
sphinx>=1.8.0,!=2.1.0 # BSD
|
||||||
sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD
|
|
||||||
sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
|
sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
|
||||||
reno>=2.5.0 # Apache-2.0
|
reno>=2.5.0 # Apache-2.0
|
||||||
cliff>=2.11.0 # Apache-2.0
|
cliff>=2.11.0 # Apache-2.0
|
||||||
|
|
|
@ -0,0 +1,7 @@
|
||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
Python 2.7 support has been dropped. The last release of
|
||||||
|
``cloudkittyclient`` to support python 2.7 is OpenStack Train (3.1.0).
|
||||||
|
The minimum version of Python now supported by ``cloudkittyclient``
|
||||||
|
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/python-cloudkittyclient/latest/
|
home-page = https://docs.openstack.org/python-cloudkittyclient/latest/
|
||||||
|
python-requires = >=3.6
|
||||||
classifier =
|
classifier =
|
||||||
Environment :: OpenStack
|
Environment :: OpenStack
|
||||||
Intended Audience :: Information Technology
|
Intended Audience :: Information Technology
|
||||||
|
@ -13,8 +14,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
14
tox.ini
|
@ -1,9 +1,11 @@
|
||||||
[tox]
|
[tox]
|
||||||
minversion = 2.0
|
minversion = 3.1.1
|
||||||
envlist = py27,py36,py37,pypy,pep8
|
envlist = py36,py37,pep8
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
ignore_basepython_conflict = True
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
|
basepython = python3
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command = pip install -U {opts} {packages}
|
install_command = pip install -U {opts} {packages}
|
||||||
setenv =
|
setenv =
|
||||||
|
@ -13,7 +15,6 @@ deps = -r{toxinidir}/requirements.txt
|
||||||
commands = stestr run {posargs}
|
commands = stestr run {posargs}
|
||||||
|
|
||||||
[testenv:cover]
|
[testenv:cover]
|
||||||
basepython = python3
|
|
||||||
setenv =
|
setenv =
|
||||||
VIRTUAL_ENV={envdir}
|
VIRTUAL_ENV={envdir}
|
||||||
PYTHON=coverage run --source cloudkittyclient --parallel-mode
|
PYTHON=coverage run --source cloudkittyclient --parallel-mode
|
||||||
|
@ -25,7 +26,6 @@ commands =
|
||||||
coverage report
|
coverage report
|
||||||
|
|
||||||
[testenv:debug]
|
[testenv:debug]
|
||||||
basepython = python3
|
|
||||||
commands = oslo_debug_helper -t cloudkittyclient/tests {posargs}
|
commands = oslo_debug_helper -t cloudkittyclient/tests {posargs}
|
||||||
|
|
||||||
[testenv:functional-v1]
|
[testenv:functional-v1]
|
||||||
|
@ -39,20 +39,16 @@ setenv = OS_RATING_API_VERSION=2
|
||||||
commands = stestr run --concurrency=1 --test-path ./cloudkittyclient/tests/functional/v2
|
commands = stestr run --concurrency=1 --test-path ./cloudkittyclient/tests/functional/v2
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python3
|
|
||||||
commands = flake8
|
commands = flake8
|
||||||
|
|
||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
basepython = python3
|
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
basepython = python3
|
|
||||||
deps = -r{toxinidir}/doc/requirements.txt
|
deps = -r{toxinidir}/doc/requirements.txt
|
||||||
commands = sphinx-build --keep-going -b html doc/source doc/build/html
|
commands = sphinx-build --keep-going -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 =
|
||||||
|
@ -73,7 +69,6 @@ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,releasenotes
|
||||||
import_exceptions = cloudkittyclient.i18n
|
import_exceptions = cloudkittyclient.i18n
|
||||||
|
|
||||||
[testenv:releasenotes]
|
[testenv:releasenotes]
|
||||||
basepython = python3
|
|
||||||
deps =
|
deps =
|
||||||
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
|
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
|
||||||
-r{toxinidir}/doc/requirements.txt
|
-r{toxinidir}/doc/requirements.txt
|
||||||
|
@ -81,7 +76,6 @@ commands =
|
||||||
sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html
|
sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html
|
||||||
|
|
||||||
[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
|
||||||
|
|
Loading…
Reference in New Issue