Skip to content

Commit abc10b6

Browse files
committed
Merge branch 'tickets/DM-36649'
2 parents 7a12b10 + c01af40 commit abc10b6

File tree

14 files changed

+14
-15
lines changed

14 files changed

+14
-15
lines changed

python/lsst/analysis/tools/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
configuration) what `AnalysisAction` will run for each of those stages.
3030
3131
`AnalysisTool`\ s and `AnalysisAction`\ s are subclasses of
32-
`~lsst.pipe.tasks.configurableActions.ConfigurableAction`\ s. These objects are
32+
`~lsst.pex.config.configurableActions.ConfigurableAction`\ s. These objects are
3333
special types that are configured _prior_ to any code execution, and behave as
3434
functions at runtime. The configuration state of a
35-
`~lsst.pipe.tasks.configurableActions.ConfigurableAction` is saved separately
35+
`~lsst.pex.config.configurableActions.ConfigurableAction` is saved separately
3636
from the object itself, which allows
3737
"""
3838

python/lsst/analysis/tools/actions/keyedData/keyedDataActions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131

3232
import numpy as np
3333
from lsst.pex.config import Field
34+
from lsst.pex.config.configurableActions import ConfigurableActionField, ConfigurableActionStructField
3435
from lsst.pex.config.listField import ListField
35-
from lsst.pipe.tasks.configurableActions import ConfigurableActionField, ConfigurableActionStructField
3636

3737
from ...interfaces import (
3838
KeyedData,

python/lsst/analysis/tools/actions/plot/scatterplotWithTwoHists.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import matplotlib.pyplot as plt
3030
import numpy as np
3131
from lsst.pex.config import Field
32+
from lsst.pex.config.configurableActions import ConfigurableActionField
3233
from lsst.pex.config.listField import ListField
33-
from lsst.pipe.tasks.configurableActions import ConfigurableActionField
3434
from lsst.skymap import BaseSkyMap
3535
from matplotlib import gridspec
3636
from matplotlib.axes import Axes

python/lsst/analysis/tools/actions/vector/calcBinnedStats.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
import numpy as np
2929
from lsst.pex.config import Field
30-
from lsst.pipe.tasks.configurableActions import ConfigurableActionField
30+
from lsst.pex.config.configurableActions import ConfigurableActionField
3131

3232
from ...interfaces import KeyedData, KeyedDataAction, KeyedDataSchema, Scalar, Vector
3333
from ..keyedData.summaryStatistics import SummaryStatisticAction

python/lsst/analysis/tools/actions/vector/ellipticity.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
import numpy as np
3131
from lsst.pex.config import ChoiceField, Field, FieldValidationError
32-
from lsst.pipe.tasks.configurableActions import ConfigurableActionField
32+
from lsst.pex.config.configurableActions import ConfigurableActionField
3333

3434
from ...interfaces import KeyedData, KeyedDataSchema, Vector, VectorAction
3535

python/lsst/analysis/tools/actions/vector/vectorActions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import pandas as pd
4545
from astropy import units as u
4646
from lsst.pex.config import DictField, Field
47-
from lsst.pipe.tasks.configurableActions import ConfigurableActionField, ConfigurableActionStructField
47+
from lsst.pex.config.configurableActions import ConfigurableActionField, ConfigurableActionStructField
4848

4949
from ...interfaces import KeyedData, KeyedDataSchema, Vector, VectorAction
5050
from .selectors import VectorSelector

python/lsst/analysis/tools/analysisParts/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
from typing import Mapping
2727

2828
import astropy.units as apu
29+
from lsst.pex.config.configurableActions import ConfigurableActionStructField
2930
from lsst.pex.config.dictField import DictField
30-
from lsst.pipe.tasks.configurableActions import ConfigurableActionStructField
3131
from lsst.verify import Measurement
3232

3333
from ..actions.keyedData import KeyedDataSelectorAction

python/lsst/analysis/tools/analysisParts/shapeSizeFractional.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
)
2828

2929
from lsst.pex.config import Field
30-
from lsst.pipe.tasks.configurableActions import ConfigurableActionField
30+
from lsst.pex.config.configurableActions import ConfigurableActionField
3131

3232
from ..actions.keyedData import KeyedScalars
3333
from ..actions.plot.scatterplotWithTwoHists import ScatterPlotStatsAction

python/lsst/analysis/tools/contexts/_baseContext.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
from functools import partial, update_wrapper
3030
from typing import TYPE_CHECKING, Callable, Iterable, Union, cast, overload
3131

32-
from lsst.pipe.tasks.configurableActions import ConfigurableActionStruct
32+
from lsst.pex.config.configurableActions import ConfigurableActionStruct
3333

3434
if TYPE_CHECKING:
3535
from ..interfaces import AnalysisAction

python/lsst/analysis/tools/interfaces.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
import numpy as np
4848
from lsst.pex.config import Field
49-
from lsst.pipe.tasks.configurableActions import ConfigurableAction, ConfigurableActionField
49+
from lsst.pex.config.configurableActions import ConfigurableAction, ConfigurableActionField
5050
from lsst.verify import Measurement
5151
from matplotlib.figure import Figure
5252
from numpy.typing import NDArray

0 commit comments

Comments
 (0)