Skip to content

Commit

Permalink
cleanup cruft
Browse files Browse the repository at this point in the history
  • Loading branch information
dmichaels-harvard committed Feb 4, 2024
1 parent 16a1df9 commit 1f4599e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions dcicutils/portal_object_utils.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dcicutils/portal_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 1f4599e

Please sign in to comment.