From 7b8b4652693a87233c9aea313959a9cede3df0f4 Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Tue, 15 Aug 2023 19:05:26 -0400 Subject: tests docs: update python3 venv packages - Package update performed by 1. updating pip, pip-tools, setuptools 2. 'make test-refresh-deps' on ubuntu 22.04 3. fixing 'make test' and 'make docs' issues on ubuntu 22.04 4. 'make test-refresh-deps' on ubuntu 20.04 - Add dependency for 'make test-refresh-deps' to insure python venv is set up. - Update of python formatter, black, caused reformating of 41 python code files. Type: make Change-Id: I7cafdf4b5189065ac57cb6b254937f6e0897a924 Signed-off-by: Dave Wallace --- src/vpp-api/python/vpp_papi/__init__.py | 2 +- src/vpp-api/python/vpp_papi/macaddress.py | 1 - src/vpp-api/python/vpp_papi/tests/test_vpp_serializer.py | 2 -- src/vpp-api/vapi/vapi_c_gen.py | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) (limited to 'src/vpp-api') diff --git a/src/vpp-api/python/vpp_papi/__init__.py b/src/vpp-api/python/vpp_papi/__init__.py index f87b6480d4e..dc58c1e18cb 100644 --- a/src/vpp-api/python/vpp_papi/__init__.py +++ b/src/vpp-api/python/vpp_papi/__init__.py @@ -14,5 +14,5 @@ import pkg_resources # part of setuptools try: __version__ = pkg_resources.get_distribution("vpp_papi").version -except (pkg_resources.DistributionNotFound): +except pkg_resources.DistributionNotFound: """Can't find vpp_papi via setuptools""" diff --git a/src/vpp-api/python/vpp_papi/macaddress.py b/src/vpp-api/python/vpp_papi/macaddress.py index 8799bd7be24..66349a3c19a 100644 --- a/src/vpp-api/python/vpp_papi/macaddress.py +++ b/src/vpp-api/python/vpp_papi/macaddress.py @@ -53,7 +53,6 @@ class MACAddress: return "%s(%s)" % (self.__class__.__name__, self.mac_string) def __eq__(self, other): - if not isinstance(other, MACAddress): try: # if it looks like a mac address, we'll take it. diff --git a/src/vpp-api/python/vpp_papi/tests/test_vpp_serializer.py b/src/vpp-api/python/vpp_papi/tests/test_vpp_serializer.py index ab6ce81b64b..f0d2846214a 100755 --- a/src/vpp-api/python/vpp_papi/tests/test_vpp_serializer.py +++ b/src/vpp-api/python/vpp_papi/tests/test_vpp_serializer.py @@ -468,7 +468,6 @@ class TestAddType(unittest.TestCase): self.assertEqual(nt.something, 200) def test_abf(self): - fib_mpls_label = VPPType( "vl_api_fib_mpls_label_t", [["u8", "is_uniform"], ["u32", "label"], ["u8", "ttl"], ["u8", "exp"]], @@ -561,7 +560,6 @@ class TestAddType(unittest.TestCase): ) def test_bier(self): - bier_table_id = VPPType( "vl_api_bier_table_id_t", [["u8", "bt_set"], ["u8", "bt_sub_domain"], ["u8", "bt_hdr_len_id"]], diff --git a/src/vpp-api/vapi/vapi_c_gen.py b/src/vpp-api/vapi/vapi_c_gen.py index 2978ebd2077..84d9acadeda 100755 --- a/src/vpp-api/vapi/vapi_c_gen.py +++ b/src/vpp-api/vapi/vapi_c_gen.py @@ -183,7 +183,6 @@ class CStruct(Struct): class CSimpleType(SimpleType): - swap_to_be_dict = { "i16": "htobe16", "u16": "htobe16", -- cgit 1.2.3-korg