From 1f4599e1a086fd71a8d7f0029e270f2638801f5f Mon Sep 17 00:00:00 2001 From: David Michaels Date: Sun, 4 Feb 2024 09:51:28 -0500 Subject: [PATCH] cleanup cruft --- CHANGELOG.rst | 4 ++-- dcicutils/portal_object_utils.py | 3 --- dcicutils/portal_utils.py | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6b71d0013..fb886824a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,8 +10,8 @@ Change Log 8.7.2 ===== -* Changes to itemize SMaHT submission ingestion create/update/diff situation. -* Changes to structured_data to handle property deletes. +* Changes to itemize SMaHT submission ingestion create/update/diff situation (portal_object_utils). +* Changes to structured_data to handle property deletes (portal_object_utils). 8.7.1 diff --git a/dcicutils/portal_object_utils.py b/dcicutils/portal_object_utils.py index c0aef2bd4..cecc02a03 100644 --- a/dcicutils/portal_object_utils.py +++ b/dcicutils/portal_object_utils.py @@ -1,6 +1,5 @@ from copy import deepcopy from functools import lru_cache -import re from typing import Any, List, Optional, Tuple, Type, Union from dcicutils.data_readers import RowReader from dcicutils.misc_utils import create_readonly_object @@ -147,8 +146,6 @@ def compare(self, value: Union[dict, PortalObject], return {} return PortalObject._compare(this_data, comparing_data) - _ARRAY_KEY_REGULAR_EXPRESSION = re.compile(rf"^({Schema._ARRAY_NAME_SUFFIX_CHAR}\d+)$") - @staticmethod def _compare(a: Any, b: Any, _path: Optional[str] = None) -> dict: def diff_creating(value: Any) -> object: # noqa diff --git a/dcicutils/portal_utils.py b/dcicutils/portal_utils.py index 746680f90..c854de30b 100644 --- a/dcicutils/portal_utils.py +++ b/dcicutils/portal_utils.py @@ -28,7 +28,7 @@ class Portal: """ This is meant to be an Über wrapper for Portal access. It can be created in a variety of ways: 1. From a (Portal) .ini file (e.g. development.ini). - 2. From a key dictionary, containing "key" and "secret" property values. + 2. From a key dictionary, containing "key" and "secret" and (optional) "server" property values. 3. From a key pair tuple, containing (in order) a key and secret values. 4. From a keys .json file residing in ~/.{app}-keys.json where the given "app" value is either "smaht", "cgap", or "fourfront"; where is assumed to contain a dictionary with a key for the given "env" value, e.g. smaht-local;