daplapath 2.0.2__tar.gz → 2.0.3__tar.gz

{daplapath-2.0.2 → daplapath-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: daplapath
-Version: 2.0.2
+Version: 2.0.3
 Summary: A pathlib.Path class for dapla
 License: MIT
 Author: ort

{daplapath-2.0.2 → daplapath-2.0.3}/daplapath/path.py

@@ -29,9 +29,8 @@ try:
 except ImportError:
     pass
 
-
 # regex with the prefix '_v' followed by an integer of any length
-VERSION_PATTERN = r"_v(\d+)"
+VERSION_PATTERN = r"_v(\d+)\."
 VERSION_PREFIX = "_v"
 
 # regex with the prefix '_p' followed by four length integer (year) and OPTIONALLY month and date, separated by '-'
@@ -269,11 +268,16 @@ class Path(str, _PathBase):
         """Returns a PathSeries of all versions of the file."""
         files_in_folder: Iterable[Path] = self.parent.glob("**", recursive=False)
 
+        if self.version_number:
+            start, _, end = re.split(self._version_pattern, self)
+        else:
+            start, end = self.stem, self.suffix
+
         # create boolean mask. With numpy to make it work with both pandas and list
         arr = np.array(files_in_folder)
-        is_version_of_this_file = (
-            np_str_contains(arr, self.versionless_stem)
-        ) & np_str_endswith(arr, self.suffix)
+        is_version_of_this_file = (np_str_contains(arr, start)) & (
+            np_str_endswith(arr, end)
+        )
         if not include_versionless:
             is_version_of_this_file &= np_str_matches(arr, self._version_pattern)
 
@@ -505,7 +509,7 @@ class Path(str, _PathBase):
     @property
     def versionless_stem(self) -> str:
         """Return the file stem before the version pattern."""
-        return str(re.sub(self._version_pattern, "", self._path.stem))
+        return self.__class__(re.split(self._version_pattern, self._path.name)[0]).stem
 
     @property
     def parent(self) -> "Path":

{daplapath-2.0.2 → daplapath-2.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "daplapath"
-version = "2.0.2"
+version = "2.0.3"
 description = "A pathlib.Path class for dapla"
 authors = ["ort <ort@ssb.no>"]
 license = "MIT"