mend

GilbertLabUCSF · Jun 24, 2024 · 6675812 · 6675812
1 parent dcb70b0
commit 6675812
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/CanDI/candi/candi.py b/CanDI/candi/candi.py
@@ -1,6 +1,6 @@
 # Classes for handling data aggregations
 import operator
-from collections import OrderedDict, MutableSequence
+from collections.abc import MutableSequence
 import itertools as it
 import pandas as pd
 import numpy as np

diff --git a/CanDI/candi/data.py b/CanDI/candi/data.py
@@ -28,12 +28,13 @@ def __init__(self, config_path='auto', verbose=False):
         parser.read(config_path)
 
         self._parser = parser
-        #self._verify_install()
+        self._verify_install()
         self._init_sources()
         self._init_depmap_paths()
-        # self._init_index_tables()
+        self._init_index_tables()
 
     def _verify_install(self): #ensures data being loaded is present
+        #TODO: add more checks for different data sources
         try:
             assert "depmap_urls" in self._parser.sections()
         except AssertionError:

diff --git a/CanDI/setup/install.py b/CanDI/setup/install.py
@@ -1,5 +1,5 @@
 import argparse
-from .manager import DataverseDepMap, BroadDepMap
+from manager import DataverseDepMap, BroadDepMap
 
 
 def main():

diff --git a/CanDI/setup/manager.py b/CanDI/setup/manager.py
@@ -39,7 +39,7 @@ def __init__(self, manager_path='auto', cfig_path='auto', verbose=False):
             print(f"Config Path: {cfig_path}")
 
         parser = configparser.ConfigParser()
-        parser.read(cfig_path.replace(".ini", ".draft.ini"))
+        parser.read(cfig_path) #.replace(".ini", ".draft.ini"))
 
         self.manager_path = manager_path
         self.cfig_path = Path(cfig_path)