reorganize plugins to simplify import strategy

also update travis and setup

travis removed hunspell dependency since pyontutils is not being
installed with the spell option

.travis.yml

@@ -13,10 +13,7 @@ branches:
 
 python:
   - 3.6
-
-before_install:
-  - sudo apt-get install hunspell
-  - sudo apt-get install libhunspell-dev
+  - 3.7
 
 install:
   - pip install --upgrade pytest pytest-cov
@@ -26,7 +23,7 @@ install:
   - pipenv install --dev --system --skip-lock --deploy
 
 script:
-  - PYTHONWARNINGS=ignore pipenv run pytest --verbose --cov=ontquery
+  - PYTHONWARNINGS=ignore pipenv run pytest --verbose --color=yes --cov=ontquery
 
 after_success:
   - if [[ $HAS_COVERALLS ]] ; then coveralls ; fi

ontquery/plugin.py

@@ -45,10 +45,9 @@ def register(name, module_path, class_name):
     _plugins[name] = p
 
 
-register('rdflib', 'ontquery.plugins.services', 'rdflibLocal')
-register('InterLex', 'ontquery.plugins.services', 'InterLexRemote')
-register('SciGraph', 'ontquery.plugins.services', 'SciGraphRemote')
-register('SciCrunch', 'ontquery.plugins.services', 'SciCrunchRemote')
-register('GitHub', 'ontquery.plugins.services', 'GitHubRemote')
-register('iris', 'ontquery.plugins.services', 'StaticIriRemote')
-
+register('InterLex', 'ontquery.plugins.services.interlex', 'InterLexRemote')
+register('SciGraph', 'ontquery.plugins.services.scigraph', 'SciGraphRemote')
+register('SciCrunch', 'ontquery.plugins.services.scigraph', 'SciCrunchRemote')
+register('rdflib', 'ontquery.plugins.services.rdflib', 'rdflibLocal')
+register('iris', 'ontquery.plugins.services.rdflib', 'StaticIriRemote')
+register('GitHub', 'ontquery.plugins.services.rdflib', 'GitHubRemote')

ontquery/plugins/__init__.py

@@ -1,17 +0,0 @@
-import pathlib
-
-try:
-    import orthauth as oa
-    auth = oa.configure(pathlib.Path(__file__).parent / 'auth-config.py')
-    class deco:
-        scigraph_api_key = auth.tangential_init('api_key', 'scigraph-api-key')
-        interlex_api_key = auth.tangential_init('api_key', 'interlex-api-key')
-        interlex_basic_u = auth.tangential_init('_basic_auth_user', 'interlex-basic-auth-user')
-        interlex_basic_p = auth.tangential_init('_basic_auth_pass', 'interlex-basic-auth-pass')
-except ModuleNotFoundError:
-    class deco:
-        scigraph_api_key = lambda cls: cls
-        interlex_api_key = lambda cls: cls
-        interlex_basic_u = lambda cls: cls
-        interlex_basic_p = lambda cls: cls
-

ontquery/plugins/services/__init__.py

@@ -0,0 +1,15 @@
+import pathlib
+try:
+    import orthauth as oa
+    auth = oa.configure(pathlib.Path(__file__).parent / 'auth-config.py')
+    class deco:
+        scigraph_api_key = auth.tangential_init('api_key', 'scigraph-api-key')
+        interlex_api_key = auth.tangential_init('api_key', 'interlex-api-key')
+        interlex_basic_u = auth.tangential_init('_basic_auth_user', 'interlex-basic-auth-user')
+        interlex_basic_p = auth.tangential_init('_basic_auth_pass', 'interlex-basic-auth-pass')
+except ModuleNotFoundError:
+    class deco:
+        scigraph_api_key = lambda cls: cls
+        interlex_api_key = lambda cls: cls
+        interlex_basic_u = lambda cls: cls
+        interlex_basic_p = lambda cls: cls