Merge pull request #80 from rcsb/dev-dwp

V1.27 Update order of CARD resource cache loading
rcsb · Aug 27, 2024 · 96ec0e2 · 96ec0e2
2 parents b890f54 + 4ead5d1
commit 96ec0e2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/HISTORY.txt b/HISTORY.txt
@@ -136,3 +136,4 @@
 25-Jul-2024 - V1.25 Update ligand neighbor calculations and populate them into polymer entity instance features;
                     Remove NeighborInteractionProvider from DictMethodResourceProvider, since will now be calculating interactions on the fly
 20-Aug-2024 - V1.26 Add support for accessing target cofactor data from MongoDB
+27-Aug-2024 - V1.27 Update order of CARD resource cache loading
diff --git a/rcsb/utils/dictionary/DictMethodResourceCacheWorkflow.py b/rcsb/utils/dictionary/DictMethodResourceCacheWorkflow.py
@@ -131,8 +131,8 @@ def syncResourceCache(self):
             "DrugBankTargetCofactorProvider instance",
             "ChEMBLTargetCofactorProvider instance",
             "PharosTargetCofactorProvider instance",
-            "CARDTargetAnnotationProvider instance",
             "CARDTargetOntologyProvider instance",
+            "CARDTargetAnnotationProvider instance",
             "IMGTTargetFeatureProvider instance",
             "SAbDabTargetFeatureProvider instance",
         ]:

diff --git a/rcsb/utils/dictionary/DictMethodResourceProvider.py b/rcsb/utils/dictionary/DictMethodResourceProvider.py
@@ -329,15 +329,15 @@ def __init__(self, cfgOb, **kwargs):
                 "buildable": False,
                 "providerType": "optional",
             },
-            "CARDTargetAnnotationProvider instance": {
-                "class": CARDTargetAnnotationProvider,
+            "CARDTargetOntologyProvider instance": {
+                "class": CARDTargetOntologyProvider,
                 "configArgMap": {},
                 "stashable": True,
                 "buildable": False,
                 "providerType": "optional",
             },
-            "CARDTargetOntologyProvider instance": {
-                "class": CARDTargetOntologyProvider,
+            "CARDTargetAnnotationProvider instance": {
+                "class": CARDTargetAnnotationProvider,
                 "configArgMap": {},
                 "stashable": True,
                 "buildable": False,

diff --git a/rcsb/utils/dictionary/__init__.py b/rcsb/utils/dictionary/__init__.py
@@ -2,4 +2,4 @@
 __author__ = "John Westbrook"
 __email__ = "[email protected]"
 __license__ = "Apache 2.0"
-__version__ = "1.26"
+__version__ = "1.27"
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
 scipy
 numpy
-mmcif >= 0.88.0
+mmcif >= 0.89.0
 rcsb.utils.chemref >= 0.91
 rcsb.utils.citation >= 0.22
 rcsb.utils.config >= 0.40
@@ -10,7 +10,7 @@ rcsb.utils.multiproc >= 0.19
 rcsb.utils.repository >= 0.43
 rcsb.utils.seq >= 0.82
 rcsb.utils.struct >= 0.47
-rcsb.utils.targets >= 0.80
+rcsb.utils.targets >= 0.82
 rcsb.utils.taxonomy >= 0.43
 rcsb.utils.validation >= 0.31
 rcsb.utils.insilico3d >= 0.38