Update TOX_CONSTRAINTS_FILE for stable/2025.2

Update the URL to the upper-constraints file to point to the redirect
rule on releases.openstack.org so that anyone working on this branch
will switch to the correct upper-constraints list automatically when
the requirements repository branches.

Until the requirements repository has as stable/2025.2 branch, tests will
continue to use the upper-constraints list on master.

Change-Id: Ie2a74ff39348bd5106e93a69358b6d3cab496e37
Signed-off-by: OpenStack Release Bot <infra-root@openstack.org>
Generated-By: openstack/project-config:roles/copy-release-tools-scripts/files/release-tools/functions

.gitreview

@@ -2,3 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/python-cloudkittyclient.git
+defaultbranch=stable/2025.2

.zuul.yaml

@@ -21,8 +21,6 @@
         cloudkitty: https://opendev.org/openstack/cloudkitty
       devstack_localrc:
         CLOUDKITTY_FETCHER: keystone
-        DEVSTACK_GATE_USE_PYTHON3: "True"
-        USE_PYTHON3: True
       devstack_services:
         ck-api: true
         horizon: false

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)

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()))

releasenotes/source/2023.1.rst

@@ -3,4 +3,4 @@
 ===========================
 
 .. release-notes::
-   :branch: stable/2023.1
+   :branch: unmaintained/2023.1

releasenotes/source/2024.2.rst

@@ -0,0 +1,6 @@
+===========================
+2024.2 Series Release Notes
+===========================
+
+.. release-notes::
+   :branch: stable/2024.2

releasenotes/source/2025.1.rst

@@ -0,0 +1,6 @@
+===========================
+2025.1 Series Release Notes
+===========================
+
+.. release-notes::
+   :branch: stable/2025.1

releasenotes/source/index.rst

@@ -8,6 +8,8 @@ Contents
    :maxdepth: 2
 
    unreleased
+   2025.1
+   2024.2
    2024.1
    2023.2
    2023.1

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

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

tox.ini

@@ -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}
@@ -75,12 +73,11 @@ commands = {posargs}
 
 [testenv:docs]
 deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.2}
   -r{toxinidir}/doc/requirements.txt
 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
@@ -101,7 +98,7 @@ import_exceptions = cloudkittyclient.i18n
 
 [testenv:releasenotes]
 deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.2}
   -r{toxinidir}/doc/requirements.txt
 commands =
   sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html