format: reformat with black
CI seems to be failing due to a new version of pycodestyle
with errors such as:
```
./tools/elog-gen.py:26:11: E275 missing whitespace after keyword
if(i_parents[error] is not None):
```
Attempt to reformat the whole codebase with `black`.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I2fb63670cf4828d4dee19a9c7f247e9ffecdb398
diff --git a/extensions/openpower-pels/pel_registry/__init__.py b/extensions/openpower-pels/pel_registry/__init__.py
index 32585bd..21f916b 100644
--- a/extensions/openpower-pels/pel_registry/__init__.py
+++ b/extensions/openpower-pels/pel_registry/__init__.py
@@ -2,10 +2,10 @@
def get_registry_path() -> str:
- return os.path.join(os.path.dirname(__file__),
- 'message_registry.json')
+ return os.path.join(os.path.dirname(__file__), "message_registry.json")
def get_comp_id_file_path(creatorID: str) -> str:
- return os.path.join(os.path.dirname(__file__),
- creatorID + '_component_ids.json')
+ return os.path.join(
+ os.path.dirname(__file__), creatorID + "_component_ids.json"
+ )
diff --git a/extensions/openpower-pels/registry/tools/process_registry.py b/extensions/openpower-pels/registry/tools/process_registry.py
index 8f8eb78..229f551 100755
--- a/extensions/openpower-pels/registry/tools/process_registry.py
+++ b/extensions/openpower-pels/registry/tools/process_registry.py
@@ -21,11 +21,11 @@
"""
names = []
- for entry in registry_json['PELs']:
- if entry['Name'] in names:
- sys.exit("Found multiple uses of error {}".format(entry['Name']))
+ for entry in registry_json["PELs"]:
+ if entry["Name"] in names:
+ sys.exit("Found multiple uses of error {}".format(entry["Name"]))
else:
- names.append(entry['Name'])
+ names.append(entry["Name"])
def check_duplicate_reason_codes(registry_json):
@@ -37,12 +37,15 @@
"""
reasonCodes = []
- for entry in registry_json['PELs']:
- if entry['SRC']['ReasonCode'] in reasonCodes:
- sys.exit("Found duplicate SRC reason code {}".format(
- entry['SRC']['ReasonCode']))
+ for entry in registry_json["PELs"]:
+ if entry["SRC"]["ReasonCode"] in reasonCodes:
+ sys.exit(
+ "Found duplicate SRC reason code {}".format(
+ entry["SRC"]["ReasonCode"]
+ )
+ )
else:
- reasonCodes.append(entry['SRC']['ReasonCode'])
+ reasonCodes.append(entry["SRC"]["ReasonCode"])
def check_component_id(registry_json):
@@ -54,23 +57,26 @@
registry_json: The message registry JSON
"""
- for entry in registry_json['PELs']:
+ for entry in registry_json["PELs"]:
# Don't check on "11" SRCs as those reason codes aren't supposed to
# match the component ID.
- if entry['SRC'].get('Type', '') == "11":
+ if entry["SRC"].get("Type", "") == "11":
continue
- if 'ComponentID' in entry:
- id = int(entry['ComponentID'], 16)
- reason_code = int(entry['SRC']['ReasonCode'], 16)
+ if "ComponentID" in entry:
+ id = int(entry["ComponentID"], 16)
+ reason_code = int(entry["SRC"]["ReasonCode"], 16)
if (id & 0xFF00) != (reason_code & 0xFF00):
- sys.exit("Found mismatching component ID {} vs reason "
- "code {} for error {}".format(
- entry['ComponentID'],
- entry['SRC']['ReasonCode'],
- entry['Name']))
+ sys.exit(
+ "Found mismatching component ID {} vs reason "
+ "code {} for error {}".format(
+ entry["ComponentID"],
+ entry["SRC"]["ReasonCode"],
+ entry["Name"],
+ )
+ )
def check_message_args(registry_json):
@@ -82,20 +88,27 @@
registry_json: The message registry JSON
"""
- for entry in registry_json['PELs']:
- num_placeholders = entry['Documentation']['Message'].count('%')
+ for entry in registry_json["PELs"]:
+ num_placeholders = entry["Documentation"]["Message"].count("%")
if num_placeholders == 0:
continue
- if 'MessageArgSources' not in entry['Documentation']:
- sys.exit("Missing MessageArgSources property for error {}".
- format(entry['Name']))
+ if "MessageArgSources" not in entry["Documentation"]:
+ sys.exit(
+ "Missing MessageArgSources property for error {}".format(
+ entry["Name"]
+ )
+ )
- if num_placeholders != \
- len(entry['Documentation']['MessageArgSources']):
- sys.exit("Different number of placeholders found in "
- "Message vs MessageArgSources for error {}".
- format(entry['Name']))
+ if num_placeholders != len(
+ entry["Documentation"]["MessageArgSources"]
+ ):
+ sys.exit(
+ "Different number of placeholders found in "
+ "Message vs MessageArgSources for error {}".format(
+ entry["Name"]
+ )
+ )
def validate_schema(registry, schema):
@@ -132,24 +145,40 @@
check_message_args(registry_json)
-if __name__ == '__main__':
+if __name__ == "__main__":
parser = argparse.ArgumentParser(
- description='PEL message registry processor')
+ description="PEL message registry processor"
+ )
- parser.add_argument('-v', '--validate', action='store_true',
- dest='validate',
- help='Validate the JSON using the schema')
+ parser.add_argument(
+ "-v",
+ "--validate",
+ action="store_true",
+ dest="validate",
+ help="Validate the JSON using the schema",
+ )
- parser.add_argument('-s', '--schema-file', dest='schema_file',
- help='The message registry JSON schema file')
+ parser.add_argument(
+ "-s",
+ "--schema-file",
+ dest="schema_file",
+ help="The message registry JSON schema file",
+ )
- parser.add_argument('-r', '--registry-file', dest='registry_file',
- help='The message registry JSON file')
- parser.add_argument('-k', '--skip-schema-validation', action='store_true',
- dest='skip_schema',
- help='Skip running schema validation. '
- 'Only do the extra checks.')
+ parser.add_argument(
+ "-r",
+ "--registry-file",
+ dest="registry_file",
+ help="The message registry JSON file",
+ )
+ parser.add_argument(
+ "-k",
+ "--skip-schema-validation",
+ action="store_true",
+ dest="skip_schema",
+ help="Skip running schema validation. " "Only do the extra checks.",
+ )
args = parser.parse_args()
diff --git a/extensions/openpower-pels/setup.py b/extensions/openpower-pels/setup.py
index 1ed8fa9..8939146 100644
--- a/extensions/openpower-pels/setup.py
+++ b/extensions/openpower-pels/setup.py
@@ -8,20 +8,27 @@
# the __init__.py before building the package so they can reside in
# ../site-packages/pel_registry/ instead of site-packages/registry.
this_dir = os.path.dirname(__file__)
-target_dir = os.path.join(this_dir, 'pel_registry')
-shutil.copy(os.path.join(
- this_dir, 'registry/message_registry.json'), target_dir)
-shutil.copy(os.path.join(this_dir, 'registry/O_component_ids.json'),
- target_dir)
-shutil.copy(os.path.join(this_dir, 'registry/B_component_ids.json'),
- target_dir)
+target_dir = os.path.join(this_dir, "pel_registry")
+shutil.copy(
+ os.path.join(this_dir, "registry/message_registry.json"), target_dir
+)
+shutil.copy(
+ os.path.join(this_dir, "registry/O_component_ids.json"), target_dir
+)
+shutil.copy(
+ os.path.join(this_dir, "registry/B_component_ids.json"), target_dir
+)
setup(
name="pel_message_registry",
- version=os.getenv('PELTOOL_VERSION', '1.0'),
+ version=os.getenv("PELTOOL_VERSION", "1.0"),
classifiers=["License :: OSI Approved :: Apache Software License"],
- packages=['pel_registry'],
- package_data={'': ['message_registry.json',
- 'O_component_ids.json',
- 'B_component_ids.json']},
+ packages=["pel_registry"],
+ package_data={
+ "": [
+ "message_registry.json",
+ "O_component_ids.json",
+ "B_component_ids.json",
+ ]
+ },
)