From bb7d5c795df900f581b6f801e8a7b16e8b649ac7 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Tue, 12 Dec 2023 14:55:18 -0500 Subject: [PATCH 01/20] Updated dcicutils to 8.6.0 (with minor fixes related to structured_data and SMaHT ingestion). --- CHANGELOG.rst | 6 ++++++ poetry.lock | 8 ++++---- pyproject.toml | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c4965ed7c..17368c6cc 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,6 +6,12 @@ snovault Change Log ---------- + +11.7.0 +====== +* Updated dcicutils to 8.6.0 (with minor fixes related to structured_data and SMaHT ingestion). + + 11.6.0 ====== * Updated dcicutils to 8.4.1 (with structured_data). diff --git a/poetry.lock b/poetry.lock index b14aa253d..4a2655708 100644 --- a/poetry.lock +++ b/poetry.lock @@ -862,13 +862,13 @@ test-randomorder = ["pytest-randomly"] [[package]] name = "dcicutils" -version = "8.5.0" +version = "8.5.0.1b1" description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources" optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "dcicutils-8.5.0-py3-none-any.whl", hash = "sha256:c57a61097729b93856d2f98b0ef387ea91c908d0bf81926e70909c5a70a4c0c9"}, - {file = "dcicutils-8.5.0.tar.gz", hash = "sha256:25e82a576e7c9f128fbb2c1581c161017059cc86b515875149005230aa8bf819"}, + {file = "dcicutils-8.5.0.1b1-py3-none-any.whl", hash = "sha256:2e51ff98ec2b700f0fd7d4ab717ac0d759109a0d99d7bcf1c61fca93eb91b316"}, + {file = "dcicutils-8.5.0.1b1.tar.gz", hash = "sha256:707e192917fd6358fd8772e77e39e65ac62b544cd60a1248fc15cfed1f43b458"}, ] [package.dependencies] @@ -3272,4 +3272,4 @@ test = ["zope.testing"] [metadata] lock-version = "2.0" python-versions = ">=3.8.1,<3.12" -content-hash = "8a0e0fab0118eda89e6013bae4280c5524c4459feb685927b4ff8d16417e8da2" +content-hash = "51fe7ef16e8759c69e5dd3c3b38f596c3f52d69117a88f07551ee2f856a14112" diff --git a/pyproject.toml b/pyproject.toml index 788952fd9..2a97d09f5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dcicsnovault" -version = "11.6.0" +version = "11.6.0.1b1" # TODO: To become 11.7.0 description = "Storage support for 4DN Data Portals." authors = ["4DN-DCIC Team "] license = "MIT" @@ -43,7 +43,7 @@ boto3 = ">=1.28.62" # no particular version required, but this speeds up search botocore = ">=1.31.62" # no particular version required, but this speeds up search elasticsearch = "7.13.4" # versions >= 7.14.0 lock out AWS ES elasticsearch_dsl = "^7.4.0" -dcicutils = "^8.5.0" +dcicutils = "^8.5.0.1b1" future = ">=0.15.2,<1" html5lib = ">=1.1" # experimental, should be OK now that we're not using moto server humanfriendly = "^1.44.9" From 3e00daa2e60add3941b0abd696a1e2374b30df75 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Tue, 12 Dec 2023 18:23:35 -0500 Subject: [PATCH 02/20] dcicutils to 8.5.1.1b2 --- poetry.lock | 8 ++++---- pyproject.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index 4a2655708..2116c0bcd 100644 --- a/poetry.lock +++ b/poetry.lock @@ -862,13 +862,13 @@ test-randomorder = ["pytest-randomly"] [[package]] name = "dcicutils" -version = "8.5.0.1b1" +version = "8.5.0.1b2" description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources" optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "dcicutils-8.5.0.1b1-py3-none-any.whl", hash = "sha256:2e51ff98ec2b700f0fd7d4ab717ac0d759109a0d99d7bcf1c61fca93eb91b316"}, - {file = "dcicutils-8.5.0.1b1.tar.gz", hash = "sha256:707e192917fd6358fd8772e77e39e65ac62b544cd60a1248fc15cfed1f43b458"}, + {file = "dcicutils-8.5.0.1b2-py3-none-any.whl", hash = "sha256:c814235442f0f2abc53344703dfce5d6c3e1b1dfdf25f05901ab576572363ceb"}, + {file = "dcicutils-8.5.0.1b2.tar.gz", hash = "sha256:b72a57ebc3d11a06ca787f8ad814277847d85969d00d7eb994c19c6573b073de"}, ] [package.dependencies] @@ -3272,4 +3272,4 @@ test = ["zope.testing"] [metadata] lock-version = "2.0" python-versions = ">=3.8.1,<3.12" -content-hash = "51fe7ef16e8759c69e5dd3c3b38f596c3f52d69117a88f07551ee2f856a14112" +content-hash = "e657b46f7c9d475b8bcfefb1f406d1fcc6e4269e48a18ed65f75718584a3f90f" diff --git a/pyproject.toml b/pyproject.toml index 2a97d09f5..97cab571a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dcicsnovault" -version = "11.6.0.1b1" # TODO: To become 11.7.0 +version = "11.6.0.1b2" # TODO: To become 11.7.0 description = "Storage support for 4DN Data Portals." authors = ["4DN-DCIC Team "] license = "MIT" @@ -43,7 +43,7 @@ boto3 = ">=1.28.62" # no particular version required, but this speeds up search botocore = ">=1.31.62" # no particular version required, but this speeds up search elasticsearch = "7.13.4" # versions >= 7.14.0 lock out AWS ES elasticsearch_dsl = "^7.4.0" -dcicutils = "^8.5.0.1b1" +dcicutils = "^8.5.0.1b2" future = ">=0.15.2,<1" html5lib = ">=1.1" # experimental, should be OK now that we're not using moto server humanfriendly = "^1.44.9" From d326c27a7d6e85b3df4a2b5f6b80f93ebf531216 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Wed, 13 Dec 2023 09:23:00 -0500 Subject: [PATCH 03/20] minor updates to utility scripts to use dcicutils.portal_utils.Portal --- .../commands/generate_local_access_key.py | 31 ++++++++++--------- snovault/commands/view_local_object.py | 7 +++-- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/snovault/commands/generate_local_access_key.py b/snovault/commands/generate_local_access_key.py index 238cf0d4e..ced648b84 100644 --- a/snovault/commands/generate_local_access_key.py +++ b/snovault/commands/generate_local_access_key.py @@ -73,6 +73,7 @@ import uuid from webtest import TestApp from dcicutils.common import AnyJsonData +from dcicutils.portal_utils import Portal from snovault.authentication import ( generate_password as generate_access_key_secret, generate_user as generate_access_key @@ -137,16 +138,16 @@ def main() -> None: # multiauth.policy.auth0.namespace = auth0 # multiauth.policy.auth0.base = encoded.authentication.Auth0AuthenticationPolicy with captured_output(not args.debug): - app = create_testapp(args.ini) + portal = Portal(args.ini) else: - app = None + portal = None if args.list: - _print_all_access_keys(app, args.verbose) + _print_all_access_keys(portal, args.verbose) return print(f"Creating a new local portal access-key for {args.app} ... ", end="") - access_key_user_uuid = _generate_user_uuid(args.user, app) + access_key_user_uuid = _generate_user_uuid(args.user, portal) access_key_id, access_key_secret, access_key_secret_hash = _generate_access_key(args.ini) access_key_inserts_file_item = _generate_access_key_inserts_item(access_key_id, access_key_secret_hash, access_key_user_uuid) access_keys_file_item = _generate_access_keys_file_item(access_key_id, access_key_secret, args.port) @@ -173,16 +174,16 @@ def main() -> None: _exit_without_action(f"Portal must be running locally ({_get_local_portal_url(args.port)}) to do an insert.") print(f"Writing new local portal access-key to locally running portal database ... ", end="") with captured_output(not args.debug): - _load_data(app, access_key_inserts_file_item, data_type="access_key") + _load_data(portal, access_key_inserts_file_item, data_type="access_key") print("Done.") if not args.update_database or args.verbose: print(f"New local portal access-key insert record suitable for: {_INSERTS_DIR}/access_key.json ...") print(json.dumps(access_key_inserts_file_item, indent=4)) -def _generate_user_uuid(user: Optional[str], app: TestApp = None) -> str: +def _generate_user_uuid(user: Optional[str], portal: Optional[Portal] = None) -> str: if not user: - if app: + if portal: _exit_without_action(f"The --user option must specify a UUID or email in {_USER_INSERTS_FILE}") return "" user_uuid = None @@ -195,8 +196,8 @@ def _generate_user_uuid(user: Optional[str], app: TestApp = None) -> str: _exit_without_action(f"The given user ({user}) was not found as an email" f" in: {_USER_INSERTS_FILE}; and it is not a UUID.") user_uuid = user_uuid_from_inserts[0]["uuid"] - if user_uuid and app: - user = app.get_with_follow(f"/{user_uuid}", raise_exception=False) + if user_uuid and portal: + user = portal.get(f"/{user_uuid}", raise_exception=False) if not user or user.status_code != 200: _exit_without_action(f"The given user ({user_uuid}) was not found in the locally running portal database.") return user_uuid @@ -280,7 +281,7 @@ def _get_local_portal_url(port: int) -> None: return f"http://localhost:{port}" -def _load_data(app: TestApp, data: AnyJsonData, data_type: str) -> bool: +def _load_data(portal: Portal, data: AnyJsonData, data_type: str) -> bool: if isinstance(data, dict): data = [data] elif not isinstance(data, list): @@ -288,13 +289,13 @@ def _load_data(app: TestApp, data: AnyJsonData, data_type: str) -> bool: if not data_type: return False data = {data_type: data} - load_all(app, inserts=data, docsdir=None, overwrite=True, itype=[data_type], from_json=True) + load_all(portal.vapp, inserts=data, docsdir=None, overwrite=True, itype=[data_type], from_json=True) return True -def _print_all_access_keys(app: TestApp, verbose: bool = False) -> None: +def _print_all_access_keys(portal: Portal, verbose: bool = False) -> None: print("All access-keys defined for locally running portal:") - for item in _get_all_access_keys(app): + for item in _get_all_access_keys(portal): print(f"{item.id}", end="") if item.created: print(f" | Created: {item.created}", end="") @@ -305,11 +306,11 @@ def _print_all_access_keys(app: TestApp, verbose: bool = False) -> None: print() -def _get_all_access_keys(app: TestApp) -> list: +def _get_all_access_keys(portal: Portal) -> list: response = [] try: AccessKey = namedtuple("AccessKey", ["id", "uuid", "created", "expires"]) - for access_key in app.get_with_follow(f"/access-keys").json["@graph"]: + for access_key in portal.get(f"/access-keys").json()["@graph"]: response.append(AccessKey( id=access_key.get("access_key_id"), uuid=access_key.get("uuid"), diff --git a/snovault/commands/view_local_object.py b/snovault/commands/view_local_object.py index e1636294e..b909ceea0 100644 --- a/snovault/commands/view_local_object.py +++ b/snovault/commands/view_local_object.py @@ -86,6 +86,7 @@ from typing import Optional import yaml from dcicutils.misc_utils import get_error_message +from dcicutils.portal_utils import Portal from snovault.loadxl import create_testapp from snovault.commands.captured_output import captured_output, uncaptured_output @@ -119,12 +120,12 @@ def _get_local_object(uuid: str, ini: str = _DEFAULT_INI_FILE, verbose: bool = F response = None try: with captured_output(not debug): - app = create_testapp(ini) + portal = Portal(ini) if not uuid.startswith("/"): path = f"/{uuid}" else: path = uuid - response = app.get_with_follow(path) + response = portal.get(path) except Exception as e: if "404" in str(e) and "not found" in str(e).lower(): if verbose: @@ -141,7 +142,7 @@ def _get_local_object(uuid: str, ini: str = _DEFAULT_INI_FILE, verbose: bool = F _exit_without_action(f"Invalid JSON getting object {uuid}).") if verbose: _print("OK") - return response.json + return response.json() def _print(*args, **kwargs): From 18f369b224dbd2128c094f98c4b7edbe8ec5f1f7 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Wed, 13 Dec 2023 10:13:14 -0500 Subject: [PATCH 04/20] version update --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 97cab571a..24fbc9567 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dcicsnovault" -version = "11.6.0.1b2" # TODO: To become 11.7.0 +version = "11.6.0.1b3" # TODO: To become 11.7.0 description = "Storage support for 4DN Data Portals." authors = ["4DN-DCIC Team "] license = "MIT" From 2f0687e4386987776dbc35d384e5eb816fa4a377 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Wed, 13 Dec 2023 11:41:31 -0500 Subject: [PATCH 05/20] update dcicutils to 8.5.0.1b3 --- poetry.lock | 8 ++++---- pyproject.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index 2116c0bcd..8ff501684 100644 --- a/poetry.lock +++ b/poetry.lock @@ -862,13 +862,13 @@ test-randomorder = ["pytest-randomly"] [[package]] name = "dcicutils" -version = "8.5.0.1b2" +version = "8.5.0.1b3" description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources" optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "dcicutils-8.5.0.1b2-py3-none-any.whl", hash = "sha256:c814235442f0f2abc53344703dfce5d6c3e1b1dfdf25f05901ab576572363ceb"}, - {file = "dcicutils-8.5.0.1b2.tar.gz", hash = "sha256:b72a57ebc3d11a06ca787f8ad814277847d85969d00d7eb994c19c6573b073de"}, + {file = "dcicutils-8.5.0.1b3-py3-none-any.whl", hash = "sha256:1d4dd6b332ec929fafa51baa5f5dac800867ae5aa8eb2499d9787f87594b906c"}, + {file = "dcicutils-8.5.0.1b3.tar.gz", hash = "sha256:893a11ec78c430974adb828eb407b84734cb75bca4d32595438dc0e08a29d6c4"}, ] [package.dependencies] @@ -3272,4 +3272,4 @@ test = ["zope.testing"] [metadata] lock-version = "2.0" python-versions = ">=3.8.1,<3.12" -content-hash = "e657b46f7c9d475b8bcfefb1f406d1fcc6e4269e48a18ed65f75718584a3f90f" +content-hash = "e5ef9b66700e804a0b8f9a5d39f658d90e835a8b787c35bedc3addcdc513add1" diff --git a/pyproject.toml b/pyproject.toml index 24fbc9567..3b7306f26 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dcicsnovault" -version = "11.6.0.1b3" # TODO: To become 11.7.0 +version = "11.6.0.1b4" # TODO: To become 11.7.0 description = "Storage support for 4DN Data Portals." authors = ["4DN-DCIC Team "] license = "MIT" @@ -43,7 +43,7 @@ boto3 = ">=1.28.62" # no particular version required, but this speeds up search botocore = ">=1.31.62" # no particular version required, but this speeds up search elasticsearch = "7.13.4" # versions >= 7.14.0 lock out AWS ES elasticsearch_dsl = "^7.4.0" -dcicutils = "^8.5.0.1b2" +dcicutils = "^8.5.0.1b3" future = ">=0.15.2,<1" html5lib = ">=1.1" # experimental, should be OK now that we're not using moto server humanfriendly = "^1.44.9" From 6fa422f0024934a7f7c24543c23bd9ab87e9fc5a Mon Sep 17 00:00:00 2001 From: David Michaels Date: Wed, 13 Dec 2023 11:44:18 -0500 Subject: [PATCH 06/20] flake8 fixes --- snovault/commands/generate_local_access_key.py | 3 +-- snovault/commands/view_local_object.py | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/snovault/commands/generate_local_access_key.py b/snovault/commands/generate_local_access_key.py index ced648b84..e915764f4 100644 --- a/snovault/commands/generate_local_access_key.py +++ b/snovault/commands/generate_local_access_key.py @@ -71,7 +71,6 @@ import requests from typing import Optional, Tuple import uuid -from webtest import TestApp from dcicutils.common import AnyJsonData from dcicutils.portal_utils import Portal from snovault.authentication import ( @@ -79,7 +78,7 @@ generate_user as generate_access_key ) from snovault.edw_hash import EDWHash -from snovault.loadxl import create_testapp, load_all +from snovault.loadxl import load_all from ..project_app import app_project from .captured_output import captured_output diff --git a/snovault/commands/view_local_object.py b/snovault/commands/view_local_object.py index b909ceea0..0a15c2998 100644 --- a/snovault/commands/view_local_object.py +++ b/snovault/commands/view_local_object.py @@ -87,7 +87,6 @@ import yaml from dcicutils.misc_utils import get_error_message from dcicutils.portal_utils import Portal -from snovault.loadxl import create_testapp from snovault.commands.captured_output import captured_output, uncaptured_output From 8e3a3794448d510cd5c01a8a8c60c0b6bbe0f11e Mon Sep 17 00:00:00 2001 From: David Michaels Date: Wed, 13 Dec 2023 23:04:52 -0500 Subject: [PATCH 07/20] generalize view_local_object script. --- snovault/commands/view_local_object.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/snovault/commands/view_local_object.py b/snovault/commands/view_local_object.py index 0a15c2998..04c8a35b3 100644 --- a/snovault/commands/view_local_object.py +++ b/snovault/commands/view_local_object.py @@ -98,14 +98,16 @@ def main(): parser = argparse.ArgumentParser(description="Create local portal access-key for dev/testing purposes.") parser.add_argument("uuid", type=str, help=f"The uuid (or path) of the object to fetch and view. ") - parser.add_argument("--ini", type=str, required=False, default=_DEFAULT_INI_FILE, + parser.add_argument("--ini", type=str, required=False, default=None, help=f"Name of the application .ini file; default is: {_DEFAULT_INI_FILE}") + parser.add_argument("--env", type=str, required=False, default=None, + help=f"Environment name (key from ~/.smaht-keys.json).") parser.add_argument("--yaml", action="store_true", required=False, default=False, help="YAML output.") parser.add_argument("--verbose", action="store_true", required=False, default=False, help="Verbose output.") parser.add_argument("--debug", action="store_true", required=False, default=False, help="Debugging output.") args = parser.parse_args() - data = _get_local_object(uuid=args.uuid, ini=args.ini, verbose=args.verbose, debug=args.debug) + data = _get_local_object(uuid=args.uuid, ini=args.ini, env=args.env, verbose=args.verbose, debug=args.debug) if args.yaml: _print(yaml.dump(data)) @@ -113,13 +115,13 @@ def main(): _print(json.dumps(data, default=str, indent=4)) -def _get_local_object(uuid: str, ini: str = _DEFAULT_INI_FILE, verbose: bool = False, debug: bool = False) -> dict: +def _get_local_object(uuid: str, ini: str = _DEFAULT_INI_FILE, env: Optional[str] = None, verbose: bool = False, debug: bool = False) -> dict: if verbose: _print(f"Getting object ({uuid}) from local portal ... ", end="") response = None try: with captured_output(not debug): - portal = Portal(ini) + portal = Portal(ini or env) if not uuid.startswith("/"): path = f"/{uuid}" else: From f809ce9fd56f9e42c1ee2fa3d28e98ab16e46e59 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Thu, 14 Dec 2023 10:31:39 -0500 Subject: [PATCH 08/20] update dcicutils to 8.5.0.1b4 --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 3b7306f26..88118b830 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dcicsnovault" -version = "11.6.0.1b4" # TODO: To become 11.7.0 +version = "11.6.0.1b5" # TODO: To become 11.7.0 description = "Storage support for 4DN Data Portals." authors = ["4DN-DCIC Team "] license = "MIT" @@ -43,7 +43,7 @@ boto3 = ">=1.28.62" # no particular version required, but this speeds up search botocore = ">=1.31.62" # no particular version required, but this speeds up search elasticsearch = "7.13.4" # versions >= 7.14.0 lock out AWS ES elasticsearch_dsl = "^7.4.0" -dcicutils = "^8.5.0.1b3" +dcicutils = "^8.5.0.1b4" future = ">=0.15.2,<1" html5lib = ">=1.1" # experimental, should be OK now that we're not using moto server humanfriendly = "^1.44.9" From 392794cc8119a3a1a007eab6b8d5f7496c08c097 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Thu, 14 Dec 2023 10:33:05 -0500 Subject: [PATCH 09/20] update dcicutils to 8.5.0.1b4 --- poetry.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/poetry.lock b/poetry.lock index 8ff501684..2c08175b8 100644 --- a/poetry.lock +++ b/poetry.lock @@ -862,13 +862,13 @@ test-randomorder = ["pytest-randomly"] [[package]] name = "dcicutils" -version = "8.5.0.1b3" +version = "8.5.0.1b4" description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources" optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "dcicutils-8.5.0.1b3-py3-none-any.whl", hash = "sha256:1d4dd6b332ec929fafa51baa5f5dac800867ae5aa8eb2499d9787f87594b906c"}, - {file = "dcicutils-8.5.0.1b3.tar.gz", hash = "sha256:893a11ec78c430974adb828eb407b84734cb75bca4d32595438dc0e08a29d6c4"}, + {file = "dcicutils-8.5.0.1b4-py3-none-any.whl", hash = "sha256:66ca90bfc1303d632f2340013fb651ca025064177cd3feb759c701d9dade4ca7"}, + {file = "dcicutils-8.5.0.1b4.tar.gz", hash = "sha256:cf57c159041dd29d25fa8a12956a7d058349bca12737a43f5ec725a8d13b2ae9"}, ] [package.dependencies] @@ -3272,4 +3272,4 @@ test = ["zope.testing"] [metadata] lock-version = "2.0" python-versions = ">=3.8.1,<3.12" -content-hash = "e5ef9b66700e804a0b8f9a5d39f658d90e835a8b787c35bedc3addcdc513add1" +content-hash = "c29f27fcfd2a79551354c6658fa5f2816aa46fbf0f1e995f534130f79e7d54db" From 126a19c80336b4b12c88f6c9e9aaa32df857bd48 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Fri, 15 Dec 2023 15:38:46 -0500 Subject: [PATCH 10/20] minor update to view-local-object script --- snovault/commands/view_local_object.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snovault/commands/view_local_object.py b/snovault/commands/view_local_object.py index 04c8a35b3..89a365895 100644 --- a/snovault/commands/view_local_object.py +++ b/snovault/commands/view_local_object.py @@ -121,7 +121,7 @@ def _get_local_object(uuid: str, ini: str = _DEFAULT_INI_FILE, env: Optional[str response = None try: with captured_output(not debug): - portal = Portal(ini or env) + portal = Portal(ini or env or _DEFAULT_INI_FILE) if not uuid.startswith("/"): path = f"/{uuid}" else: From c7f67f9ac18260dda115ceb298495e07ca9995ee Mon Sep 17 00:00:00 2001 From: David Michaels Date: Mon, 18 Dec 2023 16:05:02 -0500 Subject: [PATCH 11/20] update dcicutils to 8.5.0.1b6 --- poetry.lock | 8 ++++---- pyproject.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index 2c08175b8..7f0608f51 100644 --- a/poetry.lock +++ b/poetry.lock @@ -862,13 +862,13 @@ test-randomorder = ["pytest-randomly"] [[package]] name = "dcicutils" -version = "8.5.0.1b4" +version = "8.5.0.1b6" description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources" optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "dcicutils-8.5.0.1b4-py3-none-any.whl", hash = "sha256:66ca90bfc1303d632f2340013fb651ca025064177cd3feb759c701d9dade4ca7"}, - {file = "dcicutils-8.5.0.1b4.tar.gz", hash = "sha256:cf57c159041dd29d25fa8a12956a7d058349bca12737a43f5ec725a8d13b2ae9"}, + {file = "dcicutils-8.5.0.1b6-py3-none-any.whl", hash = "sha256:8ec1544c35281371e398e5196eee8d58dc57b9f38fb977498429d93a7e26e7f6"}, + {file = "dcicutils-8.5.0.1b6.tar.gz", hash = "sha256:27e87a3e86da05787fe025ee4f51a250dcc9d7821e4688b64eed4db2284fa488"}, ] [package.dependencies] @@ -3272,4 +3272,4 @@ test = ["zope.testing"] [metadata] lock-version = "2.0" python-versions = ">=3.8.1,<3.12" -content-hash = "c29f27fcfd2a79551354c6658fa5f2816aa46fbf0f1e995f534130f79e7d54db" +content-hash = "52b85d219813b9ac23913fc4924962b13a1d1c99ea030f87a6c4bd14f4536c9b" diff --git a/pyproject.toml b/pyproject.toml index 88118b830..e6f1ebdcc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dcicsnovault" -version = "11.6.0.1b5" # TODO: To become 11.7.0 +version = "11.6.0.1b6" # TODO: To become 11.7.0 description = "Storage support for 4DN Data Portals." authors = ["4DN-DCIC Team "] license = "MIT" @@ -43,7 +43,7 @@ boto3 = ">=1.28.62" # no particular version required, but this speeds up search botocore = ">=1.31.62" # no particular version required, but this speeds up search elasticsearch = "7.13.4" # versions >= 7.14.0 lock out AWS ES elasticsearch_dsl = "^7.4.0" -dcicutils = "^8.5.0.1b4" +dcicutils = "^8.5.0.1b6" future = ">=0.15.2,<1" html5lib = ">=1.1" # experimental, should be OK now that we're not using moto server humanfriendly = "^1.44.9" From d51c63f4f1c6a745e3e031812d5c7e0eea046af4 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Tue, 19 Dec 2023 10:02:24 -0500 Subject: [PATCH 12/20] update dcicutils to 8.5.0.1b7 --- poetry.lock | 8 ++++---- pyproject.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index 7f0608f51..986c2e5e5 100644 --- a/poetry.lock +++ b/poetry.lock @@ -862,13 +862,13 @@ test-randomorder = ["pytest-randomly"] [[package]] name = "dcicutils" -version = "8.5.0.1b6" +version = "8.5.0.1b7" description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources" optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "dcicutils-8.5.0.1b6-py3-none-any.whl", hash = "sha256:8ec1544c35281371e398e5196eee8d58dc57b9f38fb977498429d93a7e26e7f6"}, - {file = "dcicutils-8.5.0.1b6.tar.gz", hash = "sha256:27e87a3e86da05787fe025ee4f51a250dcc9d7821e4688b64eed4db2284fa488"}, + {file = "dcicutils-8.5.0.1b7-py3-none-any.whl", hash = "sha256:0ce7ec190dd12b876a0db1efdfe293776748e2cf3dec6ec870421449fe6fd472"}, + {file = "dcicutils-8.5.0.1b7.tar.gz", hash = "sha256:90285959c22485b178c68515808781cf6b73e8248d645e30aa37314f19d9a24e"}, ] [package.dependencies] @@ -3272,4 +3272,4 @@ test = ["zope.testing"] [metadata] lock-version = "2.0" python-versions = ">=3.8.1,<3.12" -content-hash = "52b85d219813b9ac23913fc4924962b13a1d1c99ea030f87a6c4bd14f4536c9b" +content-hash = "33a2f5f38e37bd33ab11f0c539ed65ff85c2b5d527da20fb1d0841c76560fa5d" diff --git a/pyproject.toml b/pyproject.toml index e6f1ebdcc..2d46ae2fd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dcicsnovault" -version = "11.6.0.1b6" # TODO: To become 11.7.0 +version = "11.6.0.1b7" # TODO: To become 11.7.0 description = "Storage support for 4DN Data Portals." authors = ["4DN-DCIC Team "] license = "MIT" @@ -43,7 +43,7 @@ boto3 = ">=1.28.62" # no particular version required, but this speeds up search botocore = ">=1.31.62" # no particular version required, but this speeds up search elasticsearch = "7.13.4" # versions >= 7.14.0 lock out AWS ES elasticsearch_dsl = "^7.4.0" -dcicutils = "^8.5.0.1b6" +dcicutils = "8.5.0.1b7" future = ">=0.15.2,<1" html5lib = ">=1.1" # experimental, should be OK now that we're not using moto server humanfriendly = "^1.44.9" From f0a64ddbb7ec4a6d63655cb8526112784b0c3546 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Tue, 19 Dec 2023 10:57:47 -0500 Subject: [PATCH 13/20] versions --- poetry.lock | 8 ++++---- pyproject.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index 986c2e5e5..ab47bffe1 100644 --- a/poetry.lock +++ b/poetry.lock @@ -862,13 +862,13 @@ test-randomorder = ["pytest-randomly"] [[package]] name = "dcicutils" -version = "8.5.0.1b7" +version = "8.5.0.1b9" description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources" optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "dcicutils-8.5.0.1b7-py3-none-any.whl", hash = "sha256:0ce7ec190dd12b876a0db1efdfe293776748e2cf3dec6ec870421449fe6fd472"}, - {file = "dcicutils-8.5.0.1b7.tar.gz", hash = "sha256:90285959c22485b178c68515808781cf6b73e8248d645e30aa37314f19d9a24e"}, + {file = "dcicutils-8.5.0.1b9-py3-none-any.whl", hash = "sha256:be7bfc75d08fbc892d6ddbdab7a5ac4c24e87900db8093976e9471f0e48bc63f"}, + {file = "dcicutils-8.5.0.1b9.tar.gz", hash = "sha256:c5f0fc62974d13def409163f123338b2ba68365169b1888acea5539a193c8305"}, ] [package.dependencies] @@ -3272,4 +3272,4 @@ test = ["zope.testing"] [metadata] lock-version = "2.0" python-versions = ">=3.8.1,<3.12" -content-hash = "33a2f5f38e37bd33ab11f0c539ed65ff85c2b5d527da20fb1d0841c76560fa5d" +content-hash = "2fc59e194589d3fac65347ccb9ea6785cf020083266a288f26638b124884a8f9" diff --git a/pyproject.toml b/pyproject.toml index 2d46ae2fd..22d3d0452 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dcicsnovault" -version = "11.6.0.1b7" # TODO: To become 11.7.0 +version = "11.6.0.1b9" # TODO: To become 11.7.0 description = "Storage support for 4DN Data Portals." authors = ["4DN-DCIC Team "] license = "MIT" @@ -43,7 +43,7 @@ boto3 = ">=1.28.62" # no particular version required, but this speeds up search botocore = ">=1.31.62" # no particular version required, but this speeds up search elasticsearch = "7.13.4" # versions >= 7.14.0 lock out AWS ES elasticsearch_dsl = "^7.4.0" -dcicutils = "8.5.0.1b7" +dcicutils = "8.5.0.1b9" future = ">=0.15.2,<1" html5lib = ">=1.1" # experimental, should be OK now that we're not using moto server humanfriendly = "^1.44.9" From 78919b5ed7907a6d37cfe70b932635fa94c696aa Mon Sep 17 00:00:00 2001 From: David Michaels Date: Tue, 19 Dec 2023 15:26:44 -0500 Subject: [PATCH 14/20] dcicutils to 8.5.0.1b10 --- poetry.lock | 8 ++++---- pyproject.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index ab47bffe1..21b81c2fd 100644 --- a/poetry.lock +++ b/poetry.lock @@ -862,13 +862,13 @@ test-randomorder = ["pytest-randomly"] [[package]] name = "dcicutils" -version = "8.5.0.1b9" +version = "8.5.0.1b10" description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources" optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "dcicutils-8.5.0.1b9-py3-none-any.whl", hash = "sha256:be7bfc75d08fbc892d6ddbdab7a5ac4c24e87900db8093976e9471f0e48bc63f"}, - {file = "dcicutils-8.5.0.1b9.tar.gz", hash = "sha256:c5f0fc62974d13def409163f123338b2ba68365169b1888acea5539a193c8305"}, + {file = "dcicutils-8.5.0.1b10-py3-none-any.whl", hash = "sha256:59634e474899629f2982acc2e06746b0311c58bb74e327ad647dce45ed2f0a1d"}, + {file = "dcicutils-8.5.0.1b10.tar.gz", hash = "sha256:b1b909709398725154972ecc8d85169c3fa517c9a34ace4302eb8f6b337be593"}, ] [package.dependencies] @@ -3272,4 +3272,4 @@ test = ["zope.testing"] [metadata] lock-version = "2.0" python-versions = ">=3.8.1,<3.12" -content-hash = "2fc59e194589d3fac65347ccb9ea6785cf020083266a288f26638b124884a8f9" +content-hash = "46add5d0318f6f471c4a23da149490328de9082109df25d7daf19bfd0cbb1c93" diff --git a/pyproject.toml b/pyproject.toml index 22d3d0452..49a7c43ee 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dcicsnovault" -version = "11.6.0.1b9" # TODO: To become 11.7.0 +version = "11.6.0.1b10" # TODO: To become 11.7.0 description = "Storage support for 4DN Data Portals." authors = ["4DN-DCIC Team "] license = "MIT" @@ -43,7 +43,7 @@ boto3 = ">=1.28.62" # no particular version required, but this speeds up search botocore = ">=1.31.62" # no particular version required, but this speeds up search elasticsearch = "7.13.4" # versions >= 7.14.0 lock out AWS ES elasticsearch_dsl = "^7.4.0" -dcicutils = "8.5.0.1b9" +dcicutils = "8.5.0.1b10" future = ">=0.15.2,<1" html5lib = ">=1.1" # experimental, should be OK now that we're not using moto server humanfriendly = "^1.44.9" From 9d91d57a8551aa15d60d40f18ef852f49dc54058 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Wed, 20 Dec 2023 06:27:53 -0500 Subject: [PATCH 15/20] minor refactor of view-local-object script --- snovault/commands/view_local_object.py | 27 +++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/snovault/commands/view_local_object.py b/snovault/commands/view_local_object.py index 89a365895..25eb097c4 100644 --- a/snovault/commands/view_local_object.py +++ b/snovault/commands/view_local_object.py @@ -102,12 +102,17 @@ def main(): help=f"Name of the application .ini file; default is: {_DEFAULT_INI_FILE}") parser.add_argument("--env", type=str, required=False, default=None, help=f"Environment name (key from ~/.smaht-keys.json).") + parser.add_argument("--server", type=str, required=False, default=None, + help=f"Environment server name (server from key in ~/.smaht-keys.json).") + parser.add_argument("--app", type=str, required=False, default=None, + help=f"Application name (one of: smaht, cgap, fourfront).") parser.add_argument("--yaml", action="store_true", required=False, default=False, help="YAML output.") parser.add_argument("--verbose", action="store_true", required=False, default=False, help="Verbose output.") parser.add_argument("--debug", action="store_true", required=False, default=False, help="Debugging output.") args = parser.parse_args() - data = _get_local_object(uuid=args.uuid, ini=args.ini, env=args.env, verbose=args.verbose, debug=args.debug) + portal = _create_portal(ini=args.ini, env=args.env, server=args.server, app=args.app, debug=args.debug) + data = _get_local_object(portal=portal, uuid=args.uuid, verbose=args.verbose) if args.yaml: _print(yaml.dump(data)) @@ -115,18 +120,22 @@ def main(): _print(json.dumps(data, default=str, indent=4)) -def _get_local_object(uuid: str, ini: str = _DEFAULT_INI_FILE, env: Optional[str] = None, verbose: bool = False, debug: bool = False) -> dict: +def _create_portal(ini: str = _DEFAULT_INI_FILE, env: Optional[str] = None, + server: Optional[str] = None, app: Optional[str] = None, debug: bool = False) -> dict: + with captured_output(not debug): + return Portal(env, server=server, app=app) if env or app else Portal(ini or _DEFAULT_INI_FILE) + + +def _get_local_object(portal: Portal, uuid: str, verbose: bool = False) -> dict: if verbose: _print(f"Getting object ({uuid}) from local portal ... ", end="") response = None try: - with captured_output(not debug): - portal = Portal(ini or env or _DEFAULT_INI_FILE) - if not uuid.startswith("/"): - path = f"/{uuid}" - else: - path = uuid - response = portal.get(path) + if not uuid.startswith("/"): + path = f"/{uuid}" + else: + path = uuid + response = portal.get(path) except Exception as e: if "404" in str(e) and "not found" in str(e).lower(): if verbose: From a8220ed6d372c09fe1c5dfc2355d9b89f8c9e1c6 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Sat, 23 Dec 2023 15:52:43 -0500 Subject: [PATCH 16/20] update dcicutils to 8.5.0.1b11 --- poetry.lock | 8 ++++---- pyproject.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index 21b81c2fd..2a46a5daa 100644 --- a/poetry.lock +++ b/poetry.lock @@ -862,13 +862,13 @@ test-randomorder = ["pytest-randomly"] [[package]] name = "dcicutils" -version = "8.5.0.1b10" +version = "8.5.0.1b11" description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources" optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "dcicutils-8.5.0.1b10-py3-none-any.whl", hash = "sha256:59634e474899629f2982acc2e06746b0311c58bb74e327ad647dce45ed2f0a1d"}, - {file = "dcicutils-8.5.0.1b10.tar.gz", hash = "sha256:b1b909709398725154972ecc8d85169c3fa517c9a34ace4302eb8f6b337be593"}, + {file = "dcicutils-8.5.0.1b11-py3-none-any.whl", hash = "sha256:223782564adc3b57e45249d64ccc916642955b836c86cdc1b11bfae7812c276f"}, + {file = "dcicutils-8.5.0.1b11.tar.gz", hash = "sha256:c4296419eb4ba89d4056533ee54619bc899c69bb2eb6aaed22420f892d3fd61e"}, ] [package.dependencies] @@ -3272,4 +3272,4 @@ test = ["zope.testing"] [metadata] lock-version = "2.0" python-versions = ">=3.8.1,<3.12" -content-hash = "46add5d0318f6f471c4a23da149490328de9082109df25d7daf19bfd0cbb1c93" +content-hash = "fe5771c312c42a547e99852e9fcaa914a75427d48de31c678586322b7cd57aac" diff --git a/pyproject.toml b/pyproject.toml index 49a7c43ee..c79eb1bb5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dcicsnovault" -version = "11.6.0.1b10" # TODO: To become 11.7.0 +version = "11.6.0.1b11" # TODO: To become 11.7.0 description = "Storage support for 4DN Data Portals." authors = ["4DN-DCIC Team "] license = "MIT" @@ -43,7 +43,7 @@ boto3 = ">=1.28.62" # no particular version required, but this speeds up search botocore = ">=1.31.62" # no particular version required, but this speeds up search elasticsearch = "7.13.4" # versions >= 7.14.0 lock out AWS ES elasticsearch_dsl = "^7.4.0" -dcicutils = "8.5.0.1b10" +dcicutils = "8.5.0.1b11" future = ">=0.15.2,<1" html5lib = ">=1.1" # experimental, should be OK now that we're not using moto server humanfriendly = "^1.44.9" From a563ef8927a2f3031b3652d8bccea830bc4d97a6 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Tue, 2 Jan 2024 09:11:32 -0500 Subject: [PATCH 17/20] update dcicutils to 8.5.0.1b13 --- poetry.lock | 8 ++++---- pyproject.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index 2a46a5daa..f815f483c 100644 --- a/poetry.lock +++ b/poetry.lock @@ -862,13 +862,13 @@ test-randomorder = ["pytest-randomly"] [[package]] name = "dcicutils" -version = "8.5.0.1b11" +version = "8.5.0.1b13" description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources" optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "dcicutils-8.5.0.1b11-py3-none-any.whl", hash = "sha256:223782564adc3b57e45249d64ccc916642955b836c86cdc1b11bfae7812c276f"}, - {file = "dcicutils-8.5.0.1b11.tar.gz", hash = "sha256:c4296419eb4ba89d4056533ee54619bc899c69bb2eb6aaed22420f892d3fd61e"}, + {file = "dcicutils-8.5.0.1b13-py3-none-any.whl", hash = "sha256:818534702d583081630e2e1c32151bc91e76d1a3b738f26f57804cbba873a4d4"}, + {file = "dcicutils-8.5.0.1b13.tar.gz", hash = "sha256:1521bcbbe62a7d4c582936ae04681abe3af3c2bfcc22177d090b3b5281cc26f2"}, ] [package.dependencies] @@ -3272,4 +3272,4 @@ test = ["zope.testing"] [metadata] lock-version = "2.0" python-versions = ">=3.8.1,<3.12" -content-hash = "fe5771c312c42a547e99852e9fcaa914a75427d48de31c678586322b7cd57aac" +content-hash = "82cdb48024d30c141e6f963accd93c2863d7804e0a7b9b884ab204c7039dcf16" diff --git a/pyproject.toml b/pyproject.toml index c79eb1bb5..a46c114f2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dcicsnovault" -version = "11.6.0.1b11" # TODO: To become 11.7.0 +version = "11.6.0.1b13" # TODO: To become 11.7.0 description = "Storage support for 4DN Data Portals." authors = ["4DN-DCIC Team "] license = "MIT" @@ -43,7 +43,7 @@ boto3 = ">=1.28.62" # no particular version required, but this speeds up search botocore = ">=1.31.62" # no particular version required, but this speeds up search elasticsearch = "7.13.4" # versions >= 7.14.0 lock out AWS ES elasticsearch_dsl = "^7.4.0" -dcicutils = "8.5.0.1b11" +dcicutils = "8.5.0.1b13" future = ">=0.15.2,<1" html5lib = ">=1.1" # experimental, should be OK now that we're not using moto server humanfriendly = "^1.44.9" From 4a7d674174838ca52bf78ea7b31404ce568e1a3d Mon Sep 17 00:00:00 2001 From: David Michaels Date: Tue, 2 Jan 2024 11:32:07 -0500 Subject: [PATCH 18/20] update dcicutils to 8.6.0 and version to 11.7.0 - ready to merge --- poetry.lock | 8 ++++---- pyproject.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index f815f483c..7f8856884 100644 --- a/poetry.lock +++ b/poetry.lock @@ -862,13 +862,13 @@ test-randomorder = ["pytest-randomly"] [[package]] name = "dcicutils" -version = "8.5.0.1b13" +version = "8.6.0" description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources" optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "dcicutils-8.5.0.1b13-py3-none-any.whl", hash = "sha256:818534702d583081630e2e1c32151bc91e76d1a3b738f26f57804cbba873a4d4"}, - {file = "dcicutils-8.5.0.1b13.tar.gz", hash = "sha256:1521bcbbe62a7d4c582936ae04681abe3af3c2bfcc22177d090b3b5281cc26f2"}, + {file = "dcicutils-8.6.0-py3-none-any.whl", hash = "sha256:19579f68bf1bcee72f864597cbc0bde281c38031bb083a0c364c290a1ecbccc9"}, + {file = "dcicutils-8.6.0.tar.gz", hash = "sha256:e0aa6a726df73432e244a92f3fb157b11f394b0f2ddbd3081fc0308cdde0702b"}, ] [package.dependencies] @@ -3272,4 +3272,4 @@ test = ["zope.testing"] [metadata] lock-version = "2.0" python-versions = ">=3.8.1,<3.12" -content-hash = "82cdb48024d30c141e6f963accd93c2863d7804e0a7b9b884ab204c7039dcf16" +content-hash = "d4071061d942c3d48f2b2bd9f5bdb027c990aeebbb32741e3d87c7e405a64486" diff --git a/pyproject.toml b/pyproject.toml index a46c114f2..4f0c9f2e0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dcicsnovault" -version = "11.6.0.1b13" # TODO: To become 11.7.0 +version = "11.7.0" description = "Storage support for 4DN Data Portals." authors = ["4DN-DCIC Team "] license = "MIT" @@ -43,7 +43,7 @@ boto3 = ">=1.28.62" # no particular version required, but this speeds up search botocore = ">=1.31.62" # no particular version required, but this speeds up search elasticsearch = "7.13.4" # versions >= 7.14.0 lock out AWS ES elasticsearch_dsl = "^7.4.0" -dcicutils = "8.5.0.1b13" +dcicutils = "8.6.0" future = ">=0.15.2,<1" html5lib = ">=1.1" # experimental, should be OK now that we're not using moto server humanfriendly = "^1.44.9" From 92b883f9d86eb28105831c829c763f8009d6642e Mon Sep 17 00:00:00 2001 From: David Michaels Date: Tue, 2 Jan 2024 12:23:30 -0500 Subject: [PATCH 19/20] changed dcicutils from 8.6.0 to ^8.6.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4f0c9f2e0..a04e88258 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,7 +43,7 @@ boto3 = ">=1.28.62" # no particular version required, but this speeds up search botocore = ">=1.31.62" # no particular version required, but this speeds up search elasticsearch = "7.13.4" # versions >= 7.14.0 lock out AWS ES elasticsearch_dsl = "^7.4.0" -dcicutils = "8.6.0" +dcicutils = "^8.6.0" future = ">=0.15.2,<1" html5lib = ">=1.1" # experimental, should be OK now that we're not using moto server humanfriendly = "^1.44.9" From 9cf61e060c550f71262569095ab51593a519aa7d Mon Sep 17 00:00:00 2001 From: David Michaels Date: Tue, 2 Jan 2024 12:34:45 -0500 Subject: [PATCH 20/20] poetry update dcicutils --- poetry.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/poetry.lock b/poetry.lock index 7f8856884..53dfcb8d3 100644 --- a/poetry.lock +++ b/poetry.lock @@ -3272,4 +3272,4 @@ test = ["zope.testing"] [metadata] lock-version = "2.0" python-versions = ">=3.8.1,<3.12" -content-hash = "d4071061d942c3d48f2b2bd9f5bdb027c990aeebbb32741e3d87c7e405a64486" +content-hash = "133431fae47a95ac6b58649f10699595e1659e87e87d0c6f9c4ddc3c38264216"