Skip to content

[action] [PR:22424] Fix package version conflict introduced by PR #15890 #22597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mssonicbld wants to merge 1 commit into
base: 202411
Choose a base branch
from
Open

[action] [PR:22424] Fix package version conflict introduced by PR #15890 #22597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions build_debian.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,9 +531,6 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'docke
# Install scapy
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'scapy==2.4.4'

# The option --no-build-isolation can be removed when upgrading PyYAML to 6.0.1
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'PyYAML==5.4.1' --no-build-isolation

## Note: keep pip installed for maintainance purpose

# Install GCC, needed for building/installing some Python packages
Expand Down
4 changes: 0 additions & 4 deletions dockers/docker-config-engine-bullseye/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ RUN apt-get install -y \
RUN pip3 install pyangbind==0.8.1
RUN pip3 uninstall -y enum34

# Fix armhf build failure
# The option --no-build-isolation can be removed when upgrading PyYAML to 6.0.1
RUN pip3 install PyYAML==5.4.1 --no-build-isolation

# Install python-redis
RUN pip3 install redis==4.5.4

Expand Down
4 changes: 0 additions & 4 deletions dockers/docker-config-engine-buster/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ RUN apt-get install -y \
RUN pip3 install pyangbind==0.8.1
RUN pip3 uninstall -y enum34

# Fix armhf build failure
# The option --no-build-isolation can be removed when upgrading PyYAML to 6.0.1
RUN pip3 install PyYAML==5.4.1 --no-build-isolation

# Install python-redis
RUN pip3 install redis==4.5.4

Expand Down
3 changes: 1 addition & 2 deletions sonic-slave-bullseye/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,8 +590,7 @@ RUN pip3 uninstall -y enum34
RUN pip3 install j2cli==0.3.10

# For sonic-mgmt-framework
# The option --no-build-isolation can be removed when upgrading PyYAML to 6.0.1
RUN pip3 install "PyYAML==5.4.1" --no-build-isolation

{%- if CROSS_BUILD_ENVIRON != "y" %}
RUN pip3 install "lxml==4.9.1"
{%- endif %}
Expand Down
3 changes: 0 additions & 3 deletions sonic-slave-buster/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,9 +551,6 @@ RUN pip3 install MarkupSafe==2.0.1
RUN pip3 install Jinja2==3.0.3

# For sonic-mgmt-framework
# The option --no-build-isolation can be removed when upgrading PyYAML to 6.0.1
RUN pip2 install "PyYAML==5.4.1" --no-build-isolation
RUN pip3 install "PyYAML==5.4.1" --no-build-isolation

{%- if CROSS_BUILD_ENVIRON != "y" %}
RUN pip2 install "lxml==4.9.1"
Expand Down
Loading