[platform][barefoot] Drop python2 support (#7029)

No longer install Python 2 sonic_platform package for Broadcom platforms; only install Python 3 package. Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com>
sonic-net · Mar 12, 2021 · 35dd885 · 35dd885
1 parent 7caa70d
commit 35dd885
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 21 deletions.
diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/debian/postinst b/platform/barefoot/sonic-platform-modules-bfn-montara/debian/postinst
@@ -2,8 +2,6 @@
 set -e
 
 PLATFORM_NAME=x86_64-accton_wedge100bf_32x-r0
-SONIC_PLATFORM_WHEEL_PY2="/usr/share/sonic/device/${PLATFORM_NAME}/sonic_platform-1.0-py2-none-any.whl"
-python2 -m pip install ${SONIC_PLATFORM_WHEEL_PY2}
 SONIC_PLATFORM_WHEEL_PY3="/usr/share/sonic/device/${PLATFORM_NAME}/sonic_platform-1.0-py3-none-any.whl"
 python3 -m pip install ${SONIC_PLATFORM_WHEEL_PY3}
 

diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/debian/prerm b/platform/barefoot/sonic-platform-modules-bfn-montara/debian/prerm
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-python2 -m pip uninstall -y sonic-platform
 python3 -m pip uninstall -y sonic-platform
 
 #DEBHELPER#
diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/debian/rules b/platform/barefoot/sonic-platform-modules-bfn-montara/debian/rules
@@ -12,7 +12,6 @@ WHEEL_BUILD_DIR := $(BUILD_DIR)/wheel
 
 override_dh_auto_build:
 	set -e
-	python2.7 setup.py bdist_wheel -d $(WHEEL_BUILD_DIR)
 	python3 setup.py bdist_wheel -d $(WHEEL_BUILD_DIR)
 	set +e
 

diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/eeprom.py b/platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/eeprom.py
@@ -42,11 +42,6 @@
 _EEPROM_SYMLINK = "/var/run/platform/eeprom/syseeprom"
 _EEPROM_STATUS = "/var/run/platform/eeprom/status"
 
-try:
-    _str_type = basestring
-except NameError:
-    _str_type = str
-
 class Eeprom(eeprom_tlvinfo.TlvInfoDecoder):
     def __init__(self):
         with open(os.path.dirname(__file__) + "/logging.conf", 'r') as f:
@@ -89,7 +84,7 @@ def __eeprom_init(self, platform_eeprom):
             if elem is None:
                 continue
 
-            if isinstance(val, _str_type):
+            if isinstance(val, str):
                 value = val.replace('\0', '')
             else:
                 value = str(val)

diff --git a/platform/barefoot/sonic-platform-modules-bfn-newport/debian/rules b/platform/barefoot/sonic-platform-modules-bfn-newport/debian/rules
@@ -18,7 +18,6 @@ MODULE_NAMES := as9516 as9516bf
 override_dh_auto_build:
 	make -C $(KERNEL_SRC)/build M=$(MODULE_SRC)
 	set -e
-	python2.7 setup.py bdist_wheel -d $(WHEEL_BUILD_DIR)
 	python3 setup.py bdist_wheel -d $(WHEEL_BUILD_DIR)
 	set +e 
 

diff --git a/...ic-platform-modules-bfn-newport/debian/sonic-platform-modules-bfn-newport-as9516.postinst b/...ic-platform-modules-bfn-newport/debian/sonic-platform-modules-bfn-newport-as9516.postinst
@@ -5,8 +5,6 @@ systemctl enable bfn-newport.service
 systemctl start bfn-newport.service
 
 PLATFORM_NAME=x86_64-accton_as9516_32d-r0
-SONIC_PLATFORM_WHEEL_PY2="/usr/share/sonic/device/${PLATFORM_NAME}/sonic_platform-1.0-py2-none-any.whl"
-python2 -m pip install ${SONIC_PLATFORM_WHEEL_PY2}
 SONIC_PLATFORM_WHEEL_PY3="/usr/share/sonic/device/${PLATFORM_NAME}/sonic_platform-1.0-py3-none-any.whl"
 python3 -m pip install ${SONIC_PLATFORM_WHEEL_PY3}
 

diff --git a/...sonic-platform-modules-bfn-newport/debian/sonic-platform-modules-bfn-newport-as9516.prerm b/...sonic-platform-modules-bfn-newport/debian/sonic-platform-modules-bfn-newport-as9516.prerm
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-python2 -m pip uninstall -y sonic-platform
 python3 -m pip uninstall -y sonic-platform
 
 #DEBHELPER#
diff --git a/...-platform-modules-bfn-newport/debian/sonic-platform-modules-bfn-newport-as9516bf.postinst b/...-platform-modules-bfn-newport/debian/sonic-platform-modules-bfn-newport-as9516bf.postinst
@@ -5,8 +5,6 @@ systemctl enable bfn-newport.service
 systemctl start bfn-newport.service
 
 PLATFORM_NAME=x86_64-accton_as9516bf_32d-r0
-SONIC_PLATFORM_WHEEL_PY2="/usr/share/sonic/device/${PLATFORM_NAME}/sonic_platform-1.0-py2-none-any.whl"
-python2 -m pip install ${SONIC_PLATFORM_WHEEL_PY2}
 SONIC_PLATFORM_WHEEL_PY3="/usr/share/sonic/device/${PLATFORM_NAME}/sonic_platform-1.0-py3-none-any.whl"
 python3 -m pip install ${SONIC_PLATFORM_WHEEL_PY3}
 

diff --git a/...nic-platform-modules-bfn-newport/debian/sonic-platform-modules-bfn-newport-as9516bf.prerm b/...nic-platform-modules-bfn-newport/debian/sonic-platform-modules-bfn-newport-as9516bf.prerm
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-python2 -m pip uninstall -y sonic-platform
 python3 -m pip uninstall -y sonic-platform
 
 #DEBHELPER#
diff --git a/platform/barefoot/sonic-platform-modules-bfn/debian/postinst b/platform/barefoot/sonic-platform-modules-bfn/debian/postinst
@@ -2,8 +2,6 @@
 set -e
 
 PLATFORM_NAME=x86_64-accton_wedge100bf_65x-r0
-SONIC_PLATFORM_WHEEL_PY2="/usr/share/sonic/device/${PLATFORM_NAME}/sonic_platform-1.0-py2-none-any.whl"
-python2 -m pip install ${SONIC_PLATFORM_WHEEL_PY2}
 SONIC_PLATFORM_WHEEL_PY3="/usr/share/sonic/device/${PLATFORM_NAME}/sonic_platform-1.0-py3-none-any.whl"
 python3 -m pip install ${SONIC_PLATFORM_WHEEL_PY3}
 

diff --git a/platform/barefoot/sonic-platform-modules-bfn/debian/prerm b/platform/barefoot/sonic-platform-modules-bfn/debian/prerm
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-python2 -m pip uninstall -y sonic-platform
 python3 -m pip uninstall -y sonic-platform
 
 #DEBHELPER#
diff --git a/platform/barefoot/sonic-platform-modules-bfn/debian/rules b/platform/barefoot/sonic-platform-modules-bfn/debian/rules
@@ -12,7 +12,6 @@ WHEEL_BUILD_DIR := $(BUILD_DIR)/wheel
 
 override_dh_auto_build:
 	set -e
-	python2.7 setup.py bdist_wheel -d $(WHEEL_BUILD_DIR)
 	python3 setup.py bdist_wheel -d $(WHEEL_BUILD_DIR)
 	set +e
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,6 @@ WHEEL_BUILD_DIR := $(BUILD_DIR)/wheel @@
     override_dh_auto_build:
     	set -e
-    	python2.7 setup.py bdist_wheel -d $(WHEEL_BUILD_DIR)
     	python3 setup.py bdist_wheel -d $(WHEEL_BUILD_DIR)
     	set +e
@@ Expand Down @@