Skip to content

Commit db4d73d

Browse files
authored
Merge pull request #298 from scverse/fix/root-logger-level
Fix root logging level being set to INFO for all packages
2 parents 40092de + 24badca commit db4d73d

4 files changed

Lines changed: 15 additions & 8 deletions

File tree

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ and this project adheres to [Semantic Versioning][].
1616
### Changes
1717
- Refactored `ds.ensmbl_to_symbol` to reuse `_download` and fixed mirror fallback to actually switch between Ensembl mirrors
1818

19+
### Bugfixes
20+
- Fixed `_log` setting the root logging level to INFO for all packages (#296)
21+
1922
## 2.1.4
2023

2124
### Changes

src/decoupler/_log.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
import logging
22

3-
logging.basicConfig(level=logging.INFO, format="%(asctime)s | [%(levelname)s] %(message)s", datefmt="%Y-%m-%d %H:%M:%S")
3+
logger = logging.getLogger("decoupler")
4+
logger.setLevel(logging.INFO)
5+
_handler = logging.StreamHandler()
6+
_handler.setFormatter(logging.Formatter("%(asctime)s | [%(levelname)s] %(message)s", datefmt="%Y-%m-%d %H:%M:%S"))
7+
logger.addHandler(_handler)
48

59

610
def _log(message: str, level: str = "info", verbose: bool = False) -> None:
@@ -19,6 +23,6 @@ def _log(message: str, level: str = "info", verbose: bool = False) -> None:
1923
level = level.lower()
2024
if verbose:
2125
if level == "warn":
22-
logging.warning(message)
26+
logger.warning(message)
2327
elif level == "info":
24-
logging.info(message)
28+
logger.info(message)

tests/ds/test_toy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def test_toy(
4545
verbose,
4646
caplog,
4747
):
48-
with caplog.at_level(logging.INFO):
48+
with caplog.at_level(logging.INFO, logger="decoupler"):
4949
adata, net = dc.ds.toy(nobs=nobs, nvar=nvar, bval=bval, pstime=pstime, seed=seed, verbose=verbose)
5050
if verbose:
5151
assert len(caplog.text) > 0

tests/pp/test_net.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def test_validate_net(
2424
verbose,
2525
caplog,
2626
):
27-
with caplog.at_level(logging.WARNING):
27+
with caplog.at_level(logging.WARNING, logger="decoupler"):
2828
vnet = dc.pp.net._validate_net(net=net, verbose=verbose)
2929
assert caplog.text == ""
3030
assert net.shape == vnet.shape
@@ -34,7 +34,7 @@ def test_validate_net(
3434

3535
net.drop(columns=["weight"], inplace=True)
3636
assert "weight" not in net.columns
37-
with caplog.at_level(logging.WARNING):
37+
with caplog.at_level(logging.WARNING, logger="decoupler"):
3838
vnet = dc.pp.net._validate_net(net=net, verbose=verbose)
3939
if verbose:
4040
assert len(caplog.text) > 0
@@ -119,7 +119,7 @@ def test_adjmat(
119119
caplog,
120120
):
121121
features = adata.var_names
122-
with caplog.at_level(logging.INFO):
122+
with caplog.at_level(logging.INFO, logger="decoupler"):
123123
sources, targets, adjmat = dc.pp.adjmat(features=features, net=net, verbose=verbose)
124124
adjmat = adjmat.ravel()
125125
non_zero_adjmat = adjmat[adjmat != 0.0]
@@ -143,7 +143,7 @@ def test_idxmat(
143143
caplog,
144144
):
145145
features = adata.var_names
146-
with caplog.at_level(logging.INFO):
146+
with caplog.at_level(logging.INFO, logger="decoupler"):
147147
sources, cnct, starts, offsets = dc.pp.idxmat(features=features, net=net, verbose=verbose)
148148
if verbose:
149149
assert len(caplog.text) > 0

0 commit comments

Comments
 (0)