Skip to content

Commit 1f8a78c

Browse files
authored
[build] No longer install Python 'click-default-group' package (#4811)
All dependencies upon the Python 'click-default-group' package have been removed from sonic-utilities as of sonic-net/sonic-utilities#903. The submodule was updated to include this patch as of #4601, therefore we no longer need to install this package in the SONiC image.
1 parent 7306de4 commit 1f8a78c

File tree

6 files changed

+3
-7
lines changed

6 files changed

+3
-7
lines changed

files/build_templates/sonic_debian_extension.j2

-2
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,6 @@ sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/python-click*_all.deb || \
171171
# Install python pexpect used by sonic-utilities consutil
172172
# using pip install instead to get a more recent version than is available through debian
173173
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install pexpect
174-
# Install python click-default-group by sonic-utilities
175-
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install click-default-group==1.2
176174

177175
# Install tabulate >= 0.8.1 via pip in order to support multi-line row output for sonic-utilities
178176
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install tabulate==0.8.2

platform/p4/docker-sonic-p4/Dockerfile.j2

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ RUN apt-get install -y net-tools \
3939
iproute \
4040
libpython2.7 \
4141
grub2-common \
42-
python-click-default-group \
4342
python-click \
4443
python-natsort \
4544
python-tabulate \

platform/vs/docker-sonic-vs/Dockerfile.j2

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ RUN apt-get install -y net-tools \
3232
libc-ares2 \
3333
iproute \
3434
grub2-common \
35-
python-click-default-group \
3635
python-click \
3736
python-natsort \
3837
python-tabulate \

sonic-slave-buster/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ RUN pip install j2cli==0.3.10
351351
# Remove python-click 6.6
352352
RUN apt-get purge -y python-click
353353
# For sonic utilities testing
354-
RUN pip install click-default-group click natsort tabulate netifaces==0.10.7 fastentrypoints
354+
RUN pip install click natsort tabulate netifaces==0.10.7 fastentrypoints
355355

356356
# For sonic snmpagent mock testing
357357
RUN pip3 install mockredispy==2.9.3

sonic-slave-jessie/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ RUN pip install --force-reinstall --upgrade "jinja2>=2.10"
311311
RUN pip install j2cli==0.3.10
312312

313313
# For sonic utilities testing
314-
RUN pip install click-default-group click natsort tabulate netifaces==0.10.7 fastentrypoints
314+
RUN pip install click natsort tabulate netifaces==0.10.7 fastentrypoints
315315

316316
# For supervisor build
317317
RUN pip install meld3 mock

sonic-slave-stretch/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ RUN pip install j2cli==0.3.10
350350
# Remove python-click 6.6
351351
RUN apt-get purge -y python-click
352352
# For sonic utilities testing
353-
RUN pip install click-default-group click natsort tabulate netifaces==0.10.7 fastentrypoints
353+
RUN pip install click natsort tabulate netifaces==0.10.7 fastentrypoints
354354

355355
# For sonic snmpagent mock testing
356356
RUN pip3 install mockredispy==2.9.3

0 commit comments

Comments
 (0)