Skip to content

Commit

Permalink
Merge pull request #4460 from anarkiwi/bl3
Browse files Browse the repository at this point in the history
black 24.1.1
  • Loading branch information
gizmoguy committed Jan 30, 2024
2 parents fc9c730 + 0dcb21c commit 652ed2a
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 13 deletions.
1 change: 1 addition & 0 deletions adapters/vendors/rabbitmq/example_consumer.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Example RabbitMQ consumer for testing and development purposes"""

import datetime
import logging

Expand Down
6 changes: 3 additions & 3 deletions clib/clib_mininet_test_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -316,9 +316,9 @@ def parse_flow(flow_lines):
instructions_count
> table_instructions_max[table_id]
):
table_instructions_max[
table_id
] = instructions_count
table_instructions_max[table_id] = (
instructions_count
)
elif section_name == "Action":
table_actions[table_id].add(type_match.group(1))
actions_count += 1
Expand Down
1 change: 0 additions & 1 deletion clib/clib_mininet_tests.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
"""Mininet tests for clib."""


import os
import re

Expand Down
2 changes: 1 addition & 1 deletion codecheck-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
black==24.1.0
black==24.1.1
flake8==7.0.0
pylint==3.0.3
pytype==2024.1.24
8 changes: 4 additions & 4 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,8 @@ def generate_prometheus_metric_table(_):
}

for module in ["faucet", "gauge"]:
block_text[
module
] = """\
block_text[module] = (
"""\
.. list-table:: {} prometheus metrics
:widths: 40 10 55
:header-rows: 1
Expand All @@ -218,7 +217,8 @@ def generate_prometheus_metric_table(_):
- Type
- Description
""".format(
module.title()
module.title()
)
)

# pylint: disable=protected-access
Expand Down
1 change: 1 addition & 0 deletions faucet/faucet_metadata.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""This module contains code relating to the use of OpenFlow Metadata within
Faucet.
"""

PORT_METADATA_MASK = 0xFFF
VLAN_METADATA_MASK = 0xFFF000
EGRESS_METADATA_MASK = PORT_METADATA_MASK | VLAN_METADATA_MASK
Expand Down
4 changes: 1 addition & 3 deletions faucet/valve_packet.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,7 @@
LACP_SIZE = 124

EUI_BITS = len(EUI(0).packed * 8)
MAC_MASK_BITMAP = {
(2**EUI_BITS - 2**i): (EUI_BITS - i) for i in range(0, EUI_BITS + 1)
}
MAC_MASK_BITMAP = {(2**EUI_BITS - 2**i): (EUI_BITS - i) for i in range(0, EUI_BITS + 1)}


@functools.lru_cache(maxsize=1024)
Expand Down
1 change: 0 additions & 1 deletion faucet/valve_stack.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
"""Manage higher level stack functions"""


from collections import defaultdict

from faucet.valve_manager_base import ValveManagerBase
Expand Down

0 comments on commit 652ed2a

Please sign in to comment.