Click Upgrade to 7.0.0 (sonic-net#20)

Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com>
samaity · Dec 13, 2019 · 7b4f699 · 7b4f699
1 parent 08b5cd4
commit 7b4f699
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 50 deletions.
diff --git a/.gitignore b/.gitignore
@@ -62,8 +62,6 @@ src/lm-sensors/*
 !src/lm-sensors/Makefile
 src/mpdecimal/*
 !src/mpdecimal/Makefile
-src/python-click/*
-!src/python-click/Makefile
 src/python3/*
 !src/python3/Makefile
 src/radvd/*

diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
@@ -134,8 +134,8 @@ sudo rm -rf $FILESYSTEM_ROOT/$DAEMON_BASE_PY2_WHEEL_NAME
 # Install built Python Click package (and its dependencies via 'apt-get -y install -f')
 # Do this before installing sonic-utilities so that it doesn't attempt to install
 # an older version as part of its dependencies
-sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/python-click*_all.deb || \
-    sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
+# Install click == 7.0.0  via pip in order to support autocompletion for breakout Mode in sonic-utilities
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install click==7.0.0
 
 # Install python pexpect used by sonic-utilities consutil
 # using pip install instead to get a more recent version than is available through debian

diff --git a/rules/python-click.mk b/rules/python-click.mk
diff --git a/slave.mk b/slave.mk
@@ -613,7 +613,6 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
         $(addprefix $(STRETCH_DEBS_PATH)/,$(INITRAMFS_TOOLS) \
                 $(LINUX_KERNEL) \
                 $(SONIC_DEVICE_DATA) \
-                $(PYTHON_CLICK) \
                 $(IFUPDOWN2) \
                 $(KDUMP_TOOLS) \
                 $(LIBPAM_TACPLUS) \

diff --git a/sonic-slave-jessie/Dockerfile.j2 b/sonic-slave-jessie/Dockerfile.j2
@@ -307,7 +307,7 @@ RUN pip install --force-reinstall --upgrade "jinja2>=2.10"
 RUN pip install j2cli==0.3.10
 
 # For sonic utilities testing
-RUN pip install click-default-group click natsort tabulate netifaces==0.10.7 fastentrypoints
+RUN pip install click-default-group click==7.0.0 natsort tabulate netifaces==0.10.7 fastentrypoints
 
 # For supervisor build
 RUN pip install meld3 mock

diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2
@@ -331,7 +331,7 @@ RUN pip install j2cli==0.3.10
 # Remove python-click 6.6
 RUN apt-get purge -y python-click
 # For sonic utilities testing
-RUN pip install click-default-group click natsort tabulate netifaces==0.10.7 fastentrypoints
+RUN pip install click-default-group click==7.0.0 natsort tabulate netifaces==0.10.7 fastentrypoints
 
 # For sonic snmpagent mock testing
 RUN pip3 install mockredispy==2.9.3

diff --git a/src/python-click/Makefile b/src/python-click/Makefile