Pin pip to version 24.2, and update disable-non-manylinux.patch #19510
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The code logic in this area has changed, resulting in patch conflicts. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
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>
saiarcot895
force-pushed
the
fix-armhf-build-due-to-pip-update
branch
from
38f7731
to
32e2fc6
Compare
|
/azpw run Azure.sonic-buildimage |
|
/AzurePipelines run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
saiarcot895
changed the title
|
LGTM. |
liushilongbuaa
approved these changes
Aug 7, 2024
|
The file being modified by the patch is in the slave container that's getting built, and not in the buildimage repo (or any submodules). Also, this is an already-existing patch. Considering there appear to be no issues now with the image version, I think the dirty tag won't appear. |
mssonicbld
pushed a commit
to mssonicbld/sonic-buildimage
that referenced
this pull request
Aug 15, 2024
…c-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>
|
Cherry-pick PR to 202405: #19918 |
matiAlfaro
pushed a commit
to Marvell-switching/sonic-buildimage
that referenced
this pull request
Aug 21, 2024
…c-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>
mssonicbld
pushed a commit
that referenced
this pull request
Aug 22, 2024
* 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>
mssonicbld
added
Included in 202405 Branch
and removed
Created PR to 202405 Branch
labels
|
@saiarcot895 , Cherry pick to 202311 and 202305 failed. Can you help create cherry pick PR? |
4 tasks
|
Hi @liushilongbuaa, I think current blocker is #20018, but this will need to be backported as well. Let me create a PR for this. |
11 tasks
|
Opened #20037 for 202311 cherry-pick, and that should be cherry-pickable to 202305, so I added the request for 202305 label. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Why I did it
Pip has been recently updated to 24.2. For armhf, there is a patch file that gets applied to disable the use of manylinux wheels, to avoid the use of packages that might be using a newer glibc version than what is available on the system. This patch file was designed for 24.0, but can't be applied to 24.2.
Update the patch file to apply on 24.2, and make sure version 24.2 of pip gets installed.
This also fixes the version upgrade pipeline errors for master branch.
Work item tracking
How I did it
How to verify it
Which release branch to backport (provide reason below if selected)
Tested branch (Please provide the tested image version)
Description for the changelog
Link to config_db schema for YANG module changes
A picture of a cute animal (not mandatory but encouraged)