v440 2.0.0.dev109__tar.gz → 2.0.0.dev111__tar.gz

{v440-2.0.0.dev109/src/v440.egg-info → v440-2.0.0.dev111}/PKG-INFO

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

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

{v440-2.0.0.dev109 → v440-2.0.0.dev111}/src/v440/core/Qual.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import operator
 from typing import *
 
 import setdoc
@@ -95,27 +96,25 @@ class Qual(SlotStringer):
         m: Any
         x: Any
         y: Any
+        self.dev = None
+        self.post = None
         pre: Any = (None, None)
-        post: Any = None
-        dev: 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")
             if x == "dev":
-                dev = y
+                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
-        self.dev = dev
 
     def _todict(self: Self) -> dict:
         return dict(pre=self.pre, post=self.post, dev=self.dev)
@@ -127,8 +126,13 @@ class Qual(SlotStringer):
 
     @dev.setter
     @guard
-    def dev(self: Self, value: Any) -> None:
-        self._dev = qualparse.parse_dev(value)
+    def dev(self: Self, value: Optional[SupportsIndex]) -> None:
+        if value is None:
+            self._dev = None
+            return
+        self._dev: int = operator.index(value)
+        if self._dev < 0:
+            raise ValueError
 
     def isdevrelease(self: Self) -> bool:
         "This method returns whether the current instance denotes a dev-release."
@@ -148,8 +152,11 @@ 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:

{v440-2.0.0.dev109 → v440-2.0.0.dev111}/src/v440/tests/test_testdata.py

@@ -202,11 +202,12 @@ class TestVersionRelease(unittest.TestCase):
 class TestDevGo(unittest.TestCase):
     def test_dev_as_tuple(self: Self) -> None:
         self.go_key(
-            key="test_dev_as_tuple",
-            setup="1.2.3",
-            update=("dev", "5000"),
-            text="1.2.3.dev5000",
-            answer=5000,
+            key="test_dev_as_list_mixed_case",
+            setup="1.2.3.dev9000",
+            update=None,
+            text="1.2.3",
+            solution=None,
+            dev_type=type(None),
         )
 
     def test_strings_a(self: Self) -> None:
@@ -225,7 +226,7 @@ class TestDevGo(unittest.TestCase):
         msg: str,
         setup: Any,
         text: str,
-        answer: Any,
+        solution: Any = None,
         update: Any = None,
         dev_type: type = int,
     ):
@@ -233,7 +234,7 @@ class TestDevGo(unittest.TestCase):
         v.public.qual.dev = update
         self.assertEqual(str(v), text, msg=msg)
         self.assertIsInstance(v.public.qual.dev, dev_type, msg=msg)
-        self.assertEqual(v.public.qual.dev, answer, msg=msg)
+        self.assertEqual(v.public.qual.dev, solution, msg=msg)
 
 
 class TestVersionSpecifiersGo(unittest.TestCase):

{v440-2.0.0.dev109 → v440-2.0.0.dev111}/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.dev109 → v440-2.0.0.dev111}/src/v440/tests/testdata.toml

@@ -752,79 +752,73 @@ Post-releases = [
 setup = "1.2.3"
 update = 1
 text = "1.2.3.dev1"
-answer = 1
+solution = 1
 
 [devint.test_dev_as_string_int]
 setup = "1.2.3"
-update = "42"
+update = 42
 text = "1.2.3.dev42"
-answer = 42
+solution = 42
 
 [devint.test_dev_as_string_with_dev_prefix]
 setup = "1.2.3"
-update = "dev1000"
+update = 1000
 text = "1.2.3.dev1000"
-answer = 1000
+solution = 1000
 
 [devint.test_dev_as_string_with_dev_dot_prefix]
 setup = "1.2.3"
-update = "dev.2000"
+update = 2000
 text = "1.2.3.dev2000"
-answer = 2000
+solution = 2000
 
 [devint.test_dev_as_string_with_dot_dev_prefix]
 setup = "1.2.3"
-update = ".dev.3000"
+update = 3000
 text = "1.2.3.dev3000"
-answer = 3000
+solution = 3000
 
 [devint.test_dev_as_string_with_dot_dev_number_prefix]
 setup = "1.2.3"
-update = ".dev4000"
+update = 4000
 text = "1.2.3.dev4000"
-answer = 4000
+solution = 4000
 
 [devint.test_dev_as_list]
 setup = "1.2.3"
-update = [
-    "dev",
-    "6000",
-]
+update = 6000
 text = "1.2.3.dev6000"
-answer = 6000
+solution = 6000
 
 [devint.test_dev_as_uppercase_string]
 setup = "1.2.3"
-update = "DEV7000"
+update = 7000
 text = "1.2.3.dev7000"
-answer = 7000
+solution = 7000
 
 [devint.test_dev_as_mixed_case_string]
 setup = "1.2.3"
-update = "dEv8000"
+update = 8000
 text = "1.2.3.dev8000"
-answer = 8000
+solution = 8000
 
 [devint.test_dev_as_list_mixed_case]
 setup = "1.2.3"
-update = [
-    "dEV",
-    "9000",
-]
+update = 9000
 text = "1.2.3.dev9000"
-answer = 9000
+solution = 9000
 
 [devint.test_dev_as_false]
 setup = "1.2.3"
 update = false
 text = "1.2.3.dev0"
-answer = 0
+solution = 0
 
 [devint.test_dev_as_true]
 setup = "1.2.3"
 update = true
 text = "1.2.3.dev1"
-answer = 1
+solution = 1
 
 [spec.test_basic_version_with_post_specifier]
 string_a = "1.2.3-4"

{v440-2.0.0.dev109 → v440-2.0.0.dev111/src/v440.egg-info}/PKG-INFO

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