black reformatting.

Author: ldebek

mergin_work_packages.py

@@ -1,4 +1,3 @@
-
 from workpackages.wp_mergin import run_wp_mergin_with_context, parse_args
 
 if __name__ == "__main__":

scripts/update_version.py

@@ -4,7 +4,7 @@
 
 
 def replace_in_file(filepath, regex, sub):
-    with open(filepath, 'r') as f:
+    with open(filepath, "r") as f:
         content = f.read()
 
     content_new = re.sub(regex, sub, content, flags=re.M)
@@ -15,11 +15,11 @@ def replace_in_file(filepath, regex, sub):
 
 dir_path = os.path.dirname(os.path.realpath(__file__))
 parser = argparse.ArgumentParser()
-parser.add_argument('--version', help='version to replace')
+parser.add_argument("--version", help="version to replace")
 args = parser.parse_args()
 ver = args.version
 print("using version " + ver)
 
 about_file = os.path.join(dir_path, os.pardir, "workpackages", "version.py")
 print("patching " + about_file)
-replace_in_file(about_file, "__version__\s=\s\".*", "__version__ = \"" + ver + "\"")
+replace_in_file(about_file, '__version__\s=\s".*', '__version__ = "' + ver + '"')

workpackages/test/test_basic.py

@@ -418,16 +418,14 @@ def test_wp_add_wp_delete_wp_duplicate_add_feature():
         "trees",
         "POINT(6 16)",
         {"tree_species_id": 1, "farm_id": 4},
-        fid=1111111
+        fid=1111111,
     )
     # run work packaging
     wp_config = load_config_from_yaml(config_file)
     make_work_packages(tmp_dir_2.name, wp_config)
     tmp_dir_3 = _prepare_next_run_work_packages(tmp_dir_2)
     # modify 'Kyle' WP by removing 'trees' feature with a FID '1111111'
-    open_layer_and_delete_feature(
-        os.path.join(tmp_dir_3.name, "input", "Kyle.gpkg"), "trees", 1111111
-    )
+    open_layer_and_delete_feature(os.path.join(tmp_dir_3.name, "input", "Kyle.gpkg"), "trees", 1111111)
     # run work packaging 2nd time
     make_work_packages(tmp_dir_3.name, wp_config)
     tmp_dir_4 = _prepare_next_run_work_packages(tmp_dir_3)
@@ -437,7 +435,7 @@ def test_wp_add_wp_delete_wp_duplicate_add_feature():
         "trees",
         "POINT(6 16)",
         {"tree_species_id": 1, "farm_id": 4},
-        fid=1111111
+        fid=1111111,
     )
     # run work packaging 3rd time
     make_work_packages(tmp_dir_4.name, wp_config)
@@ -448,6 +446,7 @@ def test_wp_add_wp_delete_wp_duplicate_add_feature():
     assert "Kyle_duplicate.gpkg" in final_output_files
     assert "master.gpkg" in final_output_files
 
+
 # TODO: more test cases
 # - delete_master_update_wp  # one row deleted in master while it is updated in WP
 # - update_master_delete_wp  # one row updated in master while it is deleted in WP

workpackages/wp.py

@@ -407,7 +407,10 @@ def _logger_callback(level, text_bytes):
             table_wp_name = f"{wp_table_name}_{wp_name}"
             table_wp_name_esc = escape_double_quotes(table_wp_name)
             missing_master_fids_str = ",".join(["?"] * len(missing_master_fids))
-            c.execute(f"""DELETE FROM {table_wp_name_esc} WHERE {master_id_column_escaped} IN ({missing_master_fids_str});""", missing_master_fids)
+            c.execute(
+                f"""DELETE FROM {table_wp_name_esc} WHERE {master_id_column_escaped} IN ({missing_master_fids_str});""",
+                missing_master_fids,
+            )
     c.execute("COMMIT")
     c.execute("VACUUM")
     db.close()