v440 2.0.0.dev110__tar.gz → 2.0.0.dev112__tar.gz

{v440-2.0.0.dev110/src/v440.egg-info → v440-2.0.0.dev112}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: v440
-Version: 2.0.0.dev110
+Version: 2.0.0.dev112
 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.dev110 → v440-2.0.0.dev112}/pyproject.toml

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

v440-2.0.0.dev112/src/v440/_utils/qualparse/__init__.py

@@ -0,0 +1 @@
+from v440._utils.qualparse.pres import parse_pre

{v440-2.0.0.dev110 → v440-2.0.0.dev112}/src/v440/core/Qual.py

@@ -96,13 +96,14 @@ class Qual(SlotStringer):
         m: Any
         x: Any
         y: Any
+        self.dev = None
+        self.post = None
         pre: Any = (None, None)
-        post: Any = None
         while v:
             m = Pattern.QUALIFIERS.leftbound.search(v)
             v = v[m.end() :]
             if m.group("N"):
-                post = m.group("N")
+                self.post = int(m.group("N"))
                 continue
             x = m.group("l")
             y = m.group("n")
@@ -110,11 +111,10 @@ class Qual(SlotStringer):
                 self.dev = int(y)
                 continue
             if x in ("post", "r", "rev"):
-                post = y
+                self.post = int(y)
                 continue
             pre = x, y
         self.pre = pre
-        self.post = post
 
     def _todict(self: Self) -> dict:
         return dict(pre=self.pre, post=self.post, dev=self.dev)
@@ -152,12 +152,15 @@ class Qual(SlotStringer):
 
     @post.setter
     @guard
-    def post(self: Self, value: Any) -> None:
-        self._post = qualparse.parse_post(value)
+    def post(self: Self, value: Optional[SupportsIndex]) -> None:
+        if value is None:
+            self._post = None
+            return
+        self._post: int = abs(operator.index(value))
 
     @property
-    def pre(self: Self) -> tuple:
-        return self._prephase, self._presubphase
+    def pre(self: Self) -> str:
+        return self._prephase + str(self._presubphase)
 
     @pre.setter
     @guard

{v440-2.0.0.dev110 → v440-2.0.0.dev112}/src/v440/tests/test_version.py

@@ -159,15 +159,15 @@ class TestExample(unittest.TestCase):
 
     def test_example_6(self: Self) -> None:
         v: Version = Version("1.2.3")
-        v.public.qual.post = "post1"
+        v.public.qual.post = 1
         v.local.string = "local.7.dev"
         self.assertEqual(str(v), "1.2.3.post1+local.7.dev")  # Post-release version
         self.assertEqual(format(v, "-1"), "1.2.post1+local.7.dev")  # Formatted version
-        v.public.qual.post = "post.2"
+        v.public.qual.post = 2
         self.assertEqual(str(v), "1.2.3.post2+local.7.dev")  # Modified version
         v.public.qual.post = None
         self.assertEqual(str(v), "1.2.3+local.7.dev")  # Modified without post
-        v.public.qual.post = "post", 3
+        v.public.qual.post = 3
         v.local.sort()
         self.assertEqual(str(v), "1.2.3.post3+dev.local.7")  # After sorting local
         v.local.append(8)

{v440-2.0.0.dev110 → v440-2.0.0.dev112/src/v440.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: v440
-Version: 2.0.0.dev110
+Version: 2.0.0.dev112
 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.dev110 → v440-2.0.0.dev112}/src/v440.egg-info/SOURCES.txt

@@ -19,8 +19,6 @@ src/v440/_utils/cfg.toml
 src/v440/_utils/guarding.py
 src/v440/_utils/qualparse/Digest.py
 src/v440/_utils/qualparse/__init__.py
-src/v440/_utils/qualparse/devs.py
-src/v440/_utils/qualparse/posts.py
 src/v440/_utils/qualparse/pres.py
 src/v440/_utils/qualparse/segmenting.py
 src/v440/_utils/releaseparse/__init__.py

v440-2.0.0.dev110/src/v440/_utils/qualparse/__init__.py

@@ -1,3 +0,0 @@
-from v440._utils.qualparse.devs import parse_dev
-from v440._utils.qualparse.posts import parse_post
-from v440._utils.qualparse.pres import parse_pre

v440-2.0.0.dev110/src/v440/_utils/qualparse/devs.py

@@ -1,48 +0,0 @@
-from __future__ import annotations
-
-from typing import *
-
-from v440._utils.Pattern import Pattern
-from v440._utils.qualparse import segmenting
-from v440._utils.qualparse.Digest import Digest
-
-parse_dev: Digest = Digest("parse_dev")
-
-
-@parse_dev.overload()
-def parse_dev() -> None:
-    return
-
-
-@parse_dev.overload(int)
-def parse_dev(value: int) -> int:
-    if value < 0:
-        raise ValueError
-    return value
-
-
-@parse_dev.overload(list)
-def parse_dev(value: list) -> Optional[int]:
-    x: Any
-    y: Any
-    x, y = map(segmenting.segment, value)
-    if x != "dev":
-        raise ValueError
-    if isinstance(y, str):
-        raise TypeError
-    return y
-
-
-@parse_dev.overload(str)
-def parse_dev(value: str) -> Optional[int]:
-    v: str = value
-    v = v.replace("_", ".")
-    v = v.replace("-", ".")
-    m: Any = Pattern.PARSER.bound.search(v)
-    x: Any
-    y: Any
-    x, y = m.groups()
-    if x not in (None, "dev"):
-        raise ValueError
-    if y is not None:
-        return int(y)

v440-2.0.0.dev110/src/v440/_utils/qualparse/posts.py

@@ -1,52 +0,0 @@
-from __future__ import annotations
-
-from typing import *
-
-from v440._utils.Pattern import Pattern
-from v440._utils.qualparse import segmenting
-from v440._utils.qualparse.Digest import Digest
-
-parse_post: Digest = Digest("parse_post")
-
-
-@parse_post.overload()
-def parse_post() -> None:
-    return
-
-
-@parse_post.overload(int)
-def parse_post(value: int) -> int:
-    if value < 0:
-        raise ValueError
-    return value
-
-
-@parse_post.overload(list)
-def parse_post(value: list) -> Optional[int]:
-    v: list = list(map(segmenting.segment, value))
-    if len(v) == 0:
-        raise ValueError
-    if len(v) > 2:
-        raise ValueError
-    if len(v) == 1:
-        v.insert(0, "")
-    if v[0] not in ("post", "rev", "r", ""):
-        raise ValueError
-    if isinstance(v[1], str):
-        raise TypeError
-    return v[1]
-
-
-@parse_post.overload(str)
-def parse_post(value: str) -> Optional[int]:
-    v: str = value
-    v = v.replace("_", ".")
-    v = v.replace("-", ".")
-    m: Any = Pattern.PARSER.bound.search(v)
-    x: Any
-    y: Any
-    x, y = m.groups()
-    if x not in (None, "post", "rev", "r"):
-        raise ValueError
-    if y is not None:
-        return int(y)