From b067b620782e0e52fedc7220281da9d850e54057 Mon Sep 17 00:00:00 2001 From: Neil Vaytet Date: Wed, 3 Apr 2024 22:19:27 +0200 Subject: [PATCH] fix import order --- src/ess/isissans/__init__.py | 12 ++++++------ src/ess/loki/__init__.py | 9 +++++---- src/ess/sans/__init__.py | 11 +++++------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/ess/isissans/__init__.py b/src/ess/isissans/__init__.py index 11c7b35f..deb2f8b0 100644 --- a/src/ess/isissans/__init__.py +++ b/src/ess/isissans/__init__.py @@ -1,21 +1,21 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright (c) 2024 Scipp contributors (https://github.com/scipp) -# flake8: noqa E402 import importlib.metadata -try: - __version__ = importlib.metadata.version(__package__ or __name__) -except importlib.metadata.PackageNotFoundError: - __version__ = "0.0.0" - from . import components, data, general, io, sans2d from .components import DetectorBankOffset, MonitorOffset, SampleOffset from .io import CalibrationFilename from .visualization import plot_flat_detector_xy +try: + __version__ = importlib.metadata.version(__package__ or __name__) +except importlib.metadata.PackageNotFoundError: + __version__ = "0.0.0" + providers = components.providers + general.providers + io.providers +del importlib __all__ = [ 'CalibrationFilename', diff --git a/src/ess/loki/__init__.py b/src/ess/loki/__init__.py index 290abd60..97b6b949 100644 --- a/src/ess/loki/__init__.py +++ b/src/ess/loki/__init__.py @@ -1,17 +1,18 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright (c) 2023 Scipp contributors (https://github.com/scipp) -# flake8: noqa E402 import importlib.metadata +from . import data, general, io +from .general import default_parameters + try: __version__ = importlib.metadata.version(__package__ or __name__) except importlib.metadata.PackageNotFoundError: __version__ = "0.0.0" -from . import data, general, io -from .general import default_parameters - providers = general.providers + io.providers +del importlib + __all__ = ['data', 'general', 'io', 'providers', 'default_parameters'] diff --git a/src/ess/sans/__init__.py b/src/ess/sans/__init__.py index 062e8d08..60fbc1db 100644 --- a/src/ess/sans/__init__.py +++ b/src/ess/sans/__init__.py @@ -1,14 +1,8 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright (c) 2024 Scipp contributors (https://github.com/scipp) -# flake8: noqa E402 import importlib.metadata -try: - __version__ = importlib.metadata.version(__package__ or __name__) -except importlib.metadata.PackageNotFoundError: - __version__ = "0.0.0" - from . import ( beam_center_finder, common, @@ -22,6 +16,11 @@ from .direct_beam import direct_beam from .types import BackgroundSubtractedIofQ, IofQ, ReturnEvents, SampleRun +try: + __version__ = importlib.metadata.version(__package__ or __name__) +except importlib.metadata.PackageNotFoundError: + __version__ = "0.0.0" + providers = ( *conversions.providers, *i_of_q.providers,