dcicutils 8.13.3.1b8__tar.gz → 8.13.3.1b10__tar.gz

{dcicutils-8.13.3.1b8 → dcicutils-8.13.3.1b10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.13.3.1b8
+Version: 8.13.3.1b10
 Summary: Utility package for interacting with the 4DN Data Portal and other 4DN resources
 Home-page: https://github.com/4dn-dcic/utils
 License: MIT

{dcicutils-8.13.3.1b8 → dcicutils-8.13.3.1b10}/dcicutils/scripts/update_portal_object.py

@@ -165,6 +165,7 @@ def main():
                                  update_action_name="PATCH",
                                  patch_delete_fields=args.delete,
                                  confirm=args.confirm, verbose=args.verbose, quiet=args.quiet, debug=args.debug)
+        args.delete = None
     if args.upsert:
         _post_or_patch_or_upsert(portal=portal,
                                  file_or_directory=args.upsert,
@@ -173,6 +174,7 @@ def main():
                                  update_action_name="UPSERT",
                                  patch_delete_fields=args.delete,
                                  confirm=args.confirm, verbose=args.verbose, quiet=args.quiet, debug=args.debug)
+        args.delete = None
 
     if args.delete:
         if not portal.get_metadata(args.delete, raise_exception=False):
@@ -193,6 +195,7 @@ def main():
 def _post_or_patch_or_upsert(portal: Portal, file_or_directory: str,
                              explicit_schema_name: str,
                              update_function: Callable, update_action_name: str,
+                             patch_delete_fields: Optional[str] = None,
                              confirm: bool = False, verbose: bool = False,
                              quiet: bool = False, debug: bool = False) -> None:
 
@@ -255,14 +258,17 @@ def _post_or_patch_or_upsert(portal: Portal, file_or_directory: str,
                     _print(f"ERROR: Schema cannot be inferred from file name and --schema not specified: {file}")
                     continue
                 post_or_patch_or_upsert(portal, file_and_schema[0], schema_name=schema_name,
+                                        patch_delete_fields=patch_delete_fields,
                                         confirm=confirm, quiet=quiet, verbose=verbose, debug=debug)
     elif os.path.isfile(file := file_or_directory):
         if ((schema_name := _get_schema_name_from_schema_named_json_file_name(portal, file)) or
             (schema_name := explicit_schema_name)):  # noqa
             post_or_patch_or_upsert(portal, file, schema_name=schema_name,
+                                    patch_delete_fields=patch_delete_fields,
                                     confirm=confirm, quiet=quiet, verbose=verbose, debug=debug)
         else:
             post_or_patch_or_upsert(portal, file, schema_name=schema_name,
+                                    patch_delete_fields=patch_delete_fields,
                                     confirm=confirm, quiet=quiet, verbose=verbose, debug=debug)
             # _print(f"ERROR: Schema cannot be inferred from file name and --schema not specified: {file}")
             # return

{dcicutils-8.13.3.1b8 → dcicutils-8.13.3.1b10}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dcicutils"
-version = "8.13.3.1b8"  # TODO: To become 8.13.4
+version = "8.13.3.1b10"  # TODO: To become 8.13.4
 description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources"
 authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
 license = "MIT"