v440 2.0.0.dev59__tar.gz → 2.0.0.dev60__tar.gz

{v440-2.0.0.dev59/src/v440.egg-info → v440-2.0.0.dev60}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: v440
-Version: 2.0.0.dev59
+Version: 2.0.0.dev60
 Summary: This project provides mutable version objects in accordance with PEP440.
 Author-email: Johannes <johannes.programming@gmail.com>
 License: The MIT License (MIT)

{v440-2.0.0.dev59 → v440-2.0.0.dev60}/pyproject.toml

@@ -36,7 +36,7 @@ keywords = []
 name = "v440"
 readme = "README.rst"
 requires-python = ">=3.11"
-version = "2.0.0.dev59"
+version = "2.0.0.dev60"
 
 [project.license]
 file = "LICENSE.txt"

{v440-2.0.0.dev59 → v440-2.0.0.dev60}/src/v440/_utils/BaseList.py

@@ -7,6 +7,7 @@ import setdoc
 import unhash
 from datarepr import datarepr
 
+from v440._utils.utils import guard
 from v440.core.VersionError import VersionError
 
 
@@ -14,6 +15,8 @@ from v440.core.VersionError import VersionError
 class BaseList(collections.abc.Collection):
     __slots__ = ()
 
+    string: str
+
     @abstractmethod
     @setdoc.basic
     def __bool__(self: Self) -> bool: ...
@@ -122,6 +125,9 @@ class BaseList(collections.abc.Collection):
     @abstractmethod
     def _format(self: Self, format_spec: str) -> str: ...
 
+    @abstractmethod
+    def _string_fset(self: Self, value: str) -> None: ...
+
     @setdoc.basic
     def copy(self: Self) -> Self:
         return type(self)(self)
@@ -138,3 +144,12 @@ class BaseList(collections.abc.Collection):
     def index(self: Self, *args: Any) -> None:
         "This method returns the index of the first occurence."
         return self.data.index(*args)
+
+    @property
+    def string(self: Self) -> str:
+        return self._format("")
+
+    @string.setter
+    @guard
+    def string(self: Self, value: Any) -> None:
+        self._string_fset(str(value))

{v440-2.0.0.dev59 → v440-2.0.0.dev60}/src/v440/_utils/SlotList.py

@@ -12,6 +12,7 @@ class SlotList(BaseList):
     __slots__ = ()
 
     data: tuple
+    string: str
 
     @setdoc.basic
     def __bool__(self: Self) -> bool:

{v440-2.0.0.dev59 → v440-2.0.0.dev60}/src/v440/_utils/VList.py

@@ -12,6 +12,7 @@ class VList(BaseList):
 
     __slots__ = ("_data",)
     data: tuple
+    string: str
 
     @setdoc.basic
     def __add__(self: Self, other: Any) -> Self:

{v440-2.0.0.dev59 → v440-2.0.0.dev60}/src/v440/core/Base.py

@@ -71,6 +71,7 @@ class Base(SlotList):
     __slots__ = ("_epoch", "_release")
 
     data: tuple
+    string: str
     epoch: int
     release: Release
 
@@ -87,6 +88,14 @@ class Base(SlotList):
         ans += format(self.release, format_spec)
         return ans
 
+    def _string_fset(self: Self, value: str) -> None:
+        parsed: Iterable
+        if "!" in value:
+            parsed = value.split("!")
+        else:
+            parsed = 0, value
+        self.epoch, self.release.string = parsed
+
     @property
     @setdoc.basic
     def data(self: Self) -> tuple:

{v440-2.0.0.dev59 → v440-2.0.0.dev60}/src/v440/core/Local.py

@@ -50,6 +50,7 @@ class Local(VList):
     __slots__ = ()
 
     data: tuple[int | str]
+    string: str
 
     @setdoc.basic
     def __init__(self: Any, data: Any = None) -> None:
@@ -64,6 +65,14 @@ class Local(VList):
     def _sort(cls: type, value: Any) -> tuple[bool, int | str]:
         return type(value) is int, value
 
+    def _string_fset(self: Self, value: str) -> None:
+        v: str = value
+        if v.startswith("+"):
+            v = v[1:]
+        v = v.replace("_", ".")
+        v = v.replace("-", ".")
+        self.data = v.split(".")
+
     @property
     @setdoc.basic
     def data(self: Self) -> tuple[int | str]:

{v440-2.0.0.dev59 → v440-2.0.0.dev60}/src/v440/core/Public.py

@@ -43,6 +43,7 @@ class Public(SlotList):
     __slots__ = ("_base", "_qual")
 
     data: tuple
+    string: str
     base: Base
     qual: Qual
 
@@ -55,6 +56,11 @@ class Public(SlotList):
     def _format(self: Self, format_spec: str) -> str:
         return format(self.base, format_spec) + format(self.qual)
 
+    def _string_fset(self: Self, value: str) -> None:
+        match: Any = Pattern.PUBLIC.leftbound.search(value)
+        self.base.string = value[: match.end()]
+        self.qual.string = value[match.end() :]
+
     @property
     def base(self: Self) -> Base:
         "This property represents the version base."

{v440-2.0.0.dev59 → v440-2.0.0.dev60}/src/v440/core/Qual.py

@@ -16,6 +16,7 @@ class Qual(SlotList):
     __slots__ = ("_prephase", "_presubphase", "_post", "_dev")
 
     data: tuple
+    string: str
     pre: tuple
     prephase: Optional[str]
     presubphase: Optional[int]
@@ -62,6 +63,27 @@ class Qual(SlotList):
             ans += ".dev%s" % self.dev
         return ans
 
