From 6f1467557973a01eb140a08c1a2d5bd5970c5bb3 Mon Sep 17 00:00:00 2001 From: Tom Gillespie Date: Wed, 11 Jan 2023 02:58:21 -0500 Subject: [PATCH] protcur vbump, switch cli to new ptcdoc.IdNormalization conventions --- protcur/protcur/__init__.py | 2 +- protcur/protcur/cli.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/protcur/protcur/__init__.py b/protcur/protcur/__init__.py index 6820f36..ad3cf1d 100644 --- a/protcur/protcur/__init__.py +++ b/protcur/protcur/__init__.py @@ -1 +1 @@ -__version__ = '0.0.10' +__version__ = '0.0.11' diff --git a/protcur/protcur/cli.py b/protcur/protcur/cli.py index 1dc469a..0e01930 100755 --- a/protcur/protcur/cli.py +++ b/protcur/protcur/cli.py @@ -78,7 +78,8 @@ def _from_cache(self, cache_file, group_id=None, auth=None): # also in sparcur pipelines annos = [ptcdoc.Annotation(a) for a in get_annos()] - idn = ptcdoc.IdNormalization(annos) + pool = ptcdoc.Pool(annos) + idn = ptcdoc.IdNormalization(pool) protc.reset(reset_annos_dict=True) # apparently we have to do this here ?? stale data or something? [protc(a, annos) for a in annos] @@ -90,7 +91,8 @@ def _from_cache(self, cache_file, group_id=None, auth=None): if None in idints: nones = idints.pop(None) - nidn = ptcdoc.IdNormalization(nones) + npool = ptcdoc.Pool(nones) + nidn = ptcdoc.IdNormalization(npool) idints.update(nidn.normalized()) pidints = {k:[protc.byId(a.id) for a in v] for k, v in idints.items()}