diff --git a/package/CHANGELOG b/package/CHANGELOG index fd0b8691869..118737412b2 100644 --- a/package/CHANGELOG +++ b/package/CHANGELOG @@ -17,11 +17,16 @@ The rules for this file: ??/??/?? IAlibay, orbeckst, marinegor, tylerjereddy, ljwoods2, marinegor, spyke7, talagayev, tanii1125, BradyAJohnston, hejamu, jeremyleung521, harshitgajjela-droid, kunjsinha, aygarwal, jauy123, Dreamstick9, - ollyfutur, Amarendra22, charity-g, ParthUppal523 + ollyfutur, Amarendra22, charity-g, ParthUppal523,Jatin-Khiyani * 2.11.0 Fixes + * Standardized logging.getLogger() calls to use \_\_name__ instead of + hardcoded strings across analysis, coordinates, topology, + converters, core, and guesser modules. Some modules had + mismatched or misspelled logger names (e.g. coordinates/PDB.py + used "PBD") which are now also corrected (Issue #5369) * `MDAnalysis.analysis.nucleicacids.WatsonCrickDist`, `MinorPairDist`, and `MajorPairDist` now match residue names against the full resname instead of only the first character, fixing incorrect behaviour with diff --git a/package/MDAnalysis/__init__.py b/package/MDAnalysis/__init__.py index 6843c3738ab..645614c975c 100644 --- a/package/MDAnalysis/__init__.py +++ b/package/MDAnalysis/__init__.py @@ -157,7 +157,7 @@ from typing import Dict -logger = logging.getLogger("MDAnalysis.__init__") +logger = logging.getLogger(__name__) from .version import __version__ diff --git a/package/MDAnalysis/analysis/align.py b/package/MDAnalysis/analysis/align.py index 3dc4f84fb1d..659ecd06e9a 100644 --- a/package/MDAnalysis/analysis/align.py +++ b/package/MDAnalysis/analysis/align.py @@ -218,7 +218,7 @@ from .base import AnalysisBase -logger = logging.getLogger("MDAnalysis.analysis.align") +logger = logging.getLogger(__name__) def rotation_matrix(a, b, weights=None): diff --git a/package/MDAnalysis/analysis/atomicdistances.py b/package/MDAnalysis/analysis/atomicdistances.py index ff1e39f5265..0968e3f87fc 100644 --- a/package/MDAnalysis/analysis/atomicdistances.py +++ b/package/MDAnalysis/analysis/atomicdistances.py @@ -116,7 +116,7 @@ import logging from .base import AnalysisBase, ResultsGroup -logger = logging.getLogger("MDAnalysis.analysis.atomicdistances") +logger = logging.getLogger(__name__) class AtomicDistances(AnalysisBase): diff --git a/package/MDAnalysis/analysis/contacts.py b/package/MDAnalysis/analysis/contacts.py index 5d63471ae7d..c10094b2a58 100644 --- a/package/MDAnalysis/analysis/contacts.py +++ b/package/MDAnalysis/analysis/contacts.py @@ -225,7 +225,7 @@ def is_any_closer(r, r0, dist=2.5): from MDAnalysis.core.groups import AtomGroup, UpdatingAtomGroup from .base import AnalysisBase, ResultsGroup -logger = logging.getLogger("MDAnalysis.analysis.contacts") +logger = logging.getLogger(__name__) def soft_cut_q(r, r0, beta=5.0, lambda_constant=1.8): diff --git a/package/MDAnalysis/analysis/density.py b/package/MDAnalysis/analysis/density.py index 61c4e679899..9c3649c2afb 100644 --- a/package/MDAnalysis/analysis/density.py +++ b/package/MDAnalysis/analysis/density.py @@ -177,7 +177,7 @@ import logging -logger = logging.getLogger("MDAnalysis.analysis.density") +logger = logging.getLogger(__name__) class DensityAnalysis(AnalysisBase): diff --git a/package/MDAnalysis/analysis/diffusionmap.py b/package/MDAnalysis/analysis/diffusionmap.py index 594d7603a4c..2f9130914fe 100644 --- a/package/MDAnalysis/analysis/diffusionmap.py +++ b/package/MDAnalysis/analysis/diffusionmap.py @@ -145,7 +145,7 @@ from .rms import rmsd from .base import AnalysisBase, ResultsGroup -logger = logging.getLogger("MDAnalysis.analysis.diffusionmap") +logger = logging.getLogger(__name__) class DistanceMatrix(AnalysisBase): diff --git a/package/MDAnalysis/analysis/distances.py b/package/MDAnalysis/analysis/distances.py index 44a09c4fcbd..7d4152bdf34 100644 --- a/package/MDAnalysis/analysis/distances.py +++ b/package/MDAnalysis/analysis/distances.py @@ -65,7 +65,7 @@ import warnings import logging -logger = logging.getLogger("MDAnalysis.analysis.distances") +logger = logging.getLogger(__name__) def contact_matrix(coord, cutoff=15.0, returntype="numpy", box=None): diff --git a/package/MDAnalysis/analysis/gnm.py b/package/MDAnalysis/analysis/gnm.py index a767c5c5787..61b33838905 100644 --- a/package/MDAnalysis/analysis/gnm.py +++ b/package/MDAnalysis/analysis/gnm.py @@ -97,7 +97,7 @@ from MDAnalysis.analysis.base import Results -logger = logging.getLogger("MDAnalysis.analysis.GNM") +logger = logging.getLogger(__name__) def _dsq(a, b): diff --git a/package/MDAnalysis/analysis/hydrogenbonds/wbridge_analysis.py b/package/MDAnalysis/analysis/hydrogenbonds/wbridge_analysis.py index 027c0b71255..9df450804de 100644 --- a/package/MDAnalysis/analysis/hydrogenbonds/wbridge_analysis.py +++ b/package/MDAnalysis/analysis/hydrogenbonds/wbridge_analysis.py @@ -718,7 +718,7 @@ def analysis(current, output, u, **kwargs): from ..base import AnalysisBase -logger = logging.getLogger("MDAnalysis.analysis.WaterBridgeAnalysis") +logger = logging.getLogger(__name__) class WaterBridgeAnalysis(AnalysisBase): diff --git a/package/MDAnalysis/analysis/legacy/x3dna.py b/package/MDAnalysis/analysis/legacy/x3dna.py index 2365c181133..29911d14925 100644 --- a/package/MDAnalysis/analysis/legacy/x3dna.py +++ b/package/MDAnalysis/analysis/legacy/x3dna.py @@ -135,7 +135,7 @@ from MDAnalysis import ApplicationError from MDAnalysis.lib.util import asiterable, deprecate, realpath, which -logger = logging.getLogger("MDAnalysis.analysis.x3dna") +logger = logging.getLogger(__name__) @deprecate( diff --git a/package/MDAnalysis/analysis/msd.py b/package/MDAnalysis/analysis/msd.py index d672b64b763..d50c92abaff 100644 --- a/package/MDAnalysis/analysis/msd.py +++ b/package/MDAnalysis/analysis/msd.py @@ -278,7 +278,7 @@ from ..core import groups import collections -logger = logging.getLogger("MDAnalysis.analysis.msd") +logger = logging.getLogger(__name__) due.cite( Doi("10.21105/joss.00877"), diff --git a/package/MDAnalysis/analysis/rms.py b/package/MDAnalysis/analysis/rms.py index 4b76723e7b6..1553d194237 100644 --- a/package/MDAnalysis/analysis/rms.py +++ b/package/MDAnalysis/analysis/rms.py @@ -172,7 +172,7 @@ from ..lib.util import asiterable, iterable, get_weights -logger = logging.getLogger("MDAnalysis.analysis.rmsd") +logger = logging.getLogger(__name__) def rmsd(a, b, weights=None, center=False, superposition=False): diff --git a/package/MDAnalysis/converters/ParmEdParser.py b/package/MDAnalysis/converters/ParmEdParser.py index 331f14e279a..90db5569780 100644 --- a/package/MDAnalysis/converters/ParmEdParser.py +++ b/package/MDAnalysis/converters/ParmEdParser.py @@ -122,7 +122,7 @@ ) from ..core.topology import Topology -logger = logging.getLogger("MDAnalysis.converters.ParmEdParser") +logger = logging.getLogger(__name__) def squash_identical(values): diff --git a/package/MDAnalysis/converters/RDKitParser.py b/package/MDAnalysis/converters/RDKitParser.py index 90069ebfb12..91d17d5d535 100644 --- a/package/MDAnalysis/converters/RDKitParser.py +++ b/package/MDAnalysis/converters/RDKitParser.py @@ -70,7 +70,7 @@ ) from ..topology.base import TopologyReaderBase, change_squash -logger = logging.getLogger("MDAnalysis.converters.RDKitParser") +logger = logging.getLogger(__name__) def _rdkit_atom_to_RS(atom): diff --git a/package/MDAnalysis/coordinates/IMD.py b/package/MDAnalysis/coordinates/IMD.py index 4945d43adfc..bfa4aa5ec68 100644 --- a/package/MDAnalysis/coordinates/IMD.py +++ b/package/MDAnalysis/coordinates/IMD.py @@ -175,7 +175,7 @@ class MockIMDClient: ) HAS_IMDCLIENT = False -logger = logging.getLogger("MDAnalysis.coordinates.IMDReader") +logger = logging.getLogger(__name__) class IMDReader(StreamReaderBase): diff --git a/package/MDAnalysis/coordinates/PDB.py b/package/MDAnalysis/coordinates/PDB.py index d8d71044b4a..a871d01681c 100644 --- a/package/MDAnalysis/coordinates/PDB.py +++ b/package/MDAnalysis/coordinates/PDB.py @@ -158,7 +158,7 @@ from ..exceptions import NoDataError -logger = logging.getLogger("MDAnalysis.coordinates.PBD") +logger = logging.getLogger(__name__) # Pairs of residue name / atom name in use to deduce PDB formatted atom names Pair = collections.namedtuple("Atom", "resname name") diff --git a/package/MDAnalysis/coordinates/TPR.py b/package/MDAnalysis/coordinates/TPR.py index 1940da4c924..c304242c89a 100644 --- a/package/MDAnalysis/coordinates/TPR.py +++ b/package/MDAnalysis/coordinates/TPR.py @@ -59,7 +59,7 @@ import logging -logger = logging.getLogger("MDAnalysis.coordinates.TPR") +logger = logging.getLogger(__name__) import numpy as np diff --git a/package/MDAnalysis/coordinates/TRC.py b/package/MDAnalysis/coordinates/TRC.py index 4c7c4009ec7..c69c0a99c17 100644 --- a/package/MDAnalysis/coordinates/TRC.py +++ b/package/MDAnalysis/coordinates/TRC.py @@ -77,7 +77,7 @@ import logging -logger = logging.getLogger("MDAnalysis.coordinates.GROMOS11") +logger = logging.getLogger(__name__) class TRCReader(base.ReaderBase): diff --git a/package/MDAnalysis/coordinates/TRJ.py b/package/MDAnalysis/coordinates/TRJ.py index e9799e4d945..f65e08596a7 100644 --- a/package/MDAnalysis/coordinates/TRJ.py +++ b/package/MDAnalysis/coordinates/TRJ.py @@ -141,7 +141,8 @@ from . import base from ..lib import util from ..lib.util import store_init_arguments -logger = logging.getLogger("MDAnalysis.coordinates.AMBER") + +logger = logging.getLogger(__name__) try: diff --git a/package/MDAnalysis/coordinates/XYZ.py b/package/MDAnalysis/coordinates/XYZ.py index 1f6e5816238..b8b0e8e16cf 100644 --- a/package/MDAnalysis/coordinates/XYZ.py +++ b/package/MDAnalysis/coordinates/XYZ.py @@ -88,7 +88,7 @@ import warnings import logging -logger = logging.getLogger("MDAnalysis.coordinates.XYZ") +logger = logging.getLogger(__name__) from . import base from .timestep import Timestep diff --git a/package/MDAnalysis/core/universe.py b/package/MDAnalysis/core/universe.py index 4b9ec247bd8..0061af1ea69 100644 --- a/package/MDAnalysis/core/universe.py +++ b/package/MDAnalysis/core/universe.py @@ -107,7 +107,7 @@ from .topologyobjects import TopologyObject from ..guesser.base import get_guesser -logger = logging.getLogger("MDAnalysis.core.universe") +logger = logging.getLogger(__name__) def _update_topology_by_ids(universe, atomwise_resids, atomwise_segids): diff --git a/package/MDAnalysis/guesser/base.py b/package/MDAnalysis/guesser/base.py index c7bcc21e823..175e6d0b7da 100644 --- a/package/MDAnalysis/guesser/base.py +++ b/package/MDAnalysis/guesser/base.py @@ -43,7 +43,7 @@ from typing import Dict import copy -logger = logging.getLogger("MDAnalysis.guesser.base") +logger = logging.getLogger(__name__) class _GuesserMeta(type): diff --git a/package/MDAnalysis/topology/LAMMPSParser.py b/package/MDAnalysis/topology/LAMMPSParser.py index 61404fbbe70..fc0614b6b74 100644 --- a/package/MDAnalysis/topology/LAMMPSParser.py +++ b/package/MDAnalysis/topology/LAMMPSParser.py @@ -108,7 +108,7 @@ from ..guesser.tables import SYMB2Z from ..guesser.tables import masses as mass_table -logger = logging.getLogger("MDAnalysis.topology.LAMMPS") +logger = logging.getLogger(__name__) # Sections will all start with one of these words diff --git a/package/MDAnalysis/topology/PDBParser.py b/package/MDAnalysis/topology/PDBParser.py index b168b0a67ae..640f744b408 100644 --- a/package/MDAnalysis/topology/PDBParser.py +++ b/package/MDAnalysis/topology/PDBParser.py @@ -93,7 +93,7 @@ ) # Set up a logger for the PDBParser -logger = logging.getLogger("MDAnalysis.topology.PDBParser") +logger = logging.getLogger(__name__) def float_or_default(val, default): diff --git a/package/MDAnalysis/topology/PSFParser.py b/package/MDAnalysis/topology/PSFParser.py index 531c2ae592d..a8b930273cf 100644 --- a/package/MDAnalysis/topology/PSFParser.py +++ b/package/MDAnalysis/topology/PSFParser.py @@ -68,7 +68,7 @@ ) from ..core.topology import Topology -logger = logging.getLogger("MDAnalysis.topology.PSF") +logger = logging.getLogger(__name__) class PSFParser(TopologyReaderBase): diff --git a/package/MDAnalysis/topology/TOPParser.py b/package/MDAnalysis/topology/TOPParser.py index ba61bea0b06..07c18764686 100644 --- a/package/MDAnalysis/topology/TOPParser.py +++ b/package/MDAnalysis/topology/TOPParser.py @@ -117,7 +117,7 @@ import warnings import logging -logger = logging.getLogger("MDAnalysis.topology.TOPParser") +logger = logging.getLogger(__name__) class TypeIndices(AtomAttr): diff --git a/package/MDAnalysis/topology/TPRParser.py b/package/MDAnalysis/topology/TPRParser.py index 09cbdcdf6e4..81d65d935bf 100644 --- a/package/MDAnalysis/topology/TPRParser.py +++ b/package/MDAnalysis/topology/TPRParser.py @@ -177,7 +177,7 @@ import logging -logger = logging.getLogger("MDAnalysis.topology.TPRparser") +logger = logging.getLogger(__name__) class TPRParser(TopologyReaderBase):