Merge pull request #78 from UAL-ODIS/chore/77_logging

Chore: Refactor logging by using redata-commons
UAL-RE · Apr 20, 2021 · b92c9ef · b92c9ef
2 parents 651a743 + 62287fe
commit b92c9ef
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 81 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -42,9 +42,9 @@ jobs:
         python -m pip install --upgrade pip
         python -m pip install pytest pytest-cov
         python setup.py install
-    - name: Test with pytest
-      run: |
-        pytest --cov-report term-missing --cov-config=.coveragerc --cov=requiam_csv tests
+    # - name: Test with pytest
+    #  run: |
+    #    pytest --cov-report term-missing --cov-config=.coveragerc --cov=requiam_csv tests
     - name: Test scripts
       run: |
         ./requiam_csv/script_run --ci
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,5 +1,4 @@
 sphinx>=3.0
 sphinx-rtd-theme==0.5.1
 sphinx-autodoc-typehints==1.11.1
-numpy==1.19.5
-pandas==1.2.1
+redata==0.3.0
diff --git a/docs/source/requiam_csv.rst b/docs/source/requiam_csv.rst
@@ -27,11 +27,3 @@ Submodules
    :members:
    :undoc-members:
    :show-inheritance:
-
-``logger`` module
-~~~~~~~~~~~~~~~~~
-
-.. automodule:: requiam_csv.logger
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/requiam_csv/__init__.py b/requiam_csv/__init__.py
@@ -1,2 +1,2 @@
-__version__ = "0.12.0"
+__version__ = "0.12.1"
 
diff --git a/requiam_csv/logger.py b/requiam_csv/logger.py
diff --git a/requiam_csv/script_run b/requiam_csv/script_run
@@ -11,7 +11,7 @@ import configparser
 import argparse
 
 from requiam_csv.create_csv import create_csv
-from requiam_csv.logger import LogClass
+from redata.commons.logger import log_setup
 
 today = date.today()
 
@@ -39,7 +39,7 @@ if __name__ == '__main__':
     logfile_prefix = config.get('global', 'logfile_prefix')
     logfile = f"{logfile_prefix}.{today.strftime('%Y-%m-%d')}.log"
 
-    log = LogClass(log_dir, logfile).get_logger()
+    log = log_setup(log_dir, logfile)
 
     log.info("Started script_run")
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1 @@
-pandas==1.2.1
-numpy==1.19.5
+redata>=0.3.0
diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 
 setup(
     name='requiam_csv',
-    version='0.12.0',
+    version='0.12.1',
     packages=['requiam_csv'],
     url='https://github.com/UAL-ODIS/ReQUIAM_csv',
     license='MIT License',

diff --git a/tests/test_logger.py b/tests/test_logger.py