Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DM-42489: Update tests for changes in Apdb.makeSchema interface #192

Merged
merged 1 commit into from
Feb 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/test_loadDiaCatalogs.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import yaml

from lsst.ap.association import LoadDiaCatalogsTask, LoadDiaCatalogsConfig
from lsst.dax.apdb import ApdbSql, ApdbSqlConfig, ApdbTables
from lsst.dax.apdb import Apdb, ApdbSql, ApdbSqlConfig, ApdbTables
from lsst.utils import getPackageDir
import lsst.utils.tests
from utils_tests import makeExposure, makeDiaObjects, makeDiaSources, makeDiaForcedSources
Expand Down Expand Up @@ -64,8 +64,8 @@ def setUp(self):
self.apdbConfig.dia_object_index = "baseline"
self.apdbConfig.dia_object_columns = []

Apdb.makeSchema(self.apdbConfig)
self.apdb = ApdbSql(config=self.apdbConfig)
self.apdb.makeSchema()

self.exposure = makeExposure(False, False)

Expand Down
4 changes: 2 additions & 2 deletions tests/test_packageAlerts.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
from lsst.afw.cameraGeom.testUtils import DetectorWrapper
import lsst.afw.image as afwImage
import lsst.daf.base as dafBase
from lsst.dax.apdb import ApdbSql, ApdbSqlConfig
from lsst.dax.apdb import Apdb, ApdbSql, ApdbSqlConfig
import lsst.geom as geom
import lsst.meas.base.tests
from lsst.sphgeom import Box
Expand Down Expand Up @@ -71,8 +71,8 @@ def _roundTripThroughApdb(objects, sources, forcedSources, dateTime):
apdbConfig.dia_object_index = "baseline"
apdbConfig.dia_object_columns = []

Apdb.makeSchema(apdbConfig)
apdb = ApdbSql(config=apdbConfig)
apdb.makeSchema()

wholeSky = Box.full()
diaObjects = pd.concat([apdb.getDiaObjects(wholeSky), objects])
Expand Down