lsst-daf-butler 29.2025.1300__tar.gz → 29.2025.1400__tar.gz

{lsst_daf_butler-29.2025.1300/python/lsst_daf_butler.egg-info → lsst_daf_butler-29.2025.1400}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-daf-butler
-Version: 29.2025.1300
+Version: 29.2025.1400
 Summary: An abstraction layer for reading and writing astronomical data to datastores.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License: BSD 3-Clause License

{lsst_daf_butler-29.2025.1300 → lsst_daf_butler-29.2025.1400}/python/lsst/daf/butler/queries/tree/__init__.py

@@ -30,10 +30,12 @@ from ._column_expression import *
 from ._column_literal import *
 from ._column_reference import *
 from ._column_set import *
+from ._predicate import InQuery as _InQuery
 from ._predicate import LogicalNot as _LogicalNot
 from ._predicate import *
 from ._query_tree import *
 
+_InQuery.model_rebuild()
 _LogicalNot.model_rebuild()
 
 Predicate.model_rebuild()

{lsst_daf_butler-29.2025.1300 → lsst_daf_butler-29.2025.1400}/python/lsst/daf/butler/registry/connectionString.py

@@ -27,7 +27,7 @@
 
 from __future__ import annotations
 
-__all__ = ("DB_AUTH_ENVVAR", "DB_AUTH_PATH", "ConnectionStringFactory")
+__all__ = ("ConnectionStringFactory",)
 
 from typing import TYPE_CHECKING
 
@@ -38,13 +38,6 @@ from lsst.utils.db_auth import DbAuth, DbAuthNotFoundError
 if TYPE_CHECKING:
     from ._config import RegistryConfig
 
-DB_AUTH_ENVVAR = "LSST_DB_AUTH"
-"""Default name of the environmental variable that will be used to locate DB
-credentials configuration file. """
-
-DB_AUTH_PATH = "~/.lsst/db-auth.yaml"
-"""Default path at which it is expected that DB credentials are found."""
-
 
 class ConnectionStringFactory:
     """Factory for `sqlalchemy.engine.url.URL` instances.
@@ -60,7 +53,7 @@ class ConnectionStringFactory:
     keys = ("username", "password", "host", "port", "database")
 
     @classmethod
-    def fromConfig(cls, registryConfig: RegistryConfig) -> url.URL:
+    def fromConfig(cls, registryConfig: RegistryConfig, *, db_auth_path: str | None = None) -> url.URL:
         """Parse the `db`, and, if they exist, username, password, host, port
         and database keys from the given config.
 
@@ -76,6 +69,8 @@ class ConnectionStringFactory:
         ----------
         registryConfig : `RegistryConfig`
             Registry configuration.
+        db_auth_path : `str`, optional
+            An alternative location of DbAuth file, mostly useful for tests.
 
         Returns
         -------
@@ -122,7 +117,7 @@ class ConnectionStringFactory:
 
         # Ignore when credentials are not set up, or when no matches are found
         try:
-            dbAuth = DbAuth(DB_AUTH_PATH, DB_AUTH_ENVVAR)
+            dbAuth = DbAuth(db_auth_path)
             auth = dbAuth.getAuth(
                 conStr.drivername, conStr.username, conStr.host, conStr.port, conStr.database
             )

lsst_daf_butler-29.2025.1400/python/lsst/daf/butler/version.py

@@ -0,0 +1,2 @@
+__all__ = ["__version__"]
+__version__ = "29.2025.1400"

{lsst_daf_butler-29.2025.1300 → lsst_daf_butler-29.2025.1400/python/lsst_daf_butler.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-daf-butler
-Version: 29.2025.1300
+Version: 29.2025.1400
 Summary: An abstraction layer for reading and writing astronomical data to datastores.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License: BSD 3-Clause License

{lsst_daf_butler-29.2025.1300 → lsst_daf_butler-29.2025.1400}/tests/test_connectionString.py

@@ -34,7 +34,6 @@ import shutil
 import tempfile
 import unittest
 
-import lsst.daf.butler.registry.connectionString as ConnectionStringModule
 from lsst.daf.butler.registry import RegistryConfig
 from lsst.daf.butler.registry.connectionString import ConnectionStringFactory
 from lsst.utils.db_auth import DbAuthError
@@ -50,22 +49,17 @@ class ConnectionStringBuilderTestCase(unittest.TestCase):
     credentialsFile = os.path.join(configDir, "db-auth.yaml")
 
     def setUp(self):
-        self.resetDbAuthPathValue = ConnectionStringModule.DB_AUTH_PATH
         temporaryCredentialsFile = self.enterContext(tempfile.NamedTemporaryFile()).name
         shutil.copyfile(self.credentialsFile, temporaryCredentialsFile)
         os.chmod(temporaryCredentialsFile, 0o600)
-        ConnectionStringModule.DB_AUTH_PATH = temporaryCredentialsFile
-
-    def tearDown(self):
-        ConnectionStringModule.DB_AUTH_PATH = self.resetDbAuthPathValue
+        self.db_auth_path = temporaryCredentialsFile
 
     def testBuilder(self):
         """Tests ConnectionStringFactory returns correct connection strings."""
         regConfigs = [RegistryConfig(os.path.join(self.configDir, name)) for name in self.configFiles]
 
-        conStrFactory = ConnectionStringFactory()
         for regConf, fileName in zip(regConfigs, self.configFiles, strict=True):
-            conStr = conStrFactory.fromConfig(regConf)
+            conStr = ConnectionStringFactory.fromConfig(regConf, db_auth_path=self.db_auth_path)
             with self.subTest(confFile=fileName):
                 self.assertEqual(
                     conStr.render_as_string(hide_password=False),
@@ -77,8 +71,7 @@ class ConnectionStringBuilderTestCase(unittest.TestCase):
         """Tests that relative and absolute paths are preserved."""
         regConf = RegistryConfig(os.path.join(self.configDir, "registryConf1.yaml"))
         regConf["db"] = "sqlite:///relative/path/conf1.sqlite3"
-        conStrFactory = ConnectionStringFactory()
-        conStr = conStrFactory.fromConfig(regConf)
+        conStr = ConnectionStringFactory.fromConfig(regConf, db_auth_path=self.db_auth_path)
         self.assertEqual(str(conStr), "sqlite:///relative/path/conf1.sqlite3")
 
     def testRaises(self):
@@ -87,11 +80,9 @@ class ConnectionStringBuilderTestCase(unittest.TestCase):
         # It will be created with the correct 600 permissions.
         with tempfile.NamedTemporaryFile(suffix=".yaml", mode="w") as temp_config:
             print("[", file=temp_config, flush=True)
-            ConnectionStringModule.DB_AUTH_PATH = os.path.join(temp_config.name)
             regConf = RegistryConfig(os.path.join(self.configDir, "registryConf2.yaml"))
-            conStrFactory = ConnectionStringFactory()
             with self.assertRaises(DbAuthError):
-                conStrFactory.fromConfig(regConf)
+                ConnectionStringFactory.fromConfig(regConf, db_auth_path=temp_config.name)
 
 
 if __name__ == "__main__":

lsst_daf_butler-29.2025.1300/python/lsst/daf/butler/version.py

@@ -1,2 +0,0 @@
-__all__ = ["__version__"]
-__version__ = "29.2025.1300"