From 1e81570cf45de1f4f575311b5c325f6ef32faed8 Mon Sep 17 00:00:00 2001 From: Pim Nelissen Date: Thu, 12 Mar 2026 14:34:40 +0100 Subject: [PATCH] clean up imports and remove hard-coded __init__ refs --- src/pg_rad/configs/__init__.py | 1 - src/pg_rad/data/__init__.py | 1 - src/pg_rad/dataloader/__init__.py | 8 -------- src/pg_rad/exceptions/__init__.py | 10 ---------- src/pg_rad/inputparser/__init__.py | 0 src/pg_rad/isotopes/__init__.py | 9 --------- src/pg_rad/logger/__init__.py | 5 ----- src/pg_rad/objects/__init__.py | 11 ----------- src/pg_rad/objects/sources.py | 2 +- src/pg_rad/path/__init__.py | 8 -------- src/pg_rad/physics/__init__.py | 12 ------------ src/pg_rad/plotting/__init__.py | 7 ------- 12 files changed, 1 insertion(+), 73 deletions(-) create mode 100644 src/pg_rad/inputparser/__init__.py diff --git a/src/pg_rad/configs/__init__.py b/src/pg_rad/configs/__init__.py index a9a2c5b..e69de29 100644 --- a/src/pg_rad/configs/__init__.py +++ b/src/pg_rad/configs/__init__.py @@ -1 +0,0 @@ -__all__ = [] diff --git a/src/pg_rad/data/__init__.py b/src/pg_rad/data/__init__.py index a9a2c5b..e69de29 100644 --- a/src/pg_rad/data/__init__.py +++ b/src/pg_rad/data/__init__.py @@ -1 +0,0 @@ -__all__ = [] diff --git a/src/pg_rad/dataloader/__init__.py b/src/pg_rad/dataloader/__init__.py index 0f01fd4..e69de29 100644 --- a/src/pg_rad/dataloader/__init__.py +++ b/src/pg_rad/dataloader/__init__.py @@ -1,8 +0,0 @@ -# do not expose internal logger when running mkinit -__ignore__ = ["logger"] - -from pg_rad.dataloader import dataloader - -from pg_rad.dataloader.dataloader import (load_data,) - -__all__ = ['dataloader', 'load_data'] diff --git a/src/pg_rad/exceptions/__init__.py b/src/pg_rad/exceptions/__init__.py index 99b24a1..e69de29 100644 --- a/src/pg_rad/exceptions/__init__.py +++ b/src/pg_rad/exceptions/__init__.py @@ -1,10 +0,0 @@ -# do not expose internal logger when running mkinit -__ignore__ = ["logger"] - -from pg_rad.exceptions import exceptions - -from pg_rad.exceptions.exceptions import (ConvergenceError, DataLoadError, - InvalidCSVError, OutOfBoundsError,) - -__all__ = ['ConvergenceError', 'DataLoadError', 'InvalidCSVError', - 'OutOfBoundsError', 'exceptions'] diff --git a/src/pg_rad/inputparser/__init__.py b/src/pg_rad/inputparser/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/pg_rad/isotopes/__init__.py b/src/pg_rad/isotopes/__init__.py index b926aa8..e69de29 100644 --- a/src/pg_rad/isotopes/__init__.py +++ b/src/pg_rad/isotopes/__init__.py @@ -1,9 +0,0 @@ -# do not expose internal logger when running mkinit -__ignore__ = ["logger"] - -from pg_rad.isotopes import isotope - -from pg_rad.isotopes.isotope import (CS137, Isotope, get_isotope, - preset_isotopes,) - -__all__ = ['CS137', 'Isotope', 'get_isotope', 'isotope', 'preset_isotopes'] diff --git a/src/pg_rad/logger/__init__.py b/src/pg_rad/logger/__init__.py index 57b4e3f..e69de29 100644 --- a/src/pg_rad/logger/__init__.py +++ b/src/pg_rad/logger/__init__.py @@ -1,5 +0,0 @@ -from pg_rad.logger import logger - -from pg_rad.logger.logger import (setup_logger,) - -__all__ = ['logger', 'setup_logger'] diff --git a/src/pg_rad/objects/__init__.py b/src/pg_rad/objects/__init__.py index 92edc21..e69de29 100644 --- a/src/pg_rad/objects/__init__.py +++ b/src/pg_rad/objects/__init__.py @@ -1,11 +0,0 @@ -# do not expose internal logger when running mkinit -__ignore__ = ["logger"] - -from pg_rad.objects import objects -from pg_rad.objects import sources - -from pg_rad.objects.objects import (BaseObject,) -from pg_rad.objects.sources import (PointSource,) - -__all__ = ['BaseObject', 'PointSource', 'objects', - 'sources'] diff --git a/src/pg_rad/objects/sources.py b/src/pg_rad/objects/sources.py index 08e4146..354357f 100644 --- a/src/pg_rad/objects/sources.py +++ b/src/pg_rad/objects/sources.py @@ -1,7 +1,7 @@ import logging from .objects import BaseObject -from pg_rad.isotopes.isotope import Isotope, get_isotope +from pg_rad.isotopes.isotope import Isotope logger = logging.getLogger(__name__) diff --git a/src/pg_rad/path/__init__.py b/src/pg_rad/path/__init__.py index 8874a3d..e69de29 100644 --- a/src/pg_rad/path/__init__.py +++ b/src/pg_rad/path/__init__.py @@ -1,8 +0,0 @@ -# do not expose internal logger when running mkinit -__ignore__ = ["logger"] - -from pg_rad.path import path - -from pg_rad.path.path import (Path, PathSegment, path_from_RT90,) - -__all__ = ['Path', 'PathSegment', 'path', 'path_from_RT90'] diff --git a/src/pg_rad/physics/__init__.py b/src/pg_rad/physics/__init__.py index dd98ebe..e69de29 100644 --- a/src/pg_rad/physics/__init__.py +++ b/src/pg_rad/physics/__init__.py @@ -1,12 +0,0 @@ -# do not expose internal logger when running mkinit -__ignore__ = ["logger"] -from pg_rad.physics import attenuation -from pg_rad.physics import fluence - -from pg_rad.physics.attenuation import (get_mass_attenuation_coeff,) -from pg_rad.physics.fluence import (calculate_fluence_along_path, - calculate_fluence_at, phi,) - -__all__ = ['attenuation', 'calculate_fluence_along_path', - 'calculate_fluence_at', 'fluence', 'get_mass_attenuation_coeff', - 'phi'] diff --git a/src/pg_rad/plotting/__init__.py b/src/pg_rad/plotting/__init__.py index 271d2c9..e69de29 100644 --- a/src/pg_rad/plotting/__init__.py +++ b/src/pg_rad/plotting/__init__.py @@ -1,7 +0,0 @@ -# do not expose internal logger when running mkinit -__ignore__ = ["logger"] -from pg_rad.plotting import landscape_plotter - -from pg_rad.plotting.landscape_plotter import (LandscapeSlicePlotter,) - -__all__ = ['LandscapeSlicePlotter', 'landscape_plotter']