diff options
| author | Thomas Goirand <zigo@debian.org> | 2025-03-03 11:12:06 +0100 |
|---|---|---|
| committer | git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> | 2025-03-03 16:27:08 +0000 |
| commit | b49e1a77290654d272a698d985bfab60dcbb3a5a (patch) | |
| tree | 2d464bbc0d41bc08e9d43ff840a43d2d79b51b36 | |
| parent | 81d4f5824c90902c307ce50bffb26e22af6c5a51 (diff) | |
5.3.1-2 (patches unapplied)import/5.3.1-2
Imported using git-ubuntu import.
Notes
Notes:
* d/watch: switch to version=4 and mode=git.
* New upstream release.
| -rw-r--r-- | cloudkittyclient/utils.py | 6 | ||||
| -rw-r--r-- | cloudkittyclient/v2/scope.py | 7 | ||||
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | releasenotes/source/2023.1.rst | 2 | ||||
| -rw-r--r-- | releasenotes/source/2024.2.rst | 6 | ||||
| -rw-r--r-- | releasenotes/source/index.rst | 1 | ||||
| -rw-r--r-- | requirements.txt | 4 | ||||
| -rw-r--r-- | test-requirements.txt | 12 | ||||
| -rw-r--r-- | tox.ini | 3 |
9 files changed, 25 insertions, 28 deletions
diff --git a/cloudkittyclient/utils.py b/cloudkittyclient/utils.py index 8a71155..e6356a7 100644 --- a/cloudkittyclient/utils.py +++ b/cloudkittyclient/utils.py @@ -13,7 +13,6 @@ # under the License. # import inspect -import sys import pbr.version @@ -82,11 +81,6 @@ def format_http_errors(ignore): """ def wrap(cls): - # If you want pretty errors, use python3. - # __qualname__ does not exist in python 2 - if sys.version_info.major < 3: - return cls - def predicate(item): # This avoids decorating functions of parent classes return (inspect.isfunction(item) diff --git a/cloudkittyclient/v2/scope.py b/cloudkittyclient/v2/scope.py index fc8a279..a17acb9 100644 --- a/cloudkittyclient/v2/scope.py +++ b/cloudkittyclient/v2/scope.py @@ -12,11 +12,11 @@ # License for the specific language governing permissions and limitations # under the License. # +from oslo_utils import strutils + from cloudkittyclient.common import base from cloudkittyclient import exc -from distutils.util import strtobool - class ScopeManager(base.BaseManager): """Class used to handle /v2/scope endpoint""" @@ -133,7 +133,8 @@ class ScopeManager(base.BaseManager): ) if kwargs.get('active'): - body['active'] = strtobool(kwargs.get('active')) + body['active'] = strutils.bool_from_string( + kwargs.get('active'), strict=True) # Stripping None body = dict(filter(lambda elem: elem[1] is not None, body.items())) diff --git a/debian/changelog b/debian/changelog index 9e2e504..4f97cb8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +python-cloudkittyclient (5.3.1-2) experimental; urgency=medium + + * d/watch: switch to version=4 and mode=git. + + -- Thomas Goirand <zigo@debian.org> Mon, 03 Mar 2025 11:12:06 +0100 + +python-cloudkittyclient (5.3.1-1) experimental; urgency=medium + + * New upstream release. + + -- Thomas Goirand <zigo@debian.org> Mon, 03 Mar 2025 10:37:51 +0100 + python-cloudkittyclient (5.2.0-4) unstable; urgency=medium * Switch to pybuild (Closes: #1090475). diff --git a/releasenotes/source/2023.1.rst b/releasenotes/source/2023.1.rst index d123847..2c9a36f 100644 --- a/releasenotes/source/2023.1.rst +++ b/releasenotes/source/2023.1.rst @@ -3,4 +3,4 @@ =========================== .. release-notes:: - :branch: stable/2023.1 + :branch: unmaintained/2023.1 diff --git a/releasenotes/source/2024.2.rst b/releasenotes/source/2024.2.rst new file mode 100644 index 0000000..aaebcbc --- /dev/null +++ b/releasenotes/source/2024.2.rst @@ -0,0 +1,6 @@ +=========================== +2024.2 Series Release Notes +=========================== + +.. release-notes:: + :branch: stable/2024.2 diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst index 270e750..1a24df1 100644 --- a/releasenotes/source/index.rst +++ b/releasenotes/source/index.rst @@ -8,6 +8,7 @@ Contents :maxdepth: 2 unreleased + 2024.2 2024.1 2023.2 2023.1 diff --git a/requirements.txt b/requirements.txt index 6a7abb4..1cdc556 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,10 +2,6 @@ # date but we do not test them so no guarantee of having them all correct. If # you find any incorrect lower bounds, let us know or propose a fix. -# 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. - pbr>=5.5.1 # Apache-2.0 cliff>=3.5.0 # Apache-2.0 keystoneauth1>=4.3.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index c24b1e9..f0c19f6 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,14 +1,4 @@ -# 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. - -hacking>=3.0.1,<3.1.0 # Apache-2.0 - -# remove this pyflakes from here once you bump the -# hacking to 3.2.0 or above. hacking 3.2.0 takes -# care of pyflakes version compatibilty. -pyflakes>=2.1.1 - +hacking>=7.0.0,<7.1.0 # Apache-2.0 coverage>=4.0,!=4.4 # Apache-2.0 python-subunit>=1.4.0 # Apache-2.0/BSD oslotest>=1.10.0 # Apache-2.0 @@ -10,14 +10,12 @@ usedevelop = True install_command = pip install -U {opts} {packages} setenv = DEVSTACK_VENV={env:DEVSTACK_VENV} - VIRTUAL_ENV={envdir} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = stestr run {posargs} [testenv:cover] setenv = - VIRTUAL_ENV={envdir} PYTHON=coverage run --source cloudkittyclient --parallel-mode commands = stestr run {posargs} @@ -80,7 +78,6 @@ deps = commands = sphinx-build --keep-going -b html doc/source doc/build/html [testenv:pdf-docs] -envdir = {toxworkdir}/docs deps = {[testenv:docs]deps} allowlist_externals = make |