Skip to content

Commit 7131f8e

Browse files
committed
fixes for make_examples run
1 parent 969b662 commit 7131f8e

File tree

6 files changed

+41
-5
lines changed

6 files changed

+41
-5
lines changed

requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ lmfit >= 1.0.0
88
matplotlib >= 3.1.2
99
numpy >= 1.19.2
1010
openpyxl >= 3.0.1
11+
12+
attr

src/raman_fitting/__init__.py

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020

2121
from raman_fitting.config import filepath_settings
22+
from raman_fitting.config import logging_config
2223

2324
# VERSION_PATH = config.PACKAGE_ROOT / 'VERSION.txt'
2425
# with open(VERSION_PATH, 'r') as version_file:
@@ -31,14 +32,31 @@
3132

3233
# Configure logger for use in package
3334
logger = logging.getLogger(__package_name__)
34-
logger.setLevel(logging.DEBUG)
35+
36+
log_format = (
37+
"[%(asctime)s] — %(name)s — %(levelname)s —" "%(funcName)s:%(lineno)d—12s %(message)s")
38+
# '[%(asctime)s] %(levelname)-8s %(name)-12s %(message)s')
39+
40+
# Define basic configuration
41+
logging.basicConfig(
42+
# Define logging level
43+
level=logging.DEBUG,
44+
# Define the format of log messages
45+
format=log_format,
46+
# Provide the filename to store the log messages
47+
filename=('debug.log'),
48+
)
49+
50+
formatter = logging.Formatter(log_format)
51+
# logger.setLevel(logging.DEBUG)
3552
# from raman_fitting.config import logging_config
3653
# logger.addHandler(logging_config.get_console_handler())
37-
logger.propagate = False
54+
# logger.propagate = False
3855

3956
# create console handler
4057
ch = logging.StreamHandler(stream=sys.stdout)
4158
ch.setLevel(logging.INFO)
59+
ch.setFormatter(formatter)
4260

4361
# add the handlers to the logger
4462
logger.addHandler(ch)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
from . import logging_config

src/raman_fitting/config/logging_config.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,22 @@
1111
)
1212

1313

14+
15+
log_format = (
16+
"[%(asctime)s] — %(name)s — %(levelname)s —" "%(funcName)s:%(lineno)d—12s %(message)s")
17+
# '[%(asctime)s] %(levelname)-8s %(name)-12s %(message)s')
18+
19+
# Define basic configuration
20+
logging.basicConfig(
21+
# Define logging level
22+
level=logging.DEBUG,
23+
# Define the format of log messages
24+
format=log_format,
25+
# Provide the filename to store the log messages
26+
filename=('debug.log'),
27+
)
28+
29+
1430
def get_console_handler():
1531
console_handler = logging.StreamHandler(sys.stdout)
1632
console_handler.setFormatter(FORMATTER)

src/raman_fitting/deconvolution_models/default_peaks/first_order_peaks.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
""" Default peaks used for 1st order deconvolution"""
2-
import attr
32

43
if __name__ == "__main__":
54
from raman_fitting.deconvolution_models.default_peaks.base_peak import BasePeak

src/raman_fitting/exporting/exporter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ def __init__(self, arg, raw_out=True, plot=True, model_names_prefix=["1st", "2nd
2525
self.delegator(arg)
2626
except ExporterError:
2727
logger.warning(
28-
"f{self.__class__.__qualname__} failed export from {type(arg)}"
28+
f"{self.__class__.__qualname__} failed export from {type(arg)}"
2929
)
3030
except Exception as e:
3131
logger.error(
32-
"f{self.__class__.__qualname__} failed export with unexpected error {e}"
32+
f"{self.__class__.__qualname__} failed export with unexpected error {e}"
3333
)
3434

3535
# Exporting and Plotting

0 commit comments

Comments
 (0)