Skip to content

[platform][barefoot] Drop python2 support #7029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jleveque merged 1 commit into from
Mar 12, 2021
Merged

[platform][barefoot] Drop python2 support #7029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions platform/barefoot/sonic-platform-modules-bfn-montara/debian/postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
1 change: 0 additions & 1 deletion platform/barefoot/sonic-platform-modules-bfn-montara/debian/prerm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/sh

python2 -m pip uninstall -y sonic-platform
python3 -m pip uninstall -y sonic-platform

#DEBHELPER#
1 change: 0 additions & 1 deletion platform/barefoot/sonic-platform-modules-bfn-montara/debian/rules
View file
Open in desktop
Original file line number Diff 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
7 changes: 1 addition & 6 deletions platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/eeprom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion platform/barefoot/sonic-platform-modules-bfn-newport/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions ...ic-platform-modules-bfn-newport/debian/sonic-platform-modules-bfn-newport-as9516.postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
1 change: 0 additions & 1 deletion ...sonic-platform-modules-bfn-newport/debian/sonic-platform-modules-bfn-newport-as9516.prerm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/sh

python2 -m pip uninstall -y sonic-platform
python3 -m pip uninstall -y sonic-platform

#DEBHELPER#
2 changes: 0 additions & 2 deletions ...-platform-modules-bfn-newport/debian/sonic-platform-modules-bfn-newport-as9516bf.postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
1 change: 0 additions & 1 deletion ...nic-platform-modules-bfn-newport/debian/sonic-platform-modules-bfn-newport-as9516bf.prerm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/sh

python2 -m pip uninstall -y sonic-platform
python3 -m pip uninstall -y sonic-platform

#DEBHELPER#
2 changes: 0 additions & 2 deletions platform/barefoot/sonic-platform-modules-bfn/debian/postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
1 change: 0 additions & 1 deletion platform/barefoot/sonic-platform-modules-bfn/debian/prerm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/sh

python2 -m pip uninstall -y sonic-platform
python3 -m pip uninstall -y sonic-platform

#DEBHELPER#
1 change: 0 additions & 1 deletion platform/barefoot/sonic-platform-modules-bfn/debian/rules
View file
Open in desktop
Original file line number Diff 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