STY: Enhanced styling

Makefile

@@ -36,8 +36,8 @@ unittest:
 	pytest-3 unittests
 
 style:
-	pycodestyle --count src unittests --exclude=swagger_client
-	autopep8 -ar --diff --exit-code --exclude swagger_client .
+	pycodestyle --count --exclude=swagger_client src unittests
+	autopep8 -ar --diff --exit-code --exclude swagger_client src unittests
 .PHONY: style
 
 lint:

src/caosadvancedtools/table_json_conversion/fill_xlsx.py

@@ -314,7 +314,7 @@ out: union[dict, None]
             else:
                 value = content[0]
                 if isinstance(value, str):
-                    value =  ILLEGAL_CHARACTERS_RE.sub("", value)
+                    value = ILLEGAL_CHARACTERS_RE.sub("", value)
             path_str = p2s(path)
             assert path_str not in insertables
             insertables[path_str] = value

src/caosadvancedtools/table_json_conversion/table_generator.py

@@ -208,13 +208,14 @@ class TableTemplateGenerator(ABC):
                         foreigns = self._get_foreign_keys(foreign_keys, array_path)
                         if isinstance(foreigns, str):
                             raise ValueError("Foreign keys must be a list of strings, but a single "
-                                            "string was given:\n"
-                                            f"{array_path} -> {foreigns}")
+                                             "string was given:\n"
+                                             f"{array_path} -> {foreigns}")
                         for foreign in foreigns:
                             internal_key = p2s(array_path + [foreign])
                             if internal_key in sheets[sheetname]:
                                 raise ValueError("The schema would lead to two columns with the same "
-                                                f"name, which is forbidden:\n{foreign} -> {internal_key}")
+                                                 "name, which is forbidden:\n"
+                                                 f"{foreign} -> {internal_key}")
                             ref_sheet = p2s(array_path)
                             sheets[sheetname][internal_key] = (
                                 ColumnType.FOREIGN, f"see sheet '{ref_sheet}'", array_path + [foreign])

unittests/table_json_conversion/test_table_template_generator.py

@@ -216,21 +216,21 @@ def test_template_generator():
         with open(rp) as sfi:
             schema = json.load(sfi)
         fk_path = os.path.join(di, "foreign_keys"+fi[len('schema'):])
-        path =os.path.join(di, "template"+fi[len('schema'):-4]+"xlsx")
-        allreadydone = [
-"Präventionsmaßnahmen" ,
-"Beratungsstellen" ,
-"Schutzeinrichtungen",
-"Einzelfallversorgung" ,
-"Strategiedokumente" ,
-"Kooperationsvereinbarungen" ,
-"Gremien" ,
-"Verwaltungsvorschriften" ,
-"Gewaltschutzkonzepte und -maßnahmen",
-"Polizeilicher Opferschutz",
-"Feedback",
+        path = os.path.join(di, "template"+fi[len('schema'):-4]+"xlsx")
+        alreadydone = [
+            "Präventionsmaßnahmen",
+            "Beratungsstellen",
+            "Schutzeinrichtungen",
+            "Einzelfallversorgung",
+            "Strategiedokumente",
+            "Kooperationsvereinbarungen",
+            "Gremien",
+            "Verwaltungsvorschriften",
+            "Gewaltschutzkonzepte und -maßnahmen",
+            "Polizeilicher Opferschutz",
+            "Feedback",
         ]
-        if any([path.startswith("template_"+k) for k in allreadydone]):
+        if any([path.startswith("template_"+k) for k in alreadydone]):
             continue
 
         if not os.path.exists(fk_path):