Skip to content

[Build][202012] Fix the PyYang python package installation issue (#15890) #15903

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 5 commits into from
Jul 23, 2023
Merged

[Build][202012] Fix the PyYang python package installation issue (#15890) #15903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a544cb4
[Build] Fix the PyYang python package installation issue (#15890)
xumia Jul 18, 2023
be44e20
Fix docker-platform-monitor python2 issue
xumia Jul 20, 2023
ae89a0e
Fix wheel dependency issue
xumia Jul 21, 2023
41ec815
Fix wheel dependency issue
xumia Jul 21, 2023
7bbab3d
Fix the pip2 PyYAML in host image
xumia Jul 22, 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
4 changes: 4 additions & 0 deletions build_debian.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,10 @@ 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 pip2 install 'PyYAML==5.4.1' --no-build-isolation
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 thrift==0.13.0
RUN pip2 install libpci
RUN pip3 install libpci

# 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
Copy link
Copy Markdown
Collaborator

@qiluo-msft qiluo-msft Jul 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PyYAML

I see it is installed in docker-config-engine-buster, and this Docker is FROM docker-config-engine-buster. Why install again?

Copy link
Copy Markdown
Collaborator Author

@xumia xumia Jul 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The python2 is not installed in docker-config-engine-buster, only in docker-platform-monitor and docker-sonic-mgmt-framework.


{% if docker_platform_monitor_debs.strip() -%}
# Copy locally-built Debian package dependencies
{{ copy_files("debs/", docker_platform_monitor_debs.split(' '), "/debs/") }}
Expand Down
2 changes: 2 additions & 0 deletions dockers/docker-sonic-mgmt-framework/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ RUN pip2 install --upgrade 'pip<21'
RUN apt-get purge -y python-pip
RUN pip2 install setuptools==40.8.0
RUN pip2 install wheel==0.35.1
RUN pip2 install PyYAML==5.4.1 --no-build-isolation
Copy link
Copy Markdown
Collaborator

@qiluo-msft qiluo-msft Jul 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PyYAML

I see it is installed in docker-config-engine-buster, and this Docker is FROM docker-config-engine-buster. Why install again?

Copy link
Copy Markdown
Collaborator Author

@xumia xumia Jul 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In docker-config-engine-buster only for python3, no python2.


RUN pip2 install connexion==1.1.15 \
setuptools==21.0.0 \
grpcio-tools==1.20.0 \
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 @@ -404,8 +404,9 @@ RUN pip3 uninstall -y enum34
RUN pip2 install j2cli==0.3.10

# 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