summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDave Wallace <dwallacelf@gmail.com>2023-08-15 19:05:26 -0400
committerAndrew Yourtchenko <ayourtch@gmail.com>2023-08-16 19:53:12 +0000
commit7b8b4652693a87233c9aea313959a9cede3df0f4 (patch)
treec9e9275c0d77015922e3d9411a116151208bd8ae /src
parentd826a602696eb337dcce191d7d24ae1869e81ec2 (diff)
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 <dwallacelf@gmail.com>
Diffstat (limited to 'src')
-rwxr-xr-xsrc/plugins/map/examples/gen-rules.py1
-rwxr-xr-xsrc/plugins/map/examples/test_map.py1
-rwxr-xr-xsrc/plugins/map/gen-rules.py1
-rwxr-xr-xsrc/plugins/srv6-mobile/extra/runner.py8
-rwxr-xr-xsrc/scripts/host-stack/cc_plots.py1
-rwxr-xr-xsrc/tools/vppapigen/vppapigen_c.py1
-rw-r--r--src/vpp-api/python/vpp_papi/__init__.py2
-rw-r--r--src/vpp-api/python/vpp_papi/macaddress.py1
-rwxr-xr-xsrc/vpp-api/python/vpp_papi/tests/test_vpp_serializer.py2
-rwxr-xr-xsrc/vpp-api/vapi/vapi_c_gen.py1
10 files changed, 4 insertions, 15 deletions
diff --git a/src/plugins/map/examples/gen-rules.py b/src/plugins/map/examples/gen-rules.py
index d22d4633ef6..3d98f65b95d 100755
--- a/src/plugins/map/examples/gen-rules.py
+++ b/src/plugins/map/examples/gen-rules.py
@@ -42,6 +42,7 @@ parser.add_argument(
)
args = parser.parse_args()
+
#
# Print domain
#
diff --git a/src/plugins/map/examples/test_map.py b/src/plugins/map/examples/test_map.py
index 02df64015a2..f141ba3338c 100755
--- a/src/plugins/map/examples/test_map.py
+++ b/src/plugins/map/examples/test_map.py
@@ -11,6 +11,7 @@ for dir in args.inputdir:
sys.path.append(dir)
from vpp_papi import *
+
#
# 1:1 Shared IPv4 address, shared BR (16) VPP CLI
#
diff --git a/src/plugins/map/gen-rules.py b/src/plugins/map/gen-rules.py
index 7e74f14ad6f..e804763d0cf 100755
--- a/src/plugins/map/gen-rules.py
+++ b/src/plugins/map/gen-rules.py
@@ -25,6 +25,7 @@ parser = argparse.ArgumentParser(description="MAP VPP configuration generator")
parser.add_argument("-t", action="store", dest="mapmode")
args = parser.parse_args()
+
#
# 1:1 Shared IPv4 address, shared BR
#
diff --git a/src/plugins/srv6-mobile/extra/runner.py b/src/plugins/srv6-mobile/extra/runner.py
index eee89d7d41a..31201935120 100755
--- a/src/plugins/srv6-mobile/extra/runner.py
+++ b/src/plugins/srv6-mobile/extra/runner.py
@@ -24,7 +24,6 @@ class ContainerStartupError(Exception):
class Container(object):
-
tmp = "/tmp"
cmd = "vppctl -s 0:5002"
cmd_bash = "/bin/bash"
@@ -69,7 +68,6 @@ class Container(object):
@classmethod
def new(cls, client, image, name):
-
temp = join(cls.tmp, name)
if isdir(temp):
rmtree(temp)
@@ -241,7 +239,6 @@ class Containers(object):
self.image = image
def tmp_render(self, path, template, kwargs):
-
with open(path, "w") as fo:
fo.write(template.render(**kwargs))
@@ -349,7 +346,6 @@ class Networks(object):
class Program(object):
-
image = "srv6m-image"
name_prefix = "hck"
@@ -386,7 +382,6 @@ class Program(object):
return "{}-{}".format(self.name_prefix, name)
def stop_containers(self):
-
for name in self.instance_names:
instance = self.containers.get(self.get_name(name))
if instance:
@@ -398,7 +393,6 @@ class Program(object):
network.rem()
def start_containers(self):
-
self.stop_containers()
networks = list()
@@ -2457,7 +2451,6 @@ class Program(object):
p.show2()
def status_containers(self):
-
print("Instances:")
for i, name in enumerate(self.instance_names):
@@ -2585,7 +2578,6 @@ def get_args():
def main(op=None, prefix=None, verbose=None, image=None, index=None, command=None):
-
if verbose:
basicConfig(level=verbose_levels[verbose])
diff --git a/src/scripts/host-stack/cc_plots.py b/src/scripts/host-stack/cc_plots.py
index f0296af7223..f7953f223d4 100755
--- a/src/scripts/host-stack/cc_plots.py
+++ b/src/scripts/host-stack/cc_plots.py
@@ -24,7 +24,6 @@ def listy(points):
def plot_data(d):
-
plt.figure(1)
cwndx = listx(d["cwnd"])
diff --git a/src/tools/vppapigen/vppapigen_c.py b/src/tools/vppapigen/vppapigen_c.py
index 643c00590cc..64327887c0e 100755
--- a/src/tools/vppapigen/vppapigen_c.py
+++ b/src/tools/vppapigen/vppapigen_c.py
@@ -123,7 +123,6 @@ class ToJSON:
)
)
else:
-
write(
' cJSON_AddStringToObject(o, "{n}", (char *)a->{n});\n'.format(
n=o.fieldname
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",