matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[build] No longer install Python 'click-default-group' package (#4811)

Browse Source 
All dependencies upon the Python 'click-default-group' package have been removed from sonic-utilities as of https://github.com/Azure/sonic-utilities/pull/903. The submodule was updated to include this patch as of https://github.com/Azure/sonic-buildimage/pull/4601, therefore we no longer need to install this package in the SONiC image.
This commit is contained in:
Joe LeVeque 2020-06-19 10:54:10 -07:00 committed by GitHub
parent 7306de41fd
commit 1f8a78cef1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/build_templates/sonic_debian_extension.j2
View File

@ -171,8 +171,6 @@ sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/python-click*_all.deb || \
# Install python pexpect used by sonic-utilities consutil # Install python pexpect used by sonic-utilities consutil
# using pip install instead to get a more recent version than is available through debian # using pip install instead to get a more recent version than is available through debian
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install pexpect sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install pexpect
# Install python click-default-group by sonic-utilities
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install click-default-group==1.2
# Install tabulate >= 0.8.1 via pip in order to support multi-line row output for sonic-utilities # Install tabulate >= 0.8.1 via pip in order to support multi-line row output for sonic-utilities
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install tabulate==0.8.2 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install tabulate==0.8.2

1
platform/p4/docker-sonic-p4/Dockerfile.j2
View File

@ -39,7 +39,6 @@ RUN apt-get install -y net-tools \
iproute \ iproute \
libpython2.7 \ libpython2.7 \
grub2-common \ grub2-common \
python-click-default-group \
python-click \ python-click \
python-natsort \ python-natsort \
python-tabulate \ python-tabulate \

1
platform/vs/docker-sonic-vs/Dockerfile.j2
View File

@ -32,7 +32,6 @@ RUN apt-get install -y net-tools \
libc-ares2 \ libc-ares2 \
iproute \ iproute \
grub2-common \ grub2-common \
python-click-default-group \
python-click \ python-click \
python-natsort \ python-natsort \
python-tabulate \ python-tabulate \

2
sonic-slave-buster/Dockerfile.j2
View File

@ -351,7 +351,7 @@ RUN pip install j2cli==0.3.10
# Remove python-click 6.6 # Remove python-click 6.6
RUN apt-get purge -y python-click RUN apt-get purge -y python-click
# For sonic utilities testing # For sonic utilities testing
RUN pip install click-default-group click natsort tabulate netifaces==0.10.7 fastentrypoints RUN pip install click natsort tabulate netifaces==0.10.7 fastentrypoints
# For sonic snmpagent mock testing # For sonic snmpagent mock testing
RUN pip3 install mockredispy==2.9.3 RUN pip3 install mockredispy==2.9.3

2
sonic-slave-jessie/Dockerfile.j2
View File

@ -311,7 +311,7 @@ RUN pip install --force-reinstall --upgrade "jinja2>=2.10"
RUN pip install j2cli==0.3.10 RUN pip install j2cli==0.3.10
# For sonic utilities testing # For sonic utilities testing
RUN pip install click-default-group click natsort tabulate netifaces==0.10.7 fastentrypoints RUN pip install click natsort tabulate netifaces==0.10.7 fastentrypoints
# For supervisor build # For supervisor build
RUN pip install meld3 mock RUN pip install meld3 mock

2
sonic-slave-stretch/Dockerfile.j2
View File

@ -350,7 +350,7 @@ RUN pip install j2cli==0.3.10
# Remove python-click 6.6 # Remove python-click 6.6
RUN apt-get purge -y python-click RUN apt-get purge -y python-click
# For sonic utilities testing # For sonic utilities testing
RUN pip install click-default-group click natsort tabulate netifaces==0.10.7 fastentrypoints RUN pip install click natsort tabulate netifaces==0.10.7 fastentrypoints
# For sonic snmpagent mock testing # For sonic snmpagent mock testing
RUN pip3 install mockredispy==2.9.3 RUN pip3 install mockredispy==2.9.3