Skip to content

[Build][202111] Fix the PyYang python package installation issue (#15890) #15905

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

Merged
xumia merged 3 commits into from
Jul 22, 2023
Merged

[Build][202111] Fix the PyYang python package installation issue (#15890) #15905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b99f2ae
[Build] Fix the PyYang python package installation issue (#15890)
xumia Jul 18, 2023
2ef5987
Fix docker-platform-monitor python2 issue
xumia Jul 20, 2023
5ca1848
Fix wheel dependency issue
xumia Jul 21, 2023
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: 3 additions & 0 deletions build_debian.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,9 @@ 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: 4 additions & 0 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,6 +23,10 @@ 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

{% if docker_config_engine_buster_debs.strip() %}
# Copy locally-built Debian package dependencies
{{ copy_files("debs/", docker_config_engine_buster_debs.split(' '), "/debs/") }}
Expand Down
5 changes: 5 additions & 0 deletions dockers/docker-platform-monitor/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ RUN pip3 install grpcio==1.39.0 \
RUN pip2 install thrift==0.13.0
RUN pip3 install thrift==0.13.0

# The option --no-build-isolation can be removed when upgrading PyYAML to 6.0.1
# The the PyYAML for python3 has already installed in the base image docker-config-engine
RUN pip2 install wheel==0.37.1
RUN pip2 install PyYAML==5.4.1 --no-build-isolation

{% if docker_platform_monitor_debs.strip() -%}
# Copy locally-built Debian package dependencies
{{ copy_files("debs/", docker_platform_monitor_debs.split(' '), "/debs/") }}
Expand Down
3 changes: 2 additions & 1 deletion sonic-slave-bullseye/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,8 @@ RUN pip3 uninstall -y enum34
RUN pip3 install j2cli==0.3.10

# For sonic-mgmt-framework
RUN pip3 install "PyYAML==5.4.1"
# 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
RUN pip3 install "lxml==4.6.2"

# For sonic-platform-common testing
Expand Down
5 changes: 3 additions & 2 deletions sonic-slave-buster/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,8 +446,9 @@ RUN pip3 install MarkupSafe==2.0.1
RUN pip3 install Jinja2==3.0.3

# For sonic-mgmt-framework
RUN pip2 install "PyYAML==5.4.1"
RUN pip3 install "PyYAML==5.4.1"
# 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
RUN pip2 install "lxml==4.6.5"
RUN pip3 install "lxml==4.6.5"

Expand Down