v440 2.0.0.dev164__tar.gz → 2.0.0.dev166__tar.gz

{v440-2.0.0.dev164/src/v440.egg-info → v440-2.0.0.dev166}/PKG-INFO

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

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

{v440-2.0.0.dev164 → v440-2.0.0.dev166}/src/v440/_utils/BaseStringer.py

@@ -1,7 +1,6 @@
 from abc import ABCMeta, abstractmethod
 from typing import *
 
-import scaevola
 import setdoc
 import unhash
 
@@ -103,9 +102,6 @@ class BaseStringer(metaclass=ABCMeta):
     @abstractmethod
     def _string_fset(self: Self, value: str) -> None: ...
 
-    @abstractmethod
-    def _todict(self: Self) -> dict: ...
-
     @setdoc.basic
     def copy(self: Self) -> Self:
         return type(self)(self)

{v440-2.0.0.dev164 → v440-2.0.0.dev166}/src/v440/_utils/ListStringer.py

@@ -105,9 +105,6 @@ class ListStringer(BaseStringer, collections.abc.MutableSequence):
     @abstractmethod
     def _sort(cls: type, value: Any): ...
 
-    def _todict(self: Self) -> dict:
-        return dict(data=self.data)
-
     def append(self: Self, value: Self, /) -> None:
         "This method appends value to self."
         data: list = list(self.data)

v440-2.0.0.dev166/src/v440/_utils/QualStringer.py

@@ -0,0 +1,78 @@
+import operator
+from abc import abstractmethod
+from typing import *
+
+import setdoc
+from datarepr import datarepr
+from overloadable import Overloadable
+
+from v440._utils.BaseStringer import BaseStringer
+from v440._utils.guarding import guard
+
+__all__ = ["QualStringer"]
+
+
+class QualStringer(BaseStringer):
+    __slots__ = ("_phase", "_num")
+
+    string: str
+    phase: str
+    num: int
+
+    @setdoc.basic
+    def __bool__(self: Self) -> bool:
+        return bool(self.phase or self.num)
+
+    @Overloadable
+    @setdoc.basic
+    def __init__(self: Self, *args: Any, **kwargs: Any) -> str:
+        self._phase = ""
+        self._num = 0
+        argc: int = len(args) + len(kwargs)
+        keys: set = set(kwargs.keys())
+        if argc <= 1 and keys <= {"string"}:
+            return "string"
+        return "slots"
+
+    @__init__.overload("string")
+    @setdoc.basic
+    def __init__(self: Self, string: Any = "") -> None:
+        self.string = string
+
+    @__init__.overload("slots")
+    @setdoc.basic
+    def __init__(
+        self: Self,
+        phase: Any = "",
+        num: Any = 0,
+    ) -> None:
+        self.phase = phase
+        self.num = num
+
+    @setdoc.basic
+    def __repr__(self: Self) -> str:
+        return datarepr(type(self).__name__, phase=self.phase, num=self.num)
+
+    @abstractmethod
+    def _num_fset(self: Self, value: int) -> None: ...
+
+    @abstractmethod
+    def _phase_fset(self: Self, value: str) -> None: ...
+
+    @property
+    def num(self: Self) -> int:
+        return self._num
+
+    @num.setter
+    @guard
+    def num(self: Self, value: Any) -> None:
+        self._num_fset(operator.index(value))
+
+    @property
+    def phase(self: Self) -> str:
+        return self._phase
+
+    @phase.setter
+    @guard
+    def phase(self: Self, value: Any) -> None:
+        self._phase_fset(str(value))

{v440-2.0.0.dev164 → v440-2.0.0.dev166}/src/v440/_utils/SlotStringer.py

@@ -1,3 +1,4 @@
+from abc import abstractmethod
 from functools import partial
 from typing import *
 
@@ -20,3 +21,6 @@ class SlotStringer(BaseStringer):
 
     def _cmp(self: Self) -> tuple:
         return tuple(map(partial(getattr, self), type(self).__slots__))
+
+    @abstractmethod
+    def _todict(self: Self) -> dict: ...

{v440-2.0.0.dev164 → v440-2.0.0.dev166}/src/v440/_utils/cfg.toml

@@ -1,4 +1,4 @@
-[phases]
+[pre]
 alpha = "a"
 a = "a"
 beta = "b"

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

