lsst-resources 29.2025.3200__tar.gz → 29.2025.3300__tar.gz

{lsst_resources-29.2025.3200/python/lsst_resources.egg-info → lsst_resources-29.2025.3300}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-resources
-Version: 29.2025.3200
+Version: 29.2025.3300
 Summary: An abstraction layer for reading and writing from URI file resources.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License: BSD 3-Clause License

{lsst_resources-29.2025.3200 → lsst_resources-29.2025.3300}/python/lsst/resources/http.py

@@ -430,9 +430,7 @@ def _get_dav_and_server_headers(path: ResourcePath | str) -> tuple[str | None, s
         config = HttpResourcePathConfig()
         with SessionStore(config=config).get(path) as session:
             resp = session.options(
-                str(path),
-                stream=False,
-                timeout=config.timeout,
+                str(path), stream=False, timeout=config.timeout, headers=path._extra_headers
             )
 
             dav_header = server_header = None
@@ -1380,16 +1378,12 @@ class HttpResourcePath(ResourcePath):
         path : `str`
             A path that can be opened by the file system object.
         """
-        if (
-            fsspec is None
-            or not self.is_webdav_endpoint
-            or self.server not in HttpResourcePath.SUPPORTED_URL_SIGNERS
-        ):
-            if self.scheme.startswith("dav") and fsspec:
-                # Not webdav so convert to http.
-                return fsspec.url_to_fs(self.geturl())
+        if fsspec is None:
             return super().to_fsspec()
 
+        if not self.is_webdav_endpoint or self.server not in HttpResourcePath.SUPPORTED_URL_SIGNERS:
+            return fsspec.url_to_fs(self.geturl(), client_kwargs={"headers": self._extra_headers})
+
         if self.isdir():
             raise NotImplementedError(
                 f"method HttpResourcePath.to_fsspec() not implemented for directory {self}"

lsst_resources-29.2025.3300/python/lsst/resources/version.py

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

{lsst_resources-29.2025.3200 → lsst_resources-29.2025.3300/python/lsst_resources.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-resources
-Version: 29.2025.3200
+Version: 29.2025.3300
 Summary: An abstraction layer for reading and writing from URI file resources.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License: BSD 3-Clause License

{lsst_resources-29.2025.3200 → lsst_resources-29.2025.3300}/tests/test_http.py

@@ -104,6 +104,17 @@ class GenericHttpTestCase(GenericTestCase, unittest.TestCase):
         )
         self.assertEqual(path.read(), b"test")
 
+        # Make sure that headers are added to fsspec.
+        # This triggers logic for "webdav" vs "not-webdav" that does an OPTIONS
+        # request, so we need to check that too.
+        responses.add(
+            responses.OPTIONS,
+            "http://test.example/",
+            match=[responses.matchers.header_matcher({"Authorization": "Bearer my-token"})],
+        )
+        fs, _ = path.to_fsspec()
+        self.assertEqual(fs.client_kwargs.get("headers"), {"Authorization": "Bearer my-token"})
+
         # Extra headers should be preserved through pickle, to ensure that
         # `mtransfer` and similar methods work in multi-process mode.
         dump = pickle.dumps(path)

lsst_resources-29.2025.3200/python/lsst/resources/version.py

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