Skip to content

Commit 11682b2

Browse files
authored
Merge pull request #260 from OpenTreeOfLife/development
Development
2 parents 696c9ca + b90d6d5 commit 11682b2

29 files changed

Lines changed: 1889 additions & 2636 deletions

phylesystem_api/phylesystem_api/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from pyramid.config import Configurator
2-
from .api_utils import get_conf_object, get_phylesystem
2+
from .api_utils import get_conf_object, get_docstore_from_type
33

44

55
def main(global_config, **settings):
@@ -14,5 +14,5 @@ def main(global_config, **settings):
1414
# print("{k}: {v}".format(k=k, v=repr(v)))
1515
localconfig_filename = settings["config_file_path"]
1616
conf_obj = get_conf_object(localconfig_filename=localconfig_filename)
17-
_ps = get_phylesystem(request=None, conf_obj=conf_obj)
17+
_ps = get_docstore_from_type("study", request=None, conf_obj=conf_obj)
1818
return config.make_wsgi_app()

0 commit comments

Comments
 (0)