@@ -0,0 +1,59 @@
+from __future__ import annotations
+
+import string as string_
+from typing import *
+
+from v440._utils.Cfg import Cfg
+from v440._utils.QualStringer import QualStringer
+
+__all__ = ["Pre"]
+
+
+class Pre(QualStringer):
+
+    __slots__ = ()
+    string: str
+    phase: str
+    num: int
+
+    def _cmp(self: Self) -> list:
+        return {bool(self)}, self.phase, self.num
+
+    def _format(self: Self, format_spec: str) -> str:
+        if format_spec:
+            raise ValueError
+        if self:
+            return self.phase + str(self.num)
+        else:
+            return ""
+
+    def _num_fset(self: Self, value: int) -> None:
+        if value < 0:
+            raise ValueError
+        self.string = self.phase + str(value)
+
+    def _phase_fset(self: Self, value: str) -> None:
+        self._phase = Cfg.cfg.data["pre"][value.lower()]
+
+    def _string_fset(self: Self, value: str) -> None:
+        v: str = value.lower()
+        v = v.replace("_", ".")
+        v = v.replace("-", ".")
+        x: str = v.rstrip(string_.digits)
+        v = v[len(x) :]
+        q: bool = x.endswith(".")
+        if q:
+            if not v:
+                raise ValueError
+            x = x[:-1]
+        p: bool = x.startswith(".")
+        if p:
+            x = x[1:]
+        if x:
+            self._phase = Cfg.cfg.data["pre"][x]
+            self._num = int("0" + v)
+        elif p or v:
+            raise ValueError
+        else:
+            self._phase = ""
+            self._num = 0

{v440-2.0.0.dev164 → v440-2.0.0.dev166}/src/v440/core/Qual.py

@@ -11,38 +11,34 @@ from v440._utils.Cfg import Cfg
 from v440._utils.guarding import guard
 from v440._utils.Pattern import Pattern
 from v440._utils.SlotStringer import SlotStringer
+from v440.core.Pre import Pre
 
 __all__ = ["Qual"]
 
 
 class Qual(SlotStringer):
 
-    __slots__ = ("_prephase", "_prenum", "_post", "_dev")
+    __slots__ = ("_pre", "_post", "_dev")
     string: str
-    pre: str
-    prephase: str
-    prenum: int
+    pre: Pre
     post: Optional[int]
     dev: Optional[int]
 
     @setdoc.basic
     def __bool__(self: Self) -> bool:
-        return self.string == ""
+        return bool(self.string)
 
     @Overloadable
     @setdoc.basic
     def __init__(self: Self, *args: Any, **kwargs: Any) -> str:
-        self._prephase = ""
-        self._prenum = 0
+        self._pre = Pre()
         self._post = None
         self._dev = None
         argc: int = len(args) + len(kwargs)
         keys: set = set(kwargs.keys())
         if argc <= 1 and keys <= {"string"}:
             return "string"
-        if argc <= 3 and keys <= {"pre", "post", "dev"}:
-            return "pre"
-        return "slots"
+        return "pre"
 
     @__init__.overload("string")
     @setdoc.basic
@@ -57,21 +53,7 @@ class Qual(SlotStringer):
         post: Any = None,
         dev: Any = None,
     ) -> None:
-        self.pre = pre
-        self.post = post
-        self.dev = dev
-
-    @__init__.overload("slots")
-    @setdoc.basic
-    def __init__(
-        self: Self,
-        prephase: Any = "",
-        prenum: Any = 0,
-        post: Any = None,
-        dev: Any = None,
-    ) -> None:
-        self.prephase = prephase
-        self.prenum = prenum
+        self.pre.string = pre
         self.post = post
         self.dev = dev
 
@@ -92,7 +74,7 @@ class Qual(SlotStringer):
     def _format(self: Self, format_spec: str) -> str:
         if format_spec:
             raise ValueError
-        ans: str = self.pre
+        ans: str = self.pre.string
         if self.post is not None:
             ans += ".post%s" % self.post
         if self.dev is not None:
@@ -106,7 +88,7 @@ class Qual(SlotStringer):
         y: Any
         self.dev = None
         self.post = None
-        self.pre = ""
+        self.pre.string = ""
         while v:
             m = Pattern.QUALIFIERS.leftbound.search(v)
             v = v[m.end() :]
@@ -121,7 +103,7 @@ class Qual(SlotStringer):
             if x in ("post", "r", "rev"):
                 self.post = int(y)
                 continue
-            self.pre = x + y
+            self.pre.string = x + y
 
     def _todict(self: Self) -> dict:
         return dict(pre=self.pre, post=self.post, dev=self.dev)
@@ -147,7 +129,7 @@ class Qual(SlotStringer):
 
     def isprerelease(self: Self) -> bool:
         "This method returns whether the current instance denotes a pre-release."
-        return self.prephase != "" or self.dev is not None
+        return self.pre.phase != "" or self.dev is not None
 
     def ispostrelease(self: Self) -> bool:
         "This method returns whether the current instance denotes a post-release."
@@ -167,59 +149,4 @@ class Qual(SlotStringer):
 
     @property
     def pre(self: Self) -> str:
