Merge pull request #42 from Santiso-Group/issue_41

Address reviewer comments Issue 41

.github/workflows/CI.yaml

@@ -80,7 +80,7 @@ jobs:
       - name: Flake8
         shell: bash -l {0}
         run: |
-          python -m flake8 despasito --count --ignore=E741,W503 --max-line-length=92 --show-source --statistics
+          python -m flake8 despasito --count --ignore=E741,W503 --max-line-length=120 --per-file-ignores="__init__.py:F401" --show-source --statistics
 
   paper:
     runs-on: ubuntu-latest

.gitignore

@@ -12,6 +12,9 @@ __pycache__/
 # C extensions
 *.so
 
+# VS Code extension
+.vscode/*
+
 # Distribution / packaging
 .Python
 env/

.vscode/settings.json

@@ -1,5 +1,6 @@
 {
     "python.testing.pytestArgs": [],
     "python.testing.unittestEnabled": false,
-    "python.testing.pytestEnabled": true
+    "python.testing.pytestEnabled": true,
+    "python.terminal.executeInFileDir": true
 }

despasito/__init__.py

@@ -7,14 +7,7 @@
 import os
 import logging
 import logging.handlers
-
-# Handle versioneer
-from ._version import get_versions
-
-versions = get_versions()
-__version__ = versions["version"]
-__git_revision__ = versions["full-revisionid"]
-del get_versions, versions
+from ._version import __version__ as __version__
 
 logger = logging.getLogger("despasito")
 logger.setLevel(30)
@@ -60,9 +53,7 @@ def initiate_logger(console=None, log_file=None, verbose=30):
     # Set up logging to console
     if console and handler_console is None:
         console_handler = logging.StreamHandler()  # sys.stderr
-        console_handler.setFormatter(
-            logging.Formatter("[%(levelname)s](%(name)s): %(message)s")
-        )
+        console_handler.setFormatter(logging.Formatter("[%(levelname)s](%(name)s): %(message)s"))
         console_handler.setLevel(verbose)
         logger.addHandler(console_handler)
     elif console:
@@ -82,10 +73,7 @@ def initiate_logger(console=None, log_file=None, verbose=30):
 
         log_file_handler = logging.handlers.RotatingFileHandler(log_file)
         log_file_handler.setFormatter(
-            logging.Formatter(
-                "%(asctime)s [%(levelname)s](%(name)s:%(funcName)s:%(lineno)d): "
-                + "%(message)s"
-            )
+            logging.Formatter("%(asctime)s [%(levelname)s](%(name)s:%(funcName)s:%(lineno)d): " + "%(message)s")
         )
         log_file_handler.setLevel(verbose)
         logger.addHandler(log_file_handler)

despasito/__main__.py

@@ -27,19 +27,15 @@
     os.remove(args.logFile)
 log_file_handler = logging.handlers.RotatingFileHandler(args.logFile)
 log_file_handler.setFormatter(
-    logging.Formatter(
-        "%(asctime)s [%(levelname)s](%(name)s:%(funcName)s:%(lineno)d): %(message)s"
-    )
+    logging.Formatter("%(asctime)s [%(levelname)s](%(name)s:%(funcName)s:%(lineno)d): %(message)s")
 )
 log_file_handler.setLevel(args.verbose)
 logger.addHandler(log_file_handler)
 
 if args.console:
     # Set up logging to console
     console_handler = logging.StreamHandler()  # sys.stderr
-    console_handler.setFormatter(
-        logging.Formatter("[%(levelname)s](%(name)s): %(message)s")
-    )
+    console_handler.setFormatter(logging.Formatter("[%(levelname)s](%(name)s): %(message)s"))
     console_handler.setLevel(args.verbose)
     logger.addHandler(console_handler)