dcicutils 8.14.0.1b24__tar.gz → 8.14.0.1b26__tar.gz

{dcicutils-8.14.0.1b24 → dcicutils-8.14.0.1b26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.14.0.1b24
+Version: 8.14.0.1b26
 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.1b24 → dcicutils-8.14.0.1b26}/dcicutils/scripts/update_portal_object.py

@@ -534,7 +534,7 @@ def _load_data(portal: Portal, load: str, ini_file: str, explicit_schema_name: O
             if isinstance(data, list):
                 if not (schema_name := explicit_schema_name):
                     if not (schema_name := _get_schema_name_from_schema_named_json_file_name(portal, inserts_file)):
-                        _print("Unable to determine schema name for JSON data file: {inserts_file}")
+                        _print(f"Unable to determine schema name for JSON data file: {inserts_file}")
                         return False
                 elif not (schema_name := _get_schema(portal, explicit_schema_name)[1]):
                     _print(f"Unknown specified schema name: {explicit_schema_name}")
@@ -707,9 +707,10 @@ def _create_portal(env: Optional[str] = None, ini: Optional[str] = None, app: Op
             if (not load) and (app == APP_SMAHT) and (env := os.environ.get(_SMAHT_ENV_ENVIRON_NAME)):
                 env_from_environ = True
         if not env:
-            if os.path.exists(ini_file := os.path.normpath(os.path.join(os.getcwd(), _DEFAULT_INI_FILE_FOR_LOAD))):
-                return _create_portal(ini=ini_file, app=app, verbose=verbose, debug=debug)
-            return None
+            if not os.path.exists(ini_file := os.path.normpath(os.path.join(os.getcwd(), _DEFAULT_INI_FILE_FOR_LOAD))):
+                _print("Must specify --ini or --env option in order to create a Portal object.")
+                return None
+            return _create_portal(ini=ini_file, app=app, verbose=verbose, debug=debug)
         if not (portal := Portal(env, app=app) if env or app else None):
             _print(f"Cannot create access-key based Portal object: {env}{f' ({app})' if app else ''}")
             return None

{dcicutils-8.14.0.1b24 → dcicutils-8.14.0.1b26}/pyproject.toml

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