DM-13370: Rebrand as lsst.daf.butler

.gitignore

@@ -2,3 +2,9 @@
 version.py
 .cache
 tests/.tests
+tests/test_input_datastore/
+tests/test_output_datastore/
+.sconf_temp/
+.sconsign.dblite
+config.log
+ups/*.cfgc

SConstruct

@@ -1,4 +1,4 @@
 # -*- python -*-
 from lsst.sconsUtils import scripts
 
-scripts.BasicSConstruct("butler")
+scripts.BasicSConstruct("daf_butler")

examples/createTables.py

@@ -1,7 +1,7 @@
 from sqlalchemy import create_engine, LargeBinary
 from sqlalchemy.orm import sessionmaker
 
-from lsst.butler.schema import metadata
+from lsst.daf.butler.schema import metadata
 
 
 def createDatabase(dbname):

python/lsst/__init__.py

@@ -0,0 +1,3 @@
+import pkgutil
+import lsstimport
+__path__ = pkgutil.extend_path(__path__, __name__)

python/lsst/daf/__init__.py

@@ -0,0 +1,2 @@
+import pkgutil, lsstimport
+__path__ = pkgutil.extend_path(__path__, __name__)

python/lsst/butler/ci_hsc/hsc.py → python/lsst/daf/butler/ci_hsc/hsc.py

@@ -3,7 +3,7 @@
 
 import numpy as np
 
-from lsst.butler.core.units import Camera, PhysicalSensor, PhysicalFilter, AbstractFilter
+from lsst.daf.butler.core.units import Camera, PhysicalSensor, PhysicalFilter, AbstractFilter
 
 
 class HyperSuprimeCam(Camera):

python/lsst/butler/ci_hsc/ingest.py → python/lsst/daf/butler/ci_hsc/ingest.py

@@ -8,8 +8,8 @@
 from sqlalchemy.orm import sessionmaker
 
 from . import hsc
-from lsst.butler.core import units
-from lsst.butler.core.schema import metadata
+from lsst.daf.butler.core import units
+from lsst.daf.butler.core.schema import metadata
 
 
 CASTERS = {
@@ -22,7 +22,7 @@
 
 DATA_ROOT = os.path.join(
     os.path.split(__file__)[0],
-    "../../../../tests/data/ci_hsc"
+    "../../../../../tests/data/ci_hsc"
 )
 
 

python/lsst/butler/datastores/posixDatastore.py → python/lsst/daf/butler/datastores/posixDatastore.py

@@ -25,13 +25,13 @@
 
 from lsst.daf.persistence.safeFileIo import safeMakeDir
 
-from lsst.butler.core.datastore import DatastoreConfig, Datastore
-from lsst.butler.core.storageClass import StorageClass
-from lsst.butler.core.datasets import DatasetType
-from lsst.butler.core.location import Location, LocationFactory
-from lsst.butler.core.fileDescriptor import FileDescriptor
-from lsst.butler.core.formatter import FormatterFactory
-from lsst.butler.formatters.fitsCatalogFormatter import FitsCatalogFormatter
+from lsst.daf.butler.core.datastore import DatastoreConfig, Datastore
+from lsst.daf.butler.core.storageClass import StorageClass
+from lsst.daf.butler.core.datasets import DatasetType
+from lsst.daf.butler.core.location import Location, LocationFactory
+from lsst.daf.butler.core.fileDescriptor import FileDescriptor
+from lsst.daf.butler.core.formatter import FormatterFactory
+from lsst.daf.butler.formatters.fitsCatalogFormatter import FitsCatalogFormatter
 
 import yaml
 

python/lsst/butler/formatters/fitsCatalogFormatter.py → python/lsst/daf/butler/formatters/fitsCatalogFormatter.py

@@ -21,8 +21,8 @@
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
 
-from lsst.butler.core.formatter import Formatter
-from lsst.butler.core.fileDescriptor import FileDescriptor
+from lsst.daf.butler.core.formatter import Formatter
+from lsst.daf.butler.core.fileDescriptor import FileDescriptor
 
 
 class FitsCatalogFormatter(Formatter):

python/lsst/butler/registries/sqlRegistry.py → python/lsst/daf/butler/registries/sqlRegistry.py

@@ -26,13 +26,13 @@
 
 from lsst.daf.persistence import doImport
 
-from lsst.butler.core.schema import metadata, DatasetTypeTable, RunTable, QuantumTable, DatasetTable, DatasetCollectionsTable, DatasetConsumersTable, DatasetTypeUnitsTable
-from lsst.butler.core.datasets import DatasetType, DatasetHandle, DatasetRef, DatasetLabel
-from lsst.butler.core.run import Run
-from lsst.butler.core.quantum import Quantum
-from lsst.butler.core.units import DataUnit, DataUnitTypeSet
-from lsst.butler.core.storageClass import StorageClass
-from lsst.butler.core.registry import RegistryConfig, Registry
+from lsst.daf.butler.core.schema import metadata, DatasetTypeTable, RunTable, QuantumTable, DatasetTable, DatasetCollectionsTable, DatasetConsumersTable, DatasetTypeUnitsTable
+from lsst.daf.butler.core.datasets import DatasetType, DatasetHandle, DatasetRef, DatasetLabel
+from lsst.daf.butler.core.run import Run
+from lsst.daf.butler.core.quantum import Quantum
+from lsst.daf.butler.core.units import DataUnit, DataUnitTypeSet
+from lsst.daf.butler.core.storageClass import StorageClass
+from lsst.daf.butler.core.registry import RegistryConfig, Registry
 
 class SqlRegistryConfig(RegistryConfig):
     pass

tests/config/basic/butler.yaml

@@ -1,11 +1,11 @@
 run: "ingest"
 datastore:
-  cls: 'lsst.butler.datastores.posixDatastore.PosixDatastore'
+  cls: 'lsst.daf.butler.datastores.posixDatastore.PosixDatastore'
   root: './butler_test_repository'
   create: true
   formatters:
-    SourceCatalog: "lsst.butler.formatters.fitsCatalogFormatter.FitsCatalogFormatter"
+    SourceCatalog: "lsst.daf.butler.formatters.fitsCatalogFormatter.FitsCatalogFormatter"
 registry:
-  cls: 'lsst.butler.registries.sqlRegistry.SqlRegistry'
+  cls: 'lsst.daf.butler.registries.sqlRegistry.SqlRegistry'
   dbname: 'sqlite:///:memory:'
   id: 0

tests/data/ci_hsc/dump.py

@@ -17,7 +17,7 @@
 from lsst.daf.base import DateTime
 from lsst.sphgeom import ConvexPolygon
 from lsst.daf.persistence import Butler
-from lsst.butler.regions import makeBoxWcsRegion
+from lsst.daf.butler.regions import makeBoxWcsRegion
 
 
 DATA_ROOT = os.path.split(__file__)[0]

tests/test_butler.py

@@ -26,13 +26,13 @@
 import datetime
 
 import lsst.utils.tests
-from lsst.butler.butler import ButlerConfig, Butler
-from lsst.butler.core.registry import Registry
-from lsst.butler.datastores.posixDatastore import PosixDatastore
+from lsst.daf.butler.butler import ButlerConfig, Butler
+from lsst.daf.butler.core.registry import Registry
+from lsst.daf.butler.datastores.posixDatastore import PosixDatastore
 
-from lsst.butler.core.datasets import DatasetType, DatasetLabel
-from lsst.butler.core.units import Camera, AbstractFilter, PhysicalFilter, PhysicalSensor, Visit, ObservedSensor
-from lsst.butler.core.storageClass import SourceCatalog
+from lsst.daf.butler.core.datasets import DatasetType, DatasetLabel
+from lsst.daf.butler.core.units import Camera, AbstractFilter, PhysicalFilter, PhysicalSensor, Visit, ObservedSensor
+from lsst.daf.butler.core.storageClass import SourceCatalog
 
 import datasetsHelper
 

tests/test_hsc.py

@@ -23,14 +23,14 @@
 
 import unittest
 
-import lsst.butler.ci_hsc
+import lsst.daf.butler.ci_hsc
 
 
 class TestDataTestCase(unittest.TestCase):
     """A test case for the ci_hsc Registry test data."""
 
     def setUp(self):
-        self.db = lsst.butler.ci_hsc.ingest.run(":memory:", create=True)
+        self.db = lsst.daf.butler.ci_hsc.ingest.run(":memory:", create=True)
 
     def tearDown(self):
         self.db.close()

tests/test_posixDatastore.py

@@ -27,8 +27,8 @@
 import lsst.utils.tests
 import lsst.afw.table
 
-from lsst.butler.datastores.posixDatastore import PosixDatastore, DatastoreConfig
-from lsst.butler.core.storageClass import SourceCatalog
+from lsst.daf.butler.datastores.posixDatastore import PosixDatastore, DatastoreConfig
+from lsst.daf.butler.core.storageClass import SourceCatalog
 
 import datasetsHelper
 

tests/test_registry.py

@@ -27,12 +27,12 @@
 from collections import OrderedDict
 
 import lsst.utils.tests
-from lsst.butler.registries.sqlRegistry import SqlRegistry as Registry
-from lsst.butler.core.datasets import DatasetType, DatasetRef, DatasetLabel, DatasetHandle
-from lsst.butler.core.run import Run
-from lsst.butler.core.quantum import Quantum
-from lsst.butler.core.units import DataUnitTypeSet, Camera, AbstractFilter, PhysicalFilter, PhysicalSensor, Visit, ObservedSensor, Snap, VisitRange, SkyMap, Tract, Patch
-from lsst.butler.core.storageClass import Image
+from lsst.daf.butler.registries.sqlRegistry import SqlRegistry as Registry
+from lsst.daf.butler.core.datasets import DatasetType, DatasetRef, DatasetLabel, DatasetHandle
+from lsst.daf.butler.core.run import Run
+from lsst.daf.butler.core.quantum import Quantum
+from lsst.daf.butler.core.units import DataUnitTypeSet, Camera, AbstractFilter, PhysicalFilter, PhysicalSensor, Visit, ObservedSensor, Snap, VisitRange, SkyMap, Tract, Patch
+from lsst.daf.butler.core.storageClass import Image
 
 
 class RegistryTestCase(lsst.utils.tests.TestCase):

ups/butler.table → ups/daf_butler.table

@@ -3,6 +3,7 @@ setupRequired(sqlalchemy)
 setupRequired(numpy)
 setupRequired(scons)
 setupRequired(sconsUtils)
+setupRequired(afw)
 
 envPrepend(LD_LIBRARY_PATH, ${PRODUCT_DIR}/lib)
 envPrepend(DYLD_LIBRARY_PATH, ${PRODUCT_DIR}/lib)