diff --git a/tests/test_simpleButler.py b/tests/test_simpleButler.py index e6787a7419..ba0b117320 100644 --- a/tests/test_simpleButler.py +++ b/tests/test_simpleButler.py @@ -26,7 +26,6 @@ import re import tempfile import unittest -import uuid from typing import Any try: @@ -35,7 +34,16 @@ np = None import astropy.time -from lsst.daf.butler import Butler, ButlerConfig, CollectionType, DatasetRef, DatasetType, Registry, Timespan +from lsst.daf.butler import ( + Butler, + ButlerConfig, + CollectionType, + DatasetId, + DatasetRef, + DatasetType, + Registry, + Timespan, +) from lsst.daf.butler.registry import RegistryConfig, RegistryDefaults from lsst.daf.butler.tests import DatastoreMock from lsst.daf.butler.tests.utils import makeTestTempDir, removeTestTempDir @@ -53,7 +61,6 @@ class SimpleButlerTestCase(unittest.TestCase): "lsst.daf.butler.registry.datasets.byDimensions.ByDimensionsDatasetRecordStorageManagerUUID" ) datasetsImportFile = "datasets-uuid.yaml" - datasetsIdType = uuid.UUID def setUp(self): self.root = makeTestTempDir(TESTDIR) @@ -73,11 +80,7 @@ def makeButler(self, **kwargs: Any) -> Butler: # have to make a registry first registryConfig = RegistryConfig(config.get("registry")) - if self.datasetsIdType is int: - with self.assertWarns(FutureWarning): - Registry.createFromConfig(registryConfig) - else: - Registry.createFromConfig(registryConfig) + Registry.createFromConfig(registryConfig) butler = Butler(config, **kwargs) DatastoreMock.apply(butler) @@ -158,8 +161,8 @@ def testDatasetTransfers(self): butler2.import_(filename=file.name) datasets1 = list(butler1.registry.queryDatasets(..., collections=...)) datasets2 = list(butler2.registry.queryDatasets(..., collections=...)) - self.assertTrue(all(isinstance(ref.id, self.datasetsIdType) for ref in datasets1)) - self.assertTrue(all(isinstance(ref.id, self.datasetsIdType) for ref in datasets2)) + self.assertTrue(all(isinstance(ref.id, DatasetId) for ref in datasets1)) + self.assertTrue(all(isinstance(ref.id, DatasetId) for ref in datasets2)) self.assertCountEqual( [self.comparableRef(ref) for ref in datasets1], [self.comparableRef(ref) for ref in datasets2], @@ -184,8 +187,8 @@ def testImportTwice(self): butler2.import_(filename=file.name) datasets1 = list(butler1.registry.queryDatasets(..., collections=...)) datasets2 = list(butler2.registry.queryDatasets(..., collections=...)) - self.assertTrue(all(isinstance(ref.id, self.datasetsIdType) for ref in datasets1)) - self.assertTrue(all(isinstance(ref.id, self.datasetsIdType) for ref in datasets2)) + self.assertTrue(all(isinstance(ref.id, DatasetId) for ref in datasets1)) + self.assertTrue(all(isinstance(ref.id, DatasetId) for ref in datasets2)) self.assertCountEqual( [self.comparableRef(ref) for ref in datasets1], [self.comparableRef(ref) for ref in datasets2],