From 253a805c8d1662616b16dc9d6f349dc41e649fdd Mon Sep 17 00:00:00 2001 From: Drew Leonard Date: Tue, 23 Aug 2022 10:49:20 +0100 Subject: [PATCH 1/4] Move attrs definitions to dummy file --- dkist/net/{attrs.py => _attrs.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dkist/net/{attrs.py => _attrs.py} (100%) diff --git a/dkist/net/attrs.py b/dkist/net/_attrs.py similarity index 100% rename from dkist/net/attrs.py rename to dkist/net/_attrs.py From 17b8ab00bb6037b8cd877da273c0b4b00081f499 Mon Sep 17 00:00:00 2001 From: Drew Leonard Date: Tue, 23 Aug 2022 10:54:52 +0100 Subject: [PATCH 2/4] Import desired attrs into new attrs.py Closes #188 --- dkist/net/attrs.py | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 dkist/net/attrs.py diff --git a/dkist/net/attrs.py b/dkist/net/attrs.py new file mode 100644 index 000000000..abf0cf6b9 --- /dev/null +++ b/dkist/net/attrs.py @@ -0,0 +1,61 @@ +from ._attrs import ( + Dataset, + WavelengthBand, + Embargoed, + Observable, + Experiment, + Proposal, + TargetType, + Recipe, + FriedParameter, + PolarimetricAccuracy, + ExposureTime, + EmbargoEndTime, + BrowseMovie, + BoundingBox, + SpectralSampling, + SpatialSampling, + TemporalSampling, +) + +# Trick the docs into thinking these attrs are defined in here. +for _a in ( + Dataset, + WavelengthBand, + Embargoed, + Observable, + Experiment, + Proposal, + TargetType, + Recipe, + FriedParameter, + PolarimetricAccuracy, + ExposureTime, + EmbargoEndTime, + BrowseMovie, + BoundingBox, + SpectralSampling, + SpatialSampling, + TemporalSampling, +): + _a.__module__ = __name__ + +__all__ = [ + "Dataset", + "WavelengthBand", + "Embargoed", + "Observable", + "Experiment", + "Proposal", + "TargetType", + "Recipe", + "FriedParameter", + "PolarimetricAccuracy", + "ExposureTime", + "EmbargoEndTime", + "BrowseMovie", + "BoundingBox", + "SpectralSampling", + "SpatialSampling", + "TemporalSampling", +] From f3c64e283a85850d4f0ea2136a29c8aecba700bc Mon Sep 17 00:00:00 2001 From: Drew Leonard Date: Wed, 7 Sep 2022 11:59:08 +0100 Subject: [PATCH 3/4] Add changelog --- changelog/201.bugfix.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/201.bugfix.rst diff --git a/changelog/201.bugfix.rst b/changelog/201.bugfix.rst new file mode 100644 index 000000000..835fa0748 --- /dev/null +++ b/changelog/201.bugfix.rst @@ -0,0 +1 @@ +Relocate definitions from `dkist.net.attrs` so that just the desired names can be imported into that namespace. From b1b1f408d7be6033f015cc149f11db18978e66dc Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 12 Sep 2022 15:03:58 +0000 Subject: [PATCH 4/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dkist/net/attrs.py | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/dkist/net/attrs.py b/dkist/net/attrs.py index abf0cf6b9..b1dc14b88 100644 --- a/dkist/net/attrs.py +++ b/dkist/net/attrs.py @@ -1,22 +1,7 @@ -from ._attrs import ( - Dataset, - WavelengthBand, - Embargoed, - Observable, - Experiment, - Proposal, - TargetType, - Recipe, - FriedParameter, - PolarimetricAccuracy, - ExposureTime, - EmbargoEndTime, - BrowseMovie, - BoundingBox, - SpectralSampling, - SpatialSampling, - TemporalSampling, -) +from ._attrs import (BoundingBox, BrowseMovie, Dataset, Embargoed, EmbargoEndTime, + Experiment, ExposureTime, FriedParameter, Observable, + PolarimetricAccuracy, Proposal, Recipe, SpatialSampling, + SpectralSampling, TargetType, TemporalSampling, WavelengthBand) # Trick the docs into thinking these attrs are defined in here. for _a in (