Skip to content

Commit 0efc28d

Browse files
authored
Pin pip to version 24.2, and update disable-non-manylinux.patch (sonic-net#19510)
* Update disable-non-manylinux.patch due to pip being updated to 24.1.2. The code logic in this area has changed, resulting in patch conflicts. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> * Update the pinned version for pip to explicitly point to 24.1.2 This is needed because the patch file that has been updated can only be applied to 24.1.2. However, the version pinning for 24.0 will mean that PR checkers and the daily build will try to continue using 24.0, and thus fail to apply the patch. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> * Revert changes to version files, and pin pip to 24.2 Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> --------- Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
1 parent f728ab2 commit 0efc28d

File tree

4 files changed

+24
-12
lines changed

4 files changed

+24
-12
lines changed

sonic-slave-bookworm/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ RUN eatmydata apt-get install -y golang-go \
520520
&& ln -sf /usr/lib/go-1.19 /usr/local/go
521521
{%- endif %}
522522

523-
RUN pip3 install --upgrade pip
523+
RUN pip3 install --upgrade pip==24.2
524524
RUN apt-get purge -y python3-pip
525525

526526
{%- if CONFIGURED_ARCH == "armhf" %}
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1+
Disable any type of wheel besides manylinux wheels. This is to work around an issue where the architecture-specific
2+
wheel might be built with a newer glibc version than what is supported on the system.
3+
4+
(This patch gets applied only on armhf.)
5+
16
--- a/tags.py 2022-07-12 00:07:22.710207780 +0000
27
+++ b/tags.py 2022-07-12 00:07:13.185890659 +0000
3-
@@ -424,7 +424,6 @@
4-
_, arch = linux.split("_", 1)
5-
yield from _manylinux.platform_tags(linux, arch)
6-
yield from _musllinux.platform_tags(arch)
7-
- yield linux
8+
@@ -498,8 +498,6 @@
9+
archs = {"armv8l": ["armv8l", "armv7l"]}.get(arch, [arch])
10+
yield from _manylinux.platform_tags(archs)
11+
yield from _musllinux.platform_tags(archs)
12+
- for arch in archs:
13+
- yield f"linux_{arch}"
814

915

1016
def _generic_platforms() -> Iterator[str]:

sonic-slave-bullseye/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ RUN wget -O golang-go.deb 'https://sonicstorage.blob.core.windows.net/public/fip
520520
&& rm golang-go.deb golang-src.deb
521521
{%- endif %}
522522

523-
RUN pip3 install --upgrade pip
523+
RUN pip3 install --upgrade pip==24.2
524524
RUN apt-get purge -y python3-pip python3-yaml
525525

526526
# For building Python packages
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1+
Disable any type of wheel besides manylinux wheels. This is to work around an issue where the architecture-specific
2+
wheel might be built with a newer glibc version than what is supported on the system.
3+
4+
(This patch gets applied only on armhf.)
5+
16
--- a/tags.py 2022-07-12 00:07:22.710207780 +0000
27
+++ b/tags.py 2022-07-12 00:07:13.185890659 +0000
3-
@@ -424,7 +424,6 @@
4-
_, arch = linux.split("_", 1)
5-
yield from _manylinux.platform_tags(linux, arch)
6-
yield from _musllinux.platform_tags(arch)
7-
- yield linux
8+
@@ -498,8 +498,6 @@
9+
archs = {"armv8l": ["armv8l", "armv7l"]}.get(arch, [arch])
10+
yield from _manylinux.platform_tags(archs)
11+
yield from _musllinux.platform_tags(archs)
12+
- for arch in archs:
13+
- yield f"linux_{arch}"
814

915

1016
def _generic_platforms() -> Iterator[str]:

0 commit comments

Comments
 (0)