dcicutils 8.14.0.1b5__py3-none-any.whl → 8.14.0.1b6__py3-none-any.whl

dcicutils/scripts/update_portal_object.py

@@ -251,7 +251,6 @@ def _post_or_patch_or_upsert(portal: Portal, file_or_directory: str,
             elif isinstance(data, list):
                 if debug:
                     _print(f"DEBUG: File ({file}) contains a list of objects of type: {schema_name}")
-                import pdb ; pdb.set_trace()  # noqa
                 data = _impose_special_ordering(data, schema_name)
                 for index, item in enumerate(data):
                     update_function(portal, item, schema_name, file=file, index=index,

dcicutils/scripts/view_portal_object.py

@@ -347,19 +347,18 @@ def _get_portal_object(portal: Portal, uuid: str,
                 schema_data = response[schema_name]
                 file_name = f"{to_snake_case(schema_name)}.json"
                 file_path = os.path.join(output_directory, file_name)
+                message_verb = "Writing"
                 if os.path.exists(file_path):
+                    message_verb = "Overwriting"
                     if os.path.isdir(file_path):
                         _print(f"WARNING: Output file already exists as a directory. SKIPPING: {file_path}")
                         continue
-                    if force:
-                        if verbose:
-                            _print(f"Overwriting extant file (per --force option): {file_path}")
-                    else:
+                    if not force:
                         _print(f"Output file already exists: {file_path}")
-                    if (not force) and not yes_or_no(f"Overwrite this file?"):
-                        continue
+                        if not yes_or_no(f"Overwrite this file?"):
+                            continue
                 if verbose:
-                    _print(f"Writing {schema_name} (object{'s' if len(schema_data) != 1 else ''}:"
+                    _print(f"{message_verb} {schema_name} (object{'s' if len(schema_data) != 1 else ''}:"
                            f" {len(schema_data)}) file: {file_path}")
                 with io.open(file_path, "w") as f:
                     json.dump(schema_data, f, indent=4)

{dcicutils-8.14.0.1b5.dist-info → dcicutils-8.14.0.1b6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.14.0.1b5
+Version: 8.14.0.1b6
 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.14.0.1b5.dist-info → dcicutils-8.14.0.1b6.dist-info}/RECORD

@@ -60,8 +60,8 @@ dcicutils/s3_utils.py,sha256=h2B9ftOo-kxqfiKth5ZDC_cAUFy1Pbu7BrVanFnE5Iw,28839
 dcicutils/schema_utils.py,sha256=GmRm-XqZKJ6qine16SQF1txcby9WougDav_sYmKNs9E,12400
 dcicutils/scripts/publish_to_pypi.py,sha256=sMd4WASQGlxlh7uLrt2eGkFRXYgONVmvIg8mClMS5RQ,13903
 dcicutils/scripts/run_license_checker.py,sha256=z2keYnRDZsHQbTeo1XORAXSXNJK5axVzL5LjiNqZ7jE,4184
-dcicutils/scripts/update_portal_object.py,sha256=bkadJlw3pJGLid8GXrNiZG0PWD9hvy4klGUNQhgjRhI,22610
-dcicutils/scripts/view_portal_object.py,sha256=RgNlX-AObLlOQ8flc3MxFAxsaXqMsswkH_jLsGLUScE,35778
+dcicutils/scripts/update_portal_object.py,sha256=5ET0RtwSgIPt5z7WiSf_UuEow-J2Bs-GEpmvria09Pg,22557
+dcicutils/scripts/view_portal_object.py,sha256=kgnw3HhSBTD1it2W54dLq2igoae2GkwK-Ebj3KQm8Po,35712
 dcicutils/secrets_utils.py,sha256=8dppXAsiHhJzI6NmOcvJV5ldvKkQZzh3Fl-cb8Wm7MI,19745
 dcicutils/sheet_utils.py,sha256=VlmzteONW5VF_Q4vo0yA5vesz1ViUah1MZ_yA1rwZ0M,33629
 dcicutils/snapshot_utils.py,sha256=YDeI3vD-MhAtHwKDzfEm2q-n3l-da2yRpRR3xp0Ah1M,23021
@@ -75,8 +75,8 @@ dcicutils/trace_utils.py,sha256=g8kwV4ebEy5kXW6oOrEAUsurBcCROvwtZqz9fczsGRE,1769
 dcicutils/validation_utils.py,sha256=cMZIU2cY98FYtzK52z5WUYck7urH6JcqOuz9jkXpqzg,14797
 dcicutils/variant_utils.py,sha256=2H9azNx3xAj-MySg-uZ2SFqbWs4kZvf61JnK6b-h4Qw,4343
 dcicutils/zip_utils.py,sha256=_Y9EmL3D2dUZhxucxHvrtmmlbZmK4FpSsHEb7rGSJLU,3265
-dcicutils-8.14.0.1b5.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
-dcicutils-8.14.0.1b5.dist-info/METADATA,sha256=V2K3KDP_z_RIjiAwxfAfxg3t0X-htcbhpo-1EmJtH5I,3439
-dcicutils-8.14.0.1b5.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-dcicutils-8.14.0.1b5.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
-dcicutils-8.14.0.1b5.dist-info/RECORD,,
+dcicutils-8.14.0.1b6.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
+dcicutils-8.14.0.1b6.dist-info/METADATA,sha256=QQ8SkV0WUakZ5gvmx54fyeVABChklVyyVtMtmY_AoBg,3439
+dcicutils-8.14.0.1b6.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+dcicutils-8.14.0.1b6.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
+dcicutils-8.14.0.1b6.dist-info/RECORD,,