+    def _string_fset(self: Self, value: str) -> None:
+        v: str = value
+        m: Any
+        x: Any
+        y: Any
+        while v:
+            m = Pattern.QUALIFIERS.leftbound.search(v)
+            v = v[m.end() :]
+            if m.group("N"):
+                self.post = m.group("N")
+                continue
+            x = m.group("l")
+            y = m.group("n")
+            if x == "dev":
+                self.dev = y
+                continue
+            if x in ("post", "r", "rev"):
+                self.post = y
+                continue
+            self.pre = x, y
+
     @property
     @setdoc.basic
     def data(self: Self) -> tuple:

{v440-2.0.0.dev59 → v440-2.0.0.dev60}/src/v440/core/Release.py

@@ -104,6 +104,7 @@ class Release(VList):
     __slots__ = ()
 
     data: tuple[int]
+    string: str
     major: int
     minor: int
     micro: int
@@ -240,6 +241,12 @@ class Release(VList):
     def _sort(cls: type, value: int) -> int:
         return value
 
+    def _string_fset(self: Self, value: str) -> None:
+        v: str = value
+        v = v.replace("_", ".")
+        v = v.replace("-", ".")
+        self.data = v.split(".")
+
     def bump(self: Self, index: SupportsIndex = -1, amount: SupportsIndex = 1) -> None:
         i: int = operator.index(index)
         a: int = operator.index(amount)

{v440-2.0.0.dev59 → v440-2.0.0.dev60}/src/v440/core/Version.py

@@ -43,6 +43,7 @@ class Version(SlotList):
     __slots__ = ("_public", "_local")
 
     data: tuple
+    string: str
     local: Local
     public: Public
 
@@ -58,6 +59,14 @@ class Version(SlotList):
             ans += "+" + format(self.local)
         return ans
 
+    def _string_fset(self: Self, value: str) -> None:
+        parsed: Iterable
+        if "+" in value:
+            parsed = value.split("+")
+        else:
+            parsed = value, ""
+        self.public.string, self.local.string = parsed
+
     @property
     @setdoc.basic
     def data(self: Self) -> tuple:

{v440-2.0.0.dev59 → v440-2.0.0.dev60}/src/v440/tests/test_version.py

@@ -105,27 +105,41 @@ class TestExample(unittest.TestCase):
         v.public.base.release.micro = 4
         self.assertEqual(str(v), "2.64.4")  # Further modified version
 
-    def test_example_3(self: Self) -> None:
-        t: list = [
-            [Version, str],
-            [str, Version],
-            [Version, Version],
-        ]
-        X: type
-        Y: type
-        x: Any
-        y: Any
-        for X, Y in t:
-            x = X("1.6.3")
-            y = Y("1.6.3")
-            self.assertEqual(str(x), "1.6.3")  # x
-            self.assertEqual(str(y), "1.6.4")  # y
-            self.assertFalse(x == y)  # x == y gives False
-            self.assertTrue(x != y)  # x != y gives True
-            self.assertFalse(x >= y)  # x >= y gives False
-            self.assertTrue(x <= y)  # x <= y gives True
-            self.assertFalse(x > y)  # x > y gives False
-            self.assertTrue(x < y)  # x < y gives True
+    def test_example_3a(self: Self) -> None:
+        v1: Version = Version("1.6.3")
+        v2: str = "1.6.4"
+        self.assertEqual(str(v1), "1.6.3")  # v1
+        self.assertEqual(str(v2), "1.6.4")  # v2
+        self.assertFalse(v1 == v2)  # v1 == v2 gives False
+        self.assertTrue(v1 != v2)  # v1 != v2 gives True
+        self.assertFalse(v1 >= v2)  # v1 >= v2 gives False
+        self.assertTrue(v1 <= v2)  # v1 <= v2 gives True
+        self.assertFalse(v1 > v2)  # v1 > v2 gives False
+        self.assertTrue(v1 < v2)  # v1 < v2 gives True
+
+    def test_example_3b(self: Self) -> None:
+        v1: str = "1.6.3"
+        v2: Version = Version("1.6.4")
+        self.assertEqual(str(v1), "1.6.3")  # v1
+        self.assertEqual(str(v2), "1.6.4")  # v2
+        self.assertFalse(v1 == v2)  # v1 == v2 gives False
+        self.assertTrue(v1 != v2)  # v1 != v2 gives True
+        self.assertFalse(v1 >= v2)  # v1 >= v2 gives False
+        self.assertTrue(v1 <= v2)  # v1 <= v2 gives True
+        self.assertFalse(v1 > v2)  # v1 > v2 gives False
+        self.assertTrue(v1 < v2)  # v1 < v2 gives True
+
+    def test_example_3c(self: Self) -> None:
+        v1: Version = Version("1.6.3")
+        v2: Version = Version("1.6.4")
+        self.assertEqual(str(v1), "1.6.3")  # v1
+        self.assertEqual(str(v2), "1.6.4")  # v2
+        self.assertFalse(v1 == v2)  # v1 == v2 gives False
+        self.assertTrue(v1 != v2)  # v1 != v2 gives True
+        self.assertFalse(v1 >= v2)  # v1 >= v2 gives False
+        self.assertTrue(v1 <= v2)  # v1 <= v2 gives True
+        self.assertFalse(v1 > v2)  # v1 > v2 gives False
+        self.assertTrue(v1 < v2)  # v1 < v2 gives True
 
     def test_example_4(self: Self) -> None:
         v: Version = Version("2.5.3.9")

{v440-2.0.0.dev59 → v440-2.0.0.dev60/src/v440.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: v440
-Version: 2.0.0.dev59
+Version: 2.0.0.dev60
 Summary: This project provides mutable version objects in accordance with PEP440.
 Author-email: Johannes <johannes.programming@gmail.com>
 License: The MIT License (MIT)