Skip to content

Commit 9424e67

Browse files
lukapeschkeGhanshyam Mann
authored andcommitted
[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
1 parent 9c3bd77 commit 9424e67

5 files changed

Lines changed: 15 additions & 45 deletions

File tree

.zuul.yaml

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
cloudkitty: https://opendev.org/openstack/cloudkitty
2222
devstack_localrc:
2323
CLOUDKITTY_FETCHER: keystone
24+
DEVSTACK_GATE_USE_PYTHON3: "True"
25+
USE_PYTHON3: True
2426
devstack_services:
2527
ck-api: true
2628
horizon: false
@@ -39,34 +41,11 @@
3941
vars:
4042
tox_envlist: functional-v2
4143

42-
- job:
43-
name: cloudkittyclient-devstack-functional-base-py3
44-
parent: cloudkittyclient-devstack-functional-base
45-
description: |
46-
Job for cloudkittyclient functional tests, ran in python3.
47-
vars:
48-
devstack_localrc:
49-
DEVSTACK_GATE_USE_PYTHON3: "True"
50-
USE_PYTHON3: "True"
51-
52-
- job:
53-
name: cloudkittyclient-devstack-functional-v1-client-py3
54-
parent: cloudkittyclient-devstack-functional-base-py3
55-
vars:
56-
tox_envlist: functional-v1
57-
58-
- job:
59-
name: cloudkittyclient-devstack-functional-v2-client-py3
60-
parent: cloudkittyclient-devstack-functional-base-py3
61-
vars:
62-
tox_envlist: functional-v2
63-
6444
- project:
6545
templates:
6646
- openstack-lower-constraints-jobs
6747
- check-requirements
6848
- openstack-cover-jobs
69-
- openstack-python-jobs
7049
- openstack-python3-ussuri-jobs
7150
- openstackclient-plugin-jobs
7251
- publish-openstack-docs-pti
@@ -76,17 +55,9 @@
7655
voting: true
7756
- cloudkittyclient-devstack-functional-v2-client:
7857
voting: true
79-
- cloudkittyclient-devstack-functional-v1-client-py3:
80-
voting: true
81-
- cloudkittyclient-devstack-functional-v2-client-py3:
82-
voting: true
8358
gate:
8459
jobs:
8560
- cloudkittyclient-devstack-functional-v1-client:
8661
voting: true
8762
- cloudkittyclient-devstack-functional-v2-client:
8863
voting: true
89-
- cloudkittyclient-devstack-functional-v1-client-py3:
90-
voting: true
91-
- cloudkittyclient-devstack-functional-v2-client-py3:
92-
voting: true

doc/requirements.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
# process, which may cause wedges in the gate later.
44

55
openstackdocstheme>=1.30.0 # Apache-2.0
6-
sphinx>=1.8.0,<2.0.0;python_version=='2.7' # BSD
7-
sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD
6+
sphinx>=1.8.0,!=2.1.0 # BSD
87
sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
98
reno>=2.5.0 # Apache-2.0
109
cliff>=2.11.0 # Apache-2.0
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
upgrade:
3+
- |
4+
Python 2.7 support has been dropped. The last release of
5+
``cloudkittyclient`` to support python 2.7 is OpenStack Train (3.1.0).
6+
The minimum version of Python now supported by ``cloudkittyclient``
7+
is Python 3.6.

setup.cfg

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ description-file =
66
author = OpenStack
77
author-email = openstack-discuss@lists.openstack.org
88
home-page = https://docs.openstack.org/python-cloudkittyclient/latest/
9+
python-requires = >=3.6
910
classifier =
1011
Environment :: OpenStack
1112
Intended Audience :: Information Technology
1213
Intended Audience :: System Administrators
1314
License :: OSI Approved :: Apache Software License
1415
Operating System :: POSIX :: Linux
1516
Programming Language :: Python
16-
Programming Language :: Python :: 2
17-
Programming Language :: Python :: 2.7
1817
Programming Language :: Python :: 3
1918
Programming Language :: Python :: 3.6
2019
Programming Language :: Python :: 3.7

tox.ini

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
[tox]
2-
minversion = 2.0
3-
envlist = py27,py36,py37,pypy,pep8
2+
minversion = 3.1.1
3+
envlist = py36,py37,pep8
44
skipsdist = True
5+
ignore_basepython_conflict = True
56

67
[testenv]
8+
basepython = python3
79
usedevelop = True
810
install_command = pip install -U {opts} {packages}
911
setenv =
@@ -13,7 +15,6 @@ deps = -r{toxinidir}/requirements.txt
1315
commands = stestr run {posargs}
1416

1517
[testenv:cover]
16-
basepython = python3
1718
setenv =
1819
VIRTUAL_ENV={envdir}
1920
PYTHON=coverage run --source cloudkittyclient --parallel-mode
@@ -25,7 +26,6 @@ commands =
2526
coverage report
2627

2728
[testenv:debug]
28-
basepython = python3
2929
commands = oslo_debug_helper -t cloudkittyclient/tests {posargs}
3030

3131
[testenv:functional-v1]
@@ -39,20 +39,16 @@ setenv = OS_RATING_API_VERSION=2
3939
commands = stestr run --concurrency=1 --test-path ./cloudkittyclient/tests/functional/v2
4040

4141
[testenv:pep8]
42-
basepython = python3
4342
commands = flake8
4443

4544
[testenv:venv]
46-
basepython = python3
4745
commands = {posargs}
4846

4947
[testenv:docs]
50-
basepython = python3
5148
deps = -r{toxinidir}/doc/requirements.txt
5249
commands = sphinx-build --keep-going -b html doc/source doc/build/html
5350

5451
[testenv:pdf-docs]
55-
basepython = python3
5652
envdir = {toxworkdir}/docs
5753
deps = {[testenv:docs]deps}
5854
whitelist_externals =
@@ -73,15 +69,13 @@ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,releasenotes
7369
import_exceptions = cloudkittyclient.i18n
7470

7571
[testenv:releasenotes]
76-
basepython = python3
7772
deps =
7873
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
7974
-r{toxinidir}/doc/requirements.txt
8075
commands =
8176
sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html
8277

8378
[testenv:lower-constraints]
84-
basepython = python3
8579
deps =
8680
-c{toxinidir}/lower-constraints.txt
8781
-r{toxinidir}/test-requirements.txt

0 commit comments

Comments
 (0)