From aa1cc848e2e0885dd352d91e66a101fd77809d28 Mon Sep 17 00:00:00 2001
From: lguohan <lguohan@gmail.com>
Date: Tue, 22 Dec 2020 21:05:33 -0800
Subject: [PATCH] [sonic-yang-mgmt-py2]: remove sonic-yang-mgmt py2 (#6262)

No longer needed as sonic-utilties has been moved python3

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 files/build_templates/sonic_debian_extension.j2 |  6 ------
 platform/vs/docker-sonic-vs.mk                  |  1 -
 rules/sonic-yang-mgmt-py2.dep                   | 10 ----------
 rules/sonic-yang-mgmt-py2.mk                    | 12 ------------
 slave.mk                                        |  2 --
 5 files changed, 31 deletions(-)
 delete mode 100644 rules/sonic-yang-mgmt-py2.dep
 delete mode 100644 rules/sonic-yang-mgmt-py2.mk

diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 1aa3e42fe7..c1a36edda3 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -185,12 +185,6 @@ sudo cp {{sonic_yang_models_py3_wheel_path}} $FILESYSTEM_ROOT/$SONIC_YANG_MODEL_
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install $SONIC_YANG_MODEL_PY3_WHEEL_NAME
 sudo rm -rf $FILESYSTEM_ROOT/$SONIC_YANG_MODEL_PY3_WHEEL_NAME
 
-# Install sonic-yang-mgmt Python2 package
-SONIC_YANG_MGMT_PY2_WHEEL_NAME=$(basename {{sonic_yang_mgmt_py2_wheel_path}})
-sudo cp {{sonic_yang_mgmt_py2_wheel_path}} $FILESYSTEM_ROOT/$SONIC_YANG_MGMT_PY2_WHEEL_NAME
-sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip2 install $SONIC_YANG_MGMT_PY2_WHEEL_NAME
-sudo rm -rf $FILESYSTEM_ROOT/$SONIC_YANG_MGMT_PY2_WHEEL_NAME
-
 # Install sonic-yang-mgmt Python3 package
 SONIC_YANG_MGMT_PY3_WHEEL_NAME=$(basename {{sonic_yang_mgmt_py3_wheel_path}})
 sudo cp {{sonic_yang_mgmt_py3_wheel_path}} $FILESYSTEM_ROOT/$SONIC_YANG_MGMT_PY3_WHEEL_NAME
diff --git a/platform/vs/docker-sonic-vs.mk b/platform/vs/docker-sonic-vs.mk
index 9cb59ca218..7b82fce71e 100644
--- a/platform/vs/docker-sonic-vs.mk
+++ b/platform/vs/docker-sonic-vs.mk
@@ -23,7 +23,6 @@ $(DOCKER_SONIC_VS)_PYTHON_WHEELS += $(SWSSSDK_PY2) \
                                     $(SONIC_PY_COMMON_PY2) \
                                     $(SONIC_PY_COMMON_PY3) \
                                     $(SONIC_YANG_MODELS_PY3) \
-                                    $(SONIC_YANG_MGMT_PY2) \
                                     $(SONIC_YANG_MGMT_PY3) \
                                     $(SONIC_UTILITIES_PY3) \
                                     $(SONIC_HOST_SERVICES_PY3)
diff --git a/rules/sonic-yang-mgmt-py2.dep b/rules/sonic-yang-mgmt-py2.dep
deleted file mode 100644
index 6a2f30ca34..0000000000
--- a/rules/sonic-yang-mgmt-py2.dep
+++ /dev/null
@@ -1,10 +0,0 @@
-
-SPATH       := $($(SONIC_YANG_MGMT_PY2)_SRC_PATH)
-DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/sonic-yang-mgmt-py2.mk rules/sonic-yang-mgmt-py2.dep   
-DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
-DEP_FILES   += $(shell git ls-files $(SPATH))
-
-$(SONIC_YANG_MGMT_PY2)_CACHE_MODE  := GIT_CONTENT_SHA
-$(SONIC_YANG_MGMT_PY2)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
-$(SONIC_YANG_MGMT_PY2)_DEP_FILES   := $(DEP_FILES)
-
diff --git a/rules/sonic-yang-mgmt-py2.mk b/rules/sonic-yang-mgmt-py2.mk
deleted file mode 100644
index 5e44517be4..0000000000
--- a/rules/sonic-yang-mgmt-py2.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# sonic-yang-mgmt python2 wheel
-
-SONIC_YANG_MGMT_PY2 = sonic_yang_mgmt-1.0-py2-none-any.whl
-$(SONIC_YANG_MGMT_PY2)_SRC_PATH = $(SRC_PATH)/sonic-yang-mgmt
-$(SONIC_YANG_MGMT_PY2)_PYTHON_VERSION = 2
-$(SONIC_YANG_MGMT_PY2)_DEBS_DEPENDS = $(LIBYANG) $(LIBYANG_CPP) $(LIBYANG_PY2) \
-                                     $(LIBYANG_PY3)
-$(SONIC_YANG_MGMT_PY2)_DEPENDS =  $(SONIC_YANG_MODELS_PY3)
-$(SONIC_YANG_MGMT_PY2)_RDEPENDS = $(SONIC_YANG_MODELS_PY3) $(LIBYANG) \
-                                 $(LIBYANG_CPP) $(LIBYANG_PY2)
-
-SONIC_PYTHON_WHEELS += $(SONIC_YANG_MGMT_PY2)
diff --git a/slave.mk b/slave.mk
index a7b3ae033d..c75bf15e75 100644
--- a/slave.mk
+++ b/slave.mk
@@ -868,7 +868,6 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_YANG_MODELS_PY3)) \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_CTRMGRD)) \
         $(addprefix $(FILES_PATH)/,$($(SONIC_CTRMGRD)_FILES)) \
-        $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_YANG_MGMT_PY2)) \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_YANG_MGMT_PY3)) \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(SYSTEM_HEALTH)) \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_HOST_SERVICES_PY3))
@@ -915,7 +914,6 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
 	export install_debug_image="$(INSTALL_DEBUG_TOOLS)"
 	export sonic_yang_models_py3_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_YANG_MODELS_PY3))"
 	export sonic_ctrmgmt_py3_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_CTRMGRD))"
-	export sonic_yang_mgmt_py2_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_YANG_MGMT_PY2))"
 	export sonic_yang_mgmt_py3_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_YANG_MGMT_PY3))"
 	export multi_instance="false"
 	export python_swss_debs="$(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$($(LIBSWSSCOMMON)_RDEPENDS))"