v440 2.0.0.dev21__tar.gz → 2.0.0.dev23__tar.gz

{v440-2.0.0.dev21/src/v440.egg-info → v440-2.0.0.dev23}/PKG-INFO

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

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

v440-2.0.0.dev23/src/v440/core/Qualification.py

@@ -0,0 +1,205 @@
+from __future__ import annotations
+
+from typing import *
+
+from v440._utils import SimpleQualifierParser, utils
+from v440._utils.BaseList import BaseList
+from v440._utils.Cfg import Cfg
+from v440._utils.Digest import Digest
+from v440._utils.Pattern import Pattern
+from v440._utils.SlotList import SlotList
+from v440._utils.utils import guard
+
+__all__ = ["Qualification"]
+
+
+parse_leg: Digest = Digest("parse_leg")
+
+
+@parse_leg.overload()
+def parse_leg() -> list:
+    return [[None, None], None, None]
+
+
+@parse_leg.overload(int)
+def parse_leg(value: int) -> list:
+    return [[None, None], abs(value), None]
+
+
+@parse_leg.overload(list)
+def parse_leg(value: list) -> list:
+    return [value[:2]] + value[2:]
+
+
+@parse_leg.overload(str)
+def parse_leg(value: str) -> list:
+    v = value
+    prephase: Any = None
+    presubphase: Any = None
+    post: Any = None
+    dev: Any = None
+    m: Any
+    x: Any
+    y: Any
+    while v:
+        m = Pattern.QUALIFIERS.leftbound.search(v)
+        v = v[m.end() :]
+        if m.group("N"):
+            post = m.group("N")
+            continue
+        x = m.group("l")
+        y = m.group("n")
+        if x == "dev":
+            dev = y
+            continue
+        if x in ("post", "r", "rev"):
+            post = y
+            continue
+        prephase = x
+        presubphase = y
+    return [[prephase, presubphase], post, dev]
+
+
+parse_pre: Digest = Digest("parse_pre")
+
+
+@parse_pre.overload()
+def parse_pre() -> list:
+    return [None, None]
+
+
+@parse_pre.overload(list)
+def parse_pre(value: list) -> Any:
+    l: Any
+    n: Any
+    l, n = list(map(utils.segment, value))
+    if [l, n] == [None, None]:
+        return [None, None]
+    l = Cfg.cfg.data["phases"][l]
+    if not isinstance(n, int):
+        raise TypeError
+    return [l, n]
+
+
+@parse_pre.overload(str)
+def parse_pre(value: str) -> list:
+    if value == "":
+        return [None, None]
+    v: str = value
+    v = v.replace("_", ".")
+    v = v.replace("-", ".")
+    m: Any = Pattern.PARSER.bound.search(v)
+    l: Any
+    n: Any
+    l, n = m.groups()
+    l = Cfg.cfg.data["phases"][l]
+    n = 0 if (n is None) else int(n)
+    return [l, n]
+
+
+class Qualification(SlotList):
+
+    __slots__ = ("_prephase", "_presubphase", "_post", "_dev")
+
+    data: list
+    prephase: Optional[str]
+    presubphase: Optional[int]
+    post: Optional[int]
+    dev: Optional[int]
+
+    def __init__(self: Self, data: Any = None) -> None:
+        self._prephase = None
+        self._presubphase = None
+        self._post = None
+        self._dev = None
+        self.data = data
+
+    def __str__(self: Self) -> str:
+        ans: str = ""
+        if self.prephase is not None:
+            ans += self.prephase
+        if self.presubphase is not None:
+            ans += str(self.presubphase)
+        if self.post is not None:
+            ans += ".post%s" % self.post
+        if self.dev is not None:
+            ans += ".dev%s" % self.dev
+        return ans
+
+    def _cmp(self: Self) -> list:
+        ans: list = list()
+        if not self.pre.isempty():
+            ans += list(self.pre)
+        elif self.post is not None:
+            ans += ["z", float("inf")]
+        elif self.dev is None:
+            ans += ["z", float("inf")]
+        else:
+            ans += ["", -1]
+        ans.append(-1 if self.post is None else self.post)
+        ans.append(float("inf") if self.dev is None else self.dev)
+        return ans
+
+    @property
+    def data(self: Self) -> list:
+        return self.pre + [self.post, self.dev]
+
+    @data.setter
+    @guard
+    def data(self: Self, value: Any) -> None:
+        self.pre, self.post, self.dev = parse_leg(value)
+
+    @property
+    def dev(self: Self) -> Optional[int]:
+        return self._dev
+
+    @dev.setter
+    @guard
+    def dev(self: Self, value: Any) -> None:
+        self._dev = SimpleQualifierParser.DEV(value)
+
+    def isdevrelease(self: Self) -> bool:
+        return self.dev is not None
+
+    def isempty(self: Self) -> bool:
+        return self.data == [None, None, None, None]
+
+    def isprerelease(self: Self) -> bool:
+        return {self.prephase, self.presubphase, self.dev} != {None}
+
+    def ispostrelease(self: Self) -> bool:
+        return self.post is not None
+
+    @property
+    def post(self: Self) -> Optional[int]:
+        return self._post
+
+    @post.setter
+    @guard
+    def post(self: Self, value: Any) -> None:
+        self._post = SimpleQualifierParser.POST(value)
+
+    @property
+    def pre(self: Self) -> Optional[str]:
+        return [self._prephase, self._presubphase]
+
+    @pre.setter
+    @guard
+    def pre(self: Self, value: Any) -> None:
+        self._prephase, self._presubphase = parse_pre(value)
+
+    @property
+    def prephase(self: Self) -> Optional[str]:
+        return self._prephase
+
+    @prephase.setter
+    def prephase(self: Self, value: Any) -> None:
+        self[0] = value
+
+    @property
+    def presubphase(self: Self) -> Optional[int]:
+        return self._presubphase
+
+    @presubphase.setter
+    def presubphase(self: Self, value: Any) -> None:
+        self[1] = value

