lsst-resources 29.2025.3000__py3-none-any.whl → 29.2025.3100__py3-none-any.whl

lsst/resources/_resourcePath.py

@@ -549,7 +549,7 @@ class ResourcePath:  # numpydoc ignore=PR02
             return self, ""
 
         head, tail = self._pathModule.split(self.path)
-        headuri = self._uri._replace(path=head)
+        headuri = self._uri._replace(path=head, fragment="", query="", params="")
 
         # The file part should never include quoted metacharacters
         tail = urllib.parse.unquote(tail)
@@ -619,7 +619,7 @@ class ResourcePath:  # numpydoc ignore=PR02
         # regardless of the presence of a trailing separator
         originalPath = self._pathLib(self.path)
         parentPath = originalPath.parent
-        return self.replace(path=str(parentPath), forceDirectory=True)
+        return self.replace(path=str(parentPath), forceDirectory=True, fragment="", query="", params="")
 
     def replace(
         self, forceDirectory: bool | None = None, isTemporary: bool = False, **kwargs: Any
@@ -866,6 +866,8 @@ class ResourcePath:  # numpydoc ignore=PR02
             forceDirectory=forceDirectory,
             isTemporary=isTemporary,
             fragment=path_uri.fragment,
+            query=path_uri.query,
+            params=path_uri.params,
         )
 
     def relative_to(self, other: ResourcePath) -> str | None:

lsst/resources/tests.py

@@ -392,6 +392,14 @@ class GenericTestCase(_GenericTestCase):
         self.assertEqual(child_file.parent().parent(), parent)
         self.assertEqual(child_subdir.dirname(), child_subdir)
 
+        # Make sure that the parent doesn't retain any fragment from the
+        # child.
+        child_fragment = child_subdir.join("a.txt#fragment")
+        self.assertEqual(child_fragment.fragment, "fragment")
+        fragment_parent = child_fragment.parent()
+        self.assertEqual(fragment_parent.fragment, "")
+        self.assertTrue(str(fragment_parent).endswith("/"))
+
     def test_escapes(self) -> None:
         """Special characters in file paths."""
         src = self.root_uri.join("bbb/???/test.txt")
@@ -496,6 +504,13 @@ class GenericTestCase(_GenericTestCase):
         self.assertEqual(fnew3.fragment, "fragment")
         self.assertEqual(fnew3.basename(), "b.txt", msg=f"Got: {fnew3._uri}")
 
+        # Check that fragment on the directory is dropped on join.
+        frag_dir = add_dir.join("subdir/#dir_fragment")
+        self.assertEqual(frag_dir.fragment, "dir_fragment")
+        fnew4 = frag_dir.join("a.txt")
+        self.assertEqual(fnew4.fragment, "")
+        self.assertTrue(str(fnew4).endswith("/a.txt"))
+
         # Join a resource path.
         subpath = ResourcePath("a/b.txt#fragment2", forceAbsolute=False, forceDirectory=False)
         fnew3 = root.join(subpath)

lsst/resources/version.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "29.2025.3000"
+__version__ = "29.2025.3100"

{lsst_resources-29.2025.3000.dist-info → lsst_resources-29.2025.3100.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-resources
-Version: 29.2025.3000
+Version: 29.2025.3100
 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.3000.dist-info → lsst_resources-29.2025.3100.dist-info}/RECORD

@@ -1,6 +1,6 @@
 lsst/__init__.py,sha256=9I6UQ9gj-ZcPlvsa0OPBo76UujxXVehVzw9yMAOQvyM,466
 lsst/resources/__init__.py,sha256=BDj6uokvd0ZQNGl-Xgz5gZd83Z0L2gFqGSk0KJpylP8,778
-lsst/resources/_resourcePath.py,sha256=oimnY99a8BBMKahtQxlsGl29fNsM1w5_IZ9mBpbRgzs,73673
+lsst/resources/_resourcePath.py,sha256=lv10VASIk003mObVXR3gyCbXS-lJsU_LgXNZS7pGN9c,73811
 lsst/resources/dav.py,sha256=ZYP7PnQzS7epm5woxnn1_t1XhsPQZm6_q1kv8baUfn4,32100
 lsst/resources/davutils.py,sha256=xALuMRSvYroqn_Jz6bjnj43b4OgOgCJtNW49kyTtuiw,97983
 lsst/resources/file.py,sha256=lrwhsg4y1TKWNLymJ2ZfVSj2yGAbv15pk7z7AkhBq9M,24352
@@ -13,19 +13,19 @@ lsst/resources/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lsst/resources/s3.py,sha256=NGJPM4BjtqFIPvg9vbp_blrIRt009NbOm06cr65Wqmw,29662
 lsst/resources/s3utils.py,sha256=ojWf9BPrK9mhGQ8jvs4_8Nsqf9360e79U5FnPTxe24A,14576
 lsst/resources/schemeless.py,sha256=GfJcKzZ0XIeepfQdW4HPZWiZlSp_ej0SEtSiJTrDUQs,10666
-lsst/resources/tests.py,sha256=G43eaajzIaA6D-zz63vsgYJTeSy9Bso-my_Dh4X34CE,44966
+lsst/resources/tests.py,sha256=KAlwkRlLk9h3qWp07-5bLz9AuSkPOODFv5k49rRR5w0,45668
 lsst/resources/utils.py,sha256=6O3Mq7JbPEtqyD2lM77pRpwcPMfV5SxiNMknw-F2vNs,8097
-lsst/resources/version.py,sha256=GKnpddvvmGJ8yPsnT--mhT32jeA31BaGZsJcw6cTK7k,55
+lsst/resources/version.py,sha256=ieqM-HeyuKM3_4zduaocPJMVYG02uci4CjCfGX5PncI,55
 lsst/resources/_resourceHandles/__init__.py,sha256=zOcZ8gVEBdAWcHJaZabA8Vdq-wAVcxjbmA_1b1IWM6M,76
 lsst/resources/_resourceHandles/_baseResourceHandle.py,sha256=lQwxDOmFUNJndTxsjpz-HxrQBL0L-z4aXQocHdOEI7c,4676
 lsst/resources/_resourceHandles/_davResourceHandle.py,sha256=12X5-K5KqzG4EV78ZkIIrjcZcFroXy3Y2JQ_N-SDqF0,6616
 lsst/resources/_resourceHandles/_fileResourceHandle.py,sha256=2nC8tfP_ynAfjpzrtkw_1ahx1CuMEFpZ5mLmofSShUk,3676
 lsst/resources/_resourceHandles/_httpResourceHandle.py,sha256=Yami8IVGeru4bLQCag-OvGG0ltz1qyEg57FY4IEB87Y,10995
 lsst/resources/_resourceHandles/_s3ResourceHandle.py,sha256=Cp-eBtptskbmthy3DwLKPpYPLvU_lrqtK10X37inHt0,12406
-lsst_resources-29.2025.3000.dist-info/licenses/COPYRIGHT,sha256=yazVsoMmFwhiw5itGrdT4YPmXbpsQyUFjlpOyZIa77M,148
-lsst_resources-29.2025.3000.dist-info/licenses/LICENSE,sha256=7wrtgl8meQ0_RIuv2TjIKpAnNrl-ODH-QLwyHe9citI,1516
-lsst_resources-29.2025.3000.dist-info/METADATA,sha256=eZY3oPJ4FQY63OQseJ123Ir2NahUbydki-BxC_AQLio,2237
-lsst_resources-29.2025.3000.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lsst_resources-29.2025.3000.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
-lsst_resources-29.2025.3000.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-lsst_resources-29.2025.3000.dist-info/RECORD,,
+lsst_resources-29.2025.3100.dist-info/licenses/COPYRIGHT,sha256=yazVsoMmFwhiw5itGrdT4YPmXbpsQyUFjlpOyZIa77M,148
+lsst_resources-29.2025.3100.dist-info/licenses/LICENSE,sha256=7wrtgl8meQ0_RIuv2TjIKpAnNrl-ODH-QLwyHe9citI,1516
+lsst_resources-29.2025.3100.dist-info/METADATA,sha256=3hOouTcTcI2aLmLjlR2TgccBLug3kkR41NyrVBMIed8,2237
+lsst_resources-29.2025.3100.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lsst_resources-29.2025.3100.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
+lsst_resources-29.2025.3100.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lsst_resources-29.2025.3100.dist-info/RECORD,,