lsst-resources 30.0.0__tar.gz → 30.0.1rc1__tar.gz

{lsst_resources-30.0.0/python/lsst_resources.egg-info → lsst_resources-30.0.1rc1}/PKG-INFO

@@ -1,10 +1,11 @@
 Metadata-Version: 2.4
 Name: lsst-resources
-Version: 30.0.0
+Version: 30.0.1rc1
 Summary: An abstraction layer for reading and writing from URI file resources.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License-Expression: BSD-3-Clause
 Project-URL: Homepage, https://github.com/lsst/resources
+Project-URL: Source, https://github.com/lsst/resources
 Keywords: lsst
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent

{lsst_resources-30.0.0 → lsst_resources-30.0.1rc1}/pyproject.toml

@@ -28,6 +28,7 @@ requires-python = ">=3.11.0"
 
 [project.urls]
 "Homepage" = "https://github.com/lsst/resources"
+"Source" = "https://github.com/lsst/resources"
 
 [project.optional-dependencies]
 s3 = [

{lsst_resources-30.0.0 → lsst_resources-30.0.1rc1}/python/lsst/resources/eups.py

@@ -65,7 +65,7 @@ class EupsResourcePath(ProxiedResourcePath):
             # Must convert this path into a file URI.
             new_path = posixpath.join(os2posix(eups_path), os2posix(self.path.lstrip("/")))
             parsed = self._uri._replace(path=urllib.parse.quote(new_path), scheme="file", netloc="")
-            self._proxy = ResourcePath(parsed)
+            self._proxy = ResourcePath(parsed, forceDirectory=self.dirLike, forceAbsolute=True)
             return
 
         # If there is no _DIR env var we need to look for python package
@@ -89,7 +89,7 @@ class EupsResourcePath(ProxiedResourcePath):
             if proxy.exists():
                 self._proxy = proxy
                 if self.path:
-                    self._proxy = self._proxy.join(self.path.lstrip("/"))
+                    self._proxy = self._proxy.join(self.path.lstrip("/"), forceDirectory=self.dirLike)
                 log.debug(f"Found variant {variant}")
                 return
 

{lsst_resources-30.0.0 → lsst_resources-30.0.1rc1}/python/lsst/resources/version.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "30.0.0"
+__version__ = "30.0.1rc1"

{lsst_resources-30.0.0 → lsst_resources-30.0.1rc1/python/lsst_resources.egg-info}/PKG-INFO

@@ -1,10 +1,11 @@
 Metadata-Version: 2.4
 Name: lsst-resources
-Version: 30.0.0
+Version: 30.0.1rc1
 Summary: An abstraction layer for reading and writing from URI file resources.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License-Expression: BSD-3-Clause
 Project-URL: Homepage, https://github.com/lsst/resources
+Project-URL: Source, https://github.com/lsst/resources
 Keywords: lsst
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent

{lsst_resources-30.0.0 → lsst_resources-30.0.1rc1}/tests/test_eups.py

@@ -94,6 +94,7 @@ class EupsReadTestCase(unittest.TestCase):
         self.assertTrue(d.dirLike)
 
         d = self.root_uri.join("config/", forceDirectory=True)
+        self.assertTrue(d._proxy.dirLike)  # Ensure that dir-ness propagates to proxy.
         self.assertTrue(d.exists(), f"Check directory {d} exists")
         self.assertTrue(d.isdir())
 
@@ -149,6 +150,12 @@ class EupsReadTestCase(unittest.TestCase):
         resource = ResourcePath(f"{self.scheme}://{self.netloc}/")
         resources = set(ResourcePath.findFileResources([resource]))
 
+        # Make sure that walk() can run and knows this is a directory.
+        cfg = resource.join("config/")
+        _, dirs, files = next(cfg.walk())
+        self.assertEqual(dirs, [])
+        self.assertEqual(set(files), {"test.txt", "test2.yaml"})
+
         # Do not try to list all possible options. Files can move around
         # and cache files can appear.
         subset = {