test ontload config, version bump for release, ontload fixes

amazing what problems testing can reveal, heh

MANIFEST.in

@@ -21,4 +21,5 @@ recursive-exclude * *.swp
 recursive-exclude * *.swo
 
 include nifstd/scigraph/curie_map.yaml
+include nifstd/scigraph/graphload-base-template.yaml
 include ttlser/test/nasty.ttl

pyontutils/__init__.py

@@ -1 +1 @@
-__version__ = '0.1.16'
+__version__ = '0.1.17'

pyontutils/auth-config.py

@@ -40,7 +40,8 @@
   'scigraph-api-key': {'environment-variables': 'SCICRUNCH_API_KEY SCIGRAPH_API_KEY'},
 
   # scigraph build
-  'scigraph-graphload': ['../nifstd/scigraph/graphload-base-template.yaml',],
+  'scigraph-graphload': ['../nifstd/scigraph/graphload-base-template.yaml',  # git
+                         '{:cwd}/nifstd/scigraph/graphload-base-template.yaml',],  # ebuild testing  # FIXME VERY BAD coupling between test and module location
   'scigraph-services': ['../nifstd/scigraph/services-base-template.yaml',],
   'zip-location': '/tmp'}
 }

pyontutils/ontload.py

@@ -241,8 +241,13 @@ def make_graphload_config(graphload_config_template, graphload_ontologies,
         with open(zip_location / config_raw, 'rt') as f:
             config = yaml.safe_load(f)
 
+        if 'ontologies' not in config:
+            # FIXME log a warning?
+            config['ontologies'] = []
+
         config['graphConfiguration']['location'] = graph_path.as_posix()
-        config['ontologies'] = [{k:v.replace(remote_base, local_base)
+        lbasposix = local_base.as_posix()
+        config['ontologies'] = [{k:v.replace(remote_base, lbasposix)
                                 if k == 'url'
                                 else v
                                 for k, v in ont.items()}

test/test_integration.py

@@ -101,8 +101,9 @@ class TestScripts(Folders, _TestScriptsBase):
            ],
 'necromancy':['necromancy', ban],
 'ontload':[['ontload', '--help'],
-           ['ontload', 'imports', 'NIF-Ontology', 'NIF', ban],
            ['ontload', 'chain', 'NIF-Ontology', 'NIF', nifttl],  # this hits the network
+           ['ontload', 'config', 'NIF-Ontology', 'NIF', '--zip-location', './', ban],  # FIXME cleanup created configs
+           ['ontload', 'imports', 'NIF-Ontology', 'NIF', ban],
            ['cd', olr.as_posix() + '/ttl', '&&', 'git', 'checkout', ban]],
 'ontutils':[['ontutils', '--help'],
             ['ontutils', 'deadlinks', nifttl],