From 17f29c675751d133b07ce31d68ae5f3f56dd0260 Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Mon, 18 Mar 2024 14:04:24 +0000 Subject: [PATCH 1/4] Update .gitreview for stable/2024.1 Change-Id: I0f41f6d9d3bd3d4a896c39a295e3a101ac7fce5b --- .gitreview | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitreview b/.gitreview index 4eee726db6..8846f4864f 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,4 @@ host=review.opendev.org port=29418 project=openstack/python-openstackclient.git +defaultbranch=stable/2024.1 From 282538557abf5a31fd04d2e1e775f89c0aab3310 Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Mon, 18 Mar 2024 14:04:26 +0000 Subject: [PATCH 2/4] Update TOX_CONSTRAINTS_FILE for stable/2024.1 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/2024.1 branch, tests will continue to use the upper-constraints list on master. Change-Id: I3118a769bd51dc26fbb18eda065e0f4157b04a93 --- tox.ini | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index 0cfed1712c..446bfb7252 100644 --- a/tox.ini +++ b/tox.ini @@ -9,7 +9,7 @@ setenv = OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=60 deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.1} -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt commands = @@ -80,7 +80,7 @@ commands = [testenv:venv] deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.1} -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt commands = @@ -104,7 +104,7 @@ commands = [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/2024.1} -r{toxinidir}/doc/requirements.txt commands = sphinx-build -a -E -W -d doc/build/doctrees -b html doc/source doc/build/html @@ -114,7 +114,7 @@ commands = [testenv:releasenotes] deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.1} -r{toxinidir}/doc/requirements.txt commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html From 685b7506a769debf90fa6c94fe07e9b1a0595a52 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 19 May 2024 22:55:03 +0900 Subject: [PATCH 3/4] Drop direct dependency on simplejson The simplejson library is not included by the requirements but it was directly imported. Drop the direct inclusion and use the alias in the requests library to avoid ImportError caused by missing simplejson in the environment. Also fix the missing requests library in requirements. Change-Id: I8713f45c5f2717cc53ba043aaeb479e72f641f78 (cherry picked from commit cf6dd62dd14bb3e234b6e9f6ed716db1154e187f) --- openstackclient/api/api.py | 7 +++---- requirements.txt | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openstackclient/api/api.py b/openstackclient/api/api.py index f02c87dcca..7c8fb859fa 100644 --- a/openstackclient/api/api.py +++ b/openstackclient/api/api.py @@ -12,11 +12,10 @@ # """Base API Library""" - from keystoneauth1 import exceptions as ks_exceptions from keystoneauth1 import session as ks_session from osc_lib import exceptions -import simplejson as json +import requests from openstackclient.i18n import _ @@ -118,7 +117,7 @@ def create(self, url, session=None, method=None, **params): # Should this move into _requests()? try: return ret.json() - except json.JSONDecodeError: + except requests.JSONDecodeError: return ret def delete(self, url, session=None, **params): @@ -169,7 +168,7 @@ def list(self, path, session=None, body=None, detailed=False, **params): ) try: return ret.json() - except json.JSONDecodeError: + except requests.JSONDecodeError: return ret # Layered actions built on top of the basic action methods do not diff --git a/requirements.txt b/requirements.txt index a1b87a0429..0cc6c7e880 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,4 +13,5 @@ oslo.i18n>=3.15.3 # Apache-2.0 python-keystoneclient>=3.22.0 # Apache-2.0 python-novaclient>=18.1.0 # Apache-2.0 python-cinderclient>=3.3.0 # Apache-2.0 +requests>=2.14.2 # Apache-2.0 stevedore>=2.0.1 # Apache-2.0 From d1547304b57ed6bcce61df9c9718f7afca81226a Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Fri, 31 Oct 2025 12:05:23 +0000 Subject: [PATCH 4/4] Update .gitreview for unmaintained/2024.1 Change-Id: I3e07418a7782e7c6161ab749bffd7ea357df897e Signed-off-by: OpenStack Release Bot Generated-By: openstack/project-config:roles/copy-release-tools-scripts/files/release-tools/functions --- .gitreview | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitreview b/.gitreview index 8846f4864f..729164a2f8 100644 --- a/.gitreview +++ b/.gitreview @@ -2,4 +2,4 @@ host=review.opendev.org port=29418 project=openstack/python-openstackclient.git -defaultbranch=stable/2024.1 +defaultbranch=unmaintained/2024.1