-        if "" == self.prephase:
-            return ""
-        return self.prephase + str(self.prenum)
-
-    @pre.setter
-    @guard
-    def pre(self: Self, value: Any) -> None:
-        v: str = str(value).lower()
-        v = v.replace("_", ".")
-        v = v.replace("-", ".")
-        x: str = v.rstrip(string_.digits)
-        v = v[len(x) :]
-        q: bool = x.endswith(".")
-        if q:
-            if not v:
-                raise ValueError
-            x = x[:-1]
-        p: bool = x.startswith(".")
-        if p:
-            x = x[1:]
-        if x:
-            self._prephase = Cfg.cfg.data["phases"][x]
-            self._prenum = int("0" + v)
-        elif p or v:
-            raise ValueError
-        else:
-            self._prephase = ""
-            self._prenum = 0
-
-    @property
-    def prephase(self: Self) -> str:
-        return self._prephase
-
-    @prephase.setter
-    @guard
-    def prephase(self: Self, value: Any) -> None:
-        x: str = str(value).lower()
-        if x != "":
-            self._prephase = Cfg.cfg.data["phases"][x]
-        elif self.prenum:
-            self.pre = self.prenum  # raises error
-
-    @property
-    def prenum(self: Self) -> Optional[int]:
-        return self._prenum
-
-    @prenum.setter
-    @guard
-    def prenum(self: Self, value: Any) -> None:
-        y: int = operator.index(value)
-        if y < 0:
-            raise ValueError
-        if self.prephase:
-            self._prenum = y
-        else:
-            self.pre = y  # raises error
+        return self._pre

{v440-2.0.0.dev164 → v440-2.0.0.dev166}/src/v440/tests/test_version.py

@@ -67,17 +67,17 @@ class TestPre(unittest.TestCase):
         self.assertEqual(str(v.public.qual), "a1")
 
         # Modify pre-release phase to "preview"
-        v.public.qual.prephase = "preview"
+        v.public.qual.pre.phase = "preview"
         self.assertEqual(str(v), "1.2.3rc1")
         self.assertEqual(str(v.public.qual), "rc1")
 
         # Modify subphase to "42"
-        v.public.qual.prenum = 42
+        v.public.qual.pre.num = 42
         self.assertEqual(str(v), "1.2.3rc42")
         self.assertEqual(str(v.public.qual), "rc42")
 
         # Change phase to a formatted string "BeTa"
-        v.public.qual.prephase = "BeTa"
+        v.public.qual.pre.phase = "BeTa"
         self.assertEqual(str(v), "1.2.3b42")
         self.assertEqual(str(v.public.qual), "b42")
         self.assertEqual(v.public.qual, backup)
@@ -147,12 +147,12 @@ class TestExample(unittest.TestCase):
     def test_example_5(self: Self) -> None:
         v: Version = Version("2.0.0-alpha.1")
         self.assertEqual(str(v), "2a1")  # Pre-release version
-        v.public.qual.pre = "beta.2"
+        v.public.qual.pre.string = "beta.2"
         self.assertEqual(str(v), "2b2")  # Modified pre-release version
         with self.assertRaises(Exception):
             v.public.qual.pre[1] = 4
         self.assertEqual(str(v), "2b2")  # Further modified pre-release version
-        v.public.qual.prephase = "PrEvIeW"
+        v.public.qual.pre.phase = "PrEvIeW"
         self.assertEqual(str(v), "2rc2")  # Even further modified pre-release version
 
     def test_example_6(self: Self) -> None:

{v440-2.0.0.dev164 → v440-2.0.0.dev166/src/v440.egg-info}/PKG-INFO

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

@@ -27,6 +27,7 @@ src/v440/_utils/releaseparse/ranging.py
 src/v440/_utils/releaseparse/setting.py
 src/v440/core/Base.py
 src/v440/core/Local.py
+src/v440/core/Pre.py
 src/v440/core/Public.py
 src/v440/core/Qual.py
 src/v440/core/Release.py

v440-2.0.0.dev164/src/v440/_utils/QualStringer.py

@@ -1,22 +0,0 @@
-from functools import partial
-from typing import *
-
-import setdoc
-from datarepr import datarepr
-
-from v440._utils.BaseStringer import BaseStringer
-
-__all__ = ["QualStringer"]
-
-
-class QualStringer(BaseStringer):
-    __slots__ = ()
-
-    string: str
-
-    @setdoc.basic
-    def __repr__(self: Self) -> str:
-        return datarepr(type(self).__name__, **self._todict())
-
-    def _cmp(self: Self) -> tuple:
-        return tuple(map(partial(getattr, self), type(self).__slots__))