rtd tuning

belbio · Jan 25, 2018 · 4ebe5cb · 4ebe5cb
1 parent 378252f
commit 4ebe5cb
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 42 deletions.
diff --git a/bel/db/scripts.py b/bel/db/scripts.py
diff --git a/bel/lang/completion.py b/bel/lang/completion.py
@@ -24,7 +24,6 @@
 
 from bel.Config import config
 
-# logging.config.dictConfig(config['logging'])
 log = logging.getLogger(__name__)
 
 default_bel = config['bel']['lang']['default_bel_version']

diff --git a/bel/lang/partialparse.py b/bel/lang/partialparse.py
@@ -20,7 +20,8 @@
 
 from bel.Config import config
 
-logging.config.dictConfig(config['logging'])
+if config.get('logging', False):
+    logging.config.dictConfig(config.get('logging'))
 log = logging.getLogger(__name__)
 
 start_arg_chars = ['(', ',']

diff --git a/bel/nanopub/edges.py b/bel/nanopub/edges.py
@@ -9,7 +9,6 @@
 from typing import Mapping, Any, List
 import copy
 import itertools
-import yaml
 import os
 
 import bel.lang.belobj
@@ -19,6 +18,8 @@
 import bel.utils as utils
 import bel.nanopub.files as files
 
+from bel.Config import config
+
 import logging
 log = logging.getLogger(__name__)
 
@@ -276,11 +277,10 @@ def main():
     module_fn = os.path.basename(__file__)
     module_fn = module_fn.replace('.py', '')
 
-    logging_conf_fn = "./logging-conf.yaml"
+    if config.get('logging', False):
+        logging.config.dictConfig(config.get('logging'))
 
-    with open(logging_conf_fn, mode='r') as f:
-        logging.config.dictConfig(yaml.load(f))
-        log = logging.getLogger(f'{module_fn}')
+    log = logging.getLogger(f'{module_fn}')
 
     main()
 
diff --git a/bel/nanopub/pubmed.py b/bel/nanopub/pubmed.py
@@ -240,7 +240,8 @@ def main():
 
 if __name__ == '__main__':
 
-    logging.config.dictConfig(config['logging'])
+    if config.get('logging', False):
+        logging.config.dictConfig(config.get('logging'))
     log = logging.getLogger(__name__)
 
     main()

diff --git a/bel/scripts.py b/bel/scripts.py
@@ -20,7 +20,8 @@
 import logging
 import logging.config
 
-logging.config.dictConfig(config.get('logging', {}))
+if config.get('logging', False):
+    logging.config.dictConfig(config.get('logging'))
 log = logging.getLogger(__name__)
 
 

diff --git a/docs/source/script.rst b/docs/source/script.rst
@@ -5,14 +5,12 @@ The BEL CLI commands are installed by pip install bel. These are nested commands
 for which you can review the help at each nested level by:
 
 *belc* stands for BEL CLI (Command Line Interface)
-
 .. code-block:: bash
 
     belc --help
     belc stmt --help
     belc stmt canonicalize --help
 
-
 .. click:: bel.scripts:belc
    :prog: belc
    :show-nested: