From e39cc018c85bde4c96f283c1f3ab26cb8e1f3548 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Wed, 23 Dec 2020 18:00:31 -0800 Subject: [PATCH 1/2] [sonic-config-engine] Pin 'importlib-resources' package to v3.3.1 for Python 2 (#6288) importlib-resources v4.0.0 was released today (2020-12-23) and drops support for Python 2. This caused the sonic-config-engine Python 2 wheel build to fail. Reference: https://pypi.org/project/importlib-resources/ Pin 'importlib-resources' package to v3.3.1 for Python 2 Unrelated: remove pinned version of zipp for sonic-bgpcfgd because we no longer build a Python 2 version of that package --- src/sonic-bgpcfgd/setup.py | 1 - src/sonic-config-engine/setup.py | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sonic-bgpcfgd/setup.py b/src/sonic-bgpcfgd/setup.py index 91fcdd0ac26..d6290bccb2b 100755 --- a/src/sonic-bgpcfgd/setup.py +++ b/src/sonic-bgpcfgd/setup.py @@ -18,7 +18,6 @@ 'jinja2>=2.10', 'netaddr==0.8.0', 'pyyaml==5.3.1', - 'zipp==1.2.0', # importlib-resources needs zipp and seems to have a bug where it will try to import too new of a version for Python 2 ], setup_requires = [ 'pytest-runner', diff --git a/src/sonic-config-engine/setup.py b/src/sonic-config-engine/setup.py index 7e7b9b45519..2483e8ebcf3 100755 --- a/src/sonic-config-engine/setup.py +++ b/src/sonic-config-engine/setup.py @@ -30,7 +30,8 @@ 'future', 'Jinja2<3.0.0', 'pyangbind==0.6.0', - 'zipp==1.2.0', # importlib-resources needs zipp and seems to have a bug where it will try to install too new of a version for Python 2 + 'zipp==1.2.0', # importlib-resources needs zipp and seems to have a bug where it will try to install too new of a version for Python 2 + 'importlib-resources==3.3.1' # importlib-resources v4.0.0 was released 2020-12-23 and drops support for Python 2 ] From a62f45dca879a3c78f8a0ad78b98f84a346aa3a1 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Wed, 23 Dec 2020 18:34:34 -0800 Subject: [PATCH 2/2] [sonic-swss] Update submodule (#6270) * src/sonic-swss c7ee75f...cadf28f (24): > Revert "Add support for headroom pool watermark (#1453)" > [VxlanOrch] pytest for EVPN VXLAN (#1318) > [restore_neighbors] python3 support for restore_neighbors.py (#1542) > [buffermgmt] more build error fixes when compiling for armhf (32-bit) (#1559) > Sflow fix to avoid NULL in field. (#1531) > [fgnhgorch] Fg Nhg link handling (#1537) > [dpb]: make sure port is in admin down state before remove port. (#1513) > [FPMSYNCD/FDBSYNCD] EVPN Type-5 route removing prefix-len for host route and removing junk character present in the mac (#1553) > Added support for EVPN L3 VXLAN as described in the PR Azure/SONiC#437 (#1267) > [crm]: Typecast to unit64_t to avoid divide by 0 during overflow (#1550) > [vxlanmgr] Fix build error when compiling for armhf (32-bit) (#1552) > [Dynamic buffer calc] Support dynamic buffer calculation (#1338) > [dvs] Clean-up dvs_database and dvs_common (#1541) > [VxlanMgr] changes for EVPN VXLAN (#1266) > Statistics support for Tx and Rx counters of different frame sizes (#1536) > [orchagent/phy]: Add firmware info propagation (#1540) > [vxlanorch] Use PRI instead of %l to avoid warnings in 32-bit arch (#1539) > [FDBSYNCD] Added support for EVPN as described in the PR Azure/SONiC#437 (#1276) > [everflow] Add retry mechanism for mirror sessions and policers (#1486) > Enable ACL table type mirror_v6 for Innovium Platform (#1527) > [fgnhgorch] Change format specifier %lu to %zu for size_t (#1529) > [dvs] Fix issue where concurrent netns operations cause test setup to fail (#1535) > Add support for headroom pool watermark (#1453) > Change gAsicInstance to type string with max length limit (#1526) --- src/sonic-swss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-swss b/src/sonic-swss index c7ee75f0b92..cadf28faab2 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit c7ee75f0b92e3bbbd34938fb6ceca50f0491b5f9 +Subproject commit cadf28faab202c84805dfde8c582099998488b88