{v440-2.0.0.dev21 → v440-2.0.0.dev23}/src/v440/core/Version.py

@@ -9,7 +9,6 @@ from v440._utils.SlotList import SlotList
 from v440._utils.utils import guard
 from v440.core.Base import Base
 from v440.core.Local import Local
-from v440.core.Pre import Pre
 from v440.core.Public import Public
 from v440.core.Qualification import Qualification
 from v440.core.Release import Release
@@ -131,7 +130,7 @@ class Version(SlotList):
         self.qualification.post = value
 
     @property
-    def pre(self: Self) -> Pre:
+    def pre(self: Self) -> list:
         return self.qualification.pre
 
     @pre.setter

{v440-2.0.0.dev21 → v440-2.0.0.dev23}/src/v440/tests/test_version.py

@@ -1,7 +1,7 @@
 import unittest
 from typing import *
 
-from v440.core.Pre import Pre
+from v440.core.Qualification import Qualification
 from v440.core.Version import Version
 from v440.core.VersionError import VersionError
 
@@ -15,7 +15,7 @@ class TestVersionManipulation(unittest.TestCase):
         # Modify individual parts of the version
         v.release.major = 2
         v.release.minor = 5
-        v.pre = "beta.1"
+        v.qualification = "beta.1"
         v.local = "local.7.dev"
 
         # Verify the expected output
@@ -50,44 +50,44 @@ class TestVersionLocal(unittest.TestCase):
         self.assertTrue(v.local is backup)
 
 
-class TestVersion(unittest.TestCase):
+class TestPre(unittest.TestCase):
 
-    def test_version_pre(self: Self) -> None:
+    def test_pre(self: Self) -> None:
         v: Version = Version("1.2.3")
-        backup = v.pre
+        backup: Qualification = v.qualification
 
         # Initial version, no pre-release version
         self.assertEqual(str(v), "1.2.3")
-        self.assertEqual(v.pre, [None, None])
+        self.assertEqual(v.qualification, [None, None, None, None])
 
         # Set pre-release version to "a1"
-        v.pre = "a1"
+        v.qualification = "a1"
         self.assertEqual(str(v), "1.2.3a1")
-        self.assertEqual(str(v.pre), "a1")
+        self.assertEqual(str(v.qualification), "a1")
 
         # Modify pre-release phase to "preview"
-        v.pre.phase = "preview"
+        v.qualification.prephase = "preview"
         self.assertEqual(str(v), "1.2.3rc1")
-        self.assertEqual(str(v.pre), "rc1")
+        self.assertEqual(str(v.qualification), "rc1")
 
         # Modify subphase to "42"
-        v.pre.subphase = "42"
+        v.qualification.presubphase = "42"
         self.assertEqual(str(v), "1.2.3rc42")
-        self.assertEqual(str(v.pre), "rc42")
+        self.assertEqual(str(v.qualification), "rc42")
 
         # Change phase to a formatted string "BeTa"
-        v.pre.phase = """
+        v.qualification.prephase = """
         BeTa
         """
         self.assertEqual(str(v), "1.2.3b42")
-        self.assertEqual(str(v.pre), "b42")
+        self.assertEqual(str(v.qualification), "b42")
 
-        self.assertEqual(v.pre, backup)
+        self.assertEqual(v.qualification, backup)
 
         # Set pre-release to None
-        v.pre = None
+        v.qualification = None
         self.assertEqual(str(v), "1.2.3")
-        self.assertEqual(v.pre, [None, None])
+        self.assertEqual(v.qualification, [None, None, None, None])
 
 
 class TestExample(unittest.TestCase):
@@ -151,10 +151,10 @@ class TestExample(unittest.TestCase):
         self.assertEqual(str(v), "2a1")  # Pre-release version
         v.pre = "beta.2"
         self.assertEqual(str(v), "2b2")  # Modified pre-release version
-        v.pre[1] = 4
-        self.assertEqual(str(v), "2b4")  # Further modified pre-release version
-        v.pre.phase = "PrEvIeW"
-        self.assertEqual(str(v), "2rc4")  # Even further modified pre-release version
+        v.qualification.pre[1] = 4
+        self.assertEqual(str(v), "2b2")  # Further modified pre-release version
+        v.qualification.prephase = "PrEvIeW"
+        self.assertEqual(str(v), "2rc2")  # Even further modified pre-release version
 
     def test_example_6(self: Self) -> None:
         v: Version = Version("1.2.3")
@@ -188,8 +188,8 @@ class TestExample(unittest.TestCase):
 
 class TestPatch(unittest.TestCase):
     def test_example_0(self: Self) -> None:
-        x: Pre = Pre("a1")
-        y: Pre = Pre("b2")
+        x: Qualification = Qualification("a1")
+        y: Qualification = Qualification("b2")
         with self.assertRaises(Exception):
             x += y
 

{v440-2.0.0.dev21 → v440-2.0.0.dev23}/src/v440/tests/testdata.toml

@@ -713,7 +713,7 @@ Post-releases = [
     "1.2.3+local.version.with.extremely.long.identifier.123456789012345678901234567890",
     "0!0.0.0a9999999999999.post9999999999999.dev9999999999999+build.sha.9999999999999",
 ]
-
+"Difficult Qualification Relations" = ['1.2.3', '1.2.3.dev0', '1.2.3.dev1', '1.2.3.dev2', '1.2.3.post0', '1.2.3.post0.dev0', '1.2.3.post0.dev1', '1.2.3.post0.dev2', '1.2.3.post10', '1.2.3.post10.dev0', '1.2.3.post10.dev1', '1.2.3.post10.dev2', '1.2.3a0', '1.2.3a0.dev0', '1.2.3a0.dev1', '1.2.3a0.dev2', '1.2.3a0.post0', '1.2.3a0.post0.dev0', '1.2.3a0.post0.dev1', '1.2.3a0.post0.dev2', '1.2.3a0.post10', '1.2.3a0.post10.dev0', '1.2.3a0.post10.dev1', '1.2.3a0.post10.dev2', '1.2.3a4', '1.2.3a4.dev0', '1.2.3a4.dev1', '1.2.3a4.dev2', '1.2.3a4.post0', '1.2.3a4.post0.dev0', '1.2.3a4.post0.dev1', '1.2.3a4.post0.dev2', '1.2.3a4.post10', '1.2.3a4.post10.dev0', '1.2.3a4.post10.dev1', '1.2.3a4.post10.dev2', '1.2.3b1', '1.2.3b1.dev0', '1.2.3b1.dev1', '1.2.3b1.dev2', '1.2.3b1.post0', '1.2.3b1.post0.dev0', '1.2.3b1.post0.dev1', '1.2.3b1.post0.dev2', '1.2.3b1.post10', '1.2.3b1.post10.dev0', '1.2.3b1.post10.dev1', '1.2.3b1.post10.dev2']
 [strings.incomp]
 "Increasing complexity with more combinations" = [
     "1!1.0.0.dev4567.post9+20190101",

{v440-2.0.0.dev21 → v440-2.0.0.dev23/src/v440.egg-info}/PKG-INFO

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

@@ -21,7 +21,6 @@ src/v440/_utils/cfg.toml
 src/v440/_utils/utils.py
 src/v440/core/Base.py
 src/v440/core/Local.py
-src/v440/core/Pre.py
 src/v440/core/Public.py
 src/v440/core/Qualification.py
 src/v440/core/Release.py

v440-2.0.0.dev21/src/v440/core/Pre.py

@@ -1,98 +0,0 @@
-from __future__ import annotations
-
-from typing import *
-
-from v440._utils import utils
-from v440._utils.Cfg import Cfg
-from v440._utils.Digest import Digest
-from v440._utils.Pattern import Pattern
-from v440._utils.SlotList import SlotList
-from v440._utils.utils import guard
-
-__all__ = ["Pre"]
-
-
-parse_data: Digest = Digest("parse_data")
-
-
-@parse_data.overload()
-def parse_data() -> list:
-    return [None, None]
-
-
-@parse_data.overload(list)
-def parse_data(value: list) -> Any:
-    l: Any
-    n: Any
-    l, n = list(map(utils.segment, value))
-    if [l, n] == [None, None]:
-        return [None, None]
-    l = Cfg.cfg.data["phases"][l]
-    if not isinstance(n, int):
-        raise TypeError
-    return [l, n]
-
-
-@parse_data.overload(str)
-def parse_data(value: str) -> list:
-    if value == "":
-        return [None, None]
-    v: str = value
-    v = v.replace("_", ".")
-    v = v.replace("-", ".")
-    m: Any = Pattern.PARSER.bound.search(v)
-    l: Any
-    n: Any
-    l, n = m.groups()
-    l = Cfg.cfg.data["phases"][l]
-    n = 0 if (n is None) else int(n)
-    return [l, n]
-
-
-class Pre(SlotList):
-
-    __slots__ = ("_phase", "_subphase")
-
-    data: list
-    phase: Optional[str]
-    subphase: Optional[int]
-
-    def __init__(self: Self, data: Any = None) -> None:
-        self._phase = None
-        self._subphase = None
-        self.data = data
-
-    def __str__(self: Self) -> str:
-        ans: str = ""
-        if not self.isempty():
-            ans += self.phase
-            ans += str(self.subphase)
-        return ans
-
-    @property
-    def data(self: Self) -> list:
-        return [self._phase, self._subphase]
-
-    @data.setter
-    @guard
-    def data(self: Self, value: Any) -> None:
-        self._phase, self._subphase = parse_data(value)
-
-    def isempty(self: Self) -> bool:
-        return self.data == [None, None]
-
-    @property
-    def phase(self: Self) -> Optional[str]:
-        return self._phase
-
-    @phase.setter
-    def phase(self: Self, value: Any) -> None:
-        self[0] = value
-
-    @property
-    def subphase(self: Self) -> Optional[int]:
-        return self._subphase
-
-    @subphase.setter
-    def subphase(self: Self, value: Any) -> None:
-        self[1] = value

v440-2.0.0.dev21/src/v440/core/Qualification.py

@@ -1,143 +0,0 @@
-from __future__ import annotations
-
-from typing import *
-
-from v440._utils import SimpleQualifierParser
-from v440._utils.BaseList import BaseList
-from v440._utils.Digest import Digest
-from v440._utils.Pattern import Pattern
-from v440._utils.utils import guard
-from v440.core.Pre import Pre
-
-__all__ = ["Qualification"]
-
-
-parse_data: Digest = Digest("parse_data")
-
-
-@parse_data.overload()
-def parse_data() -> list:
-    return [None, None, None]
-
-
-@parse_data.overload(int)
-def parse_data(value: int) -> list:
-    return [None, abs(value), None]
-
-
-@parse_data.overload(list)
-def parse_data(value: list) -> list:
-    return value
-
-
-@parse_data.overload(str)
-def parse_data(value: str) -> list:
-    v = value
-    pre: Any = None
-    post: Any = None
-    dev: Any = None
-    m: Any
-    x: Any
-    y: Any
-    while v:
-        m = Pattern.QUALIFIERS.leftbound.search(v)
-        v = v[m.end() :]
-        if m.group("N"):
-            post = m.group("N")
-            continue
-        x = m.group("l")
-        y = m.group("n")
-        if x == "dev":
-            dev = y
-            continue
-        if x in ("post", "r", "rev"):
-            post = y
-            continue
-        pre = (x, y)
-    return [pre, post, dev]
-
-
-class Qualification(BaseList):
-
-    __slots__ = ("_pre", "_post", "_dev")
-
-    data: list
-    pre: Pre
-    post: Optional[int]
-    dev: Optional[int]
-
-    def __init__(self: Self, data: Any = None) -> None:
-        self._pre = Pre()
-        self._post = None
-        self._dev = None
-        self.data = data
-
-    def __str__(self: Self) -> str:
-        ans: str = str(self.pre)
-        if self.post is not None:
-            ans += ".post%s" % self.post
-        if self.dev is not None:
-            ans += ".dev%s" % self.dev
-        return ans
-
-    def _cmp(self: Self) -> list:
-        ans: list = list()
-        if not self.pre.isempty():
-            ans += list(self.pre)
-        elif self.post is not None:
-            ans += ["z", float("inf")]
-        elif self.dev is None:
-            ans += ["z", float("inf")]
-        else:
-            ans += ["", -1]
-        ans.append(-1 if self.post is None else self.post)
-        ans.append(float("inf") if self.dev is None else self.dev)
-        return ans
-
-    @property
-    def data(self: Self) -> list:
-        return [self.pre, self.post, self.dev]
-
-    @data.setter
-    @guard
-    def data(self: Self, value: Any) -> None:
-        self.pre, self.post, self.dev = parse_data(value)
-
-    @property
-    def dev(self: Self) -> Optional[int]:
-        return self._dev
-
-    @dev.setter
-    @guard
-    def dev(self: Self, value: Any) -> None:
-        self._dev = SimpleQualifierParser.DEV(value)
-
-    def isdevrelease(self: Self) -> bool:
-        return self.dev is not None
-
-    def isempty(self: Self) -> bool:
-        return self.data == [None, None, None]
-
-    def isprerelease(self: Self) -> bool:
-        return self.isdevrelease() or not self.pre.isempty()
-
-    def ispostrelease(self: Self) -> bool:
-        return self.post is not None
-
-    @property
-    def post(self: Self) -> Optional[int]:
-        return self._post
-
-    @post.setter
-    @guard
-    def post(self: Self, value: Any) -> None:
-        self._post = SimpleQualifierParser.POST(value)
-
-    @property
-    def pre(self: Self) -> Pre:
-        return self._pre
-
-    @pre.setter
-    @guard
-    def pre(self: Self, value: Any) -> None:
-        self._pre.data = value