Merge pull request #231 from lsst/tickets/DM-21855

DM-21855: Move daf.butler.instrument to obs_base
lsst · Nov 9, 2019 · 3e1980d · 3e1980d
2 parents dcafaed + a162a0d
commit 3e1980d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/python/lsst/obs/subaru/gen3/hsc/instrument.py b/python/lsst/obs/subaru/gen3/hsc/instrument.py
@@ -33,8 +33,8 @@
 
 from lsst.utils import getPackageDir
 from lsst.afw.cameraGeom import makeCameraFromPath, CameraConfig
-from lsst.daf.butler.instrument import Instrument, addUnboundedCalibrationLabel
 from lsst.daf.butler import DatasetType, DataCoordinate, FileDataset, DatasetRef
+from lsst.obs.base import Instrument, addUnboundedCalibrationLabel
 from lsst.pipe.tasks.read_defects import read_all_defects
 
 from lsst.obs.hsc.hscPupil import HscPupilFactory

diff --git a/tests/test_instrument.py b/tests/test_instrument.py
@@ -26,7 +26,7 @@
 
 import lsst.utils.tests
 import lsst.obs.subaru.gen3.hsc
-from lsst.daf.butler.instrument_tests import InstrumentTests, InstrumentTestData
+from lsst.obs.base.instrument_tests import InstrumentTests, InstrumentTestData
 
 
 class TestHyperSuprimeCam(InstrumentTests, lsst.utils.tests.TestCase):