Skip to content

Commit 8977a58

Browse files
stephenfinkarelyatin
authored andcommitted
[Stable-Only] Constrain pip to < 25.3
Conflicts: inc/python NOTE(stephenfin): Conflicts are due to the absence of I9232f3fae1598297e83c4ea37339896f7dcbd44f and I3f7541e691717186b7c73f10ffabae6fc0c5c9f9, neither of which we want to backport. Also marked devstack-platform-debian-bullseye as non-voting to unblock this patch. Change-Id: I221a03b2f8314fee66672c23d7ece4eb900c038c Signed-off-by: Stephen Finucane <[email protected]> (cherry picked from commit e20d092) (cherry picked from commit 978a231)
1 parent ee3cba6 commit 8977a58

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

.zuul.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,8 @@
764764
- devstack-enforce-scope
765765
- devstack-platform-centos-9-stream
766766
- devstack-platform-debian-bookworm
767-
- devstack-platform-debian-bullseye
767+
- devstack-platform-debian-bullseye:
768+
voting: false
768769
- devstack-platform-rocky-blue-onyx:
769770
voting: false
770771
- devstack-platform-ubuntu-jammy-ovn-source
@@ -809,7 +810,6 @@
809810
- devstack
810811
- devstack-ipv6
811812
- devstack-platform-debian-bookworm
812-
- devstack-platform-debian-bullseye
813813
- devstack-enforce-scope
814814
- devstack-multinode
815815
- devstack-unit-tests

inc/python

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,14 @@ function setup_devstack_virtualenv {
4141
# This package is currently installed via the distro and not
4242
# available on pypi.
4343
python$PYTHON3_VERSION -m venv --system-site-packages $DEVSTACK_VENV
44-
pip_install -U pip
44+
# NOTE(stephenfin): stable-only change to prevent us pulling in newer
45+
# versions of pip which removed support for legacy editable installs
46+
# [1]. Some services on this stable branch still hadn't migrated to
47+
# module-based configuration [2]. This is not an issue since 2025.2.
48+
#
49+
# [1] https://pip.pypa.io/en/stable/news/#v25-3
50+
# [2] https://review.opendev.org/c/openstack/governance/+/902807
51+
pip_install -U 'pip<25.3'
4552
fi
4653
if [[ ":$PATH:" != *":$DEVSTACK_VENV/bin:"* ]] ; then
4754
export PATH="$DEVSTACK_VENV/bin:$PATH"

0 commit comments

Comments
 (0)