v440 2.0.0.dev172__tar.gz → 2.0.0.dev174__tar.gz

{v440-2.0.0.dev172/src/v440.egg-info → v440-2.0.0.dev174}/PKG-INFO

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

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

{v440-2.0.0.dev172 → v440-2.0.0.dev174}/src/v440/_utils/BaseStringer.py

@@ -1,6 +1,7 @@
 from abc import ABCMeta, abstractmethod
 from typing import *
 
+import scaevola
 import setdoc
 import unhash
 
@@ -102,6 +103,9 @@ 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.dev172 → v440-2.0.0.dev174}/src/v440/_utils/ListStringer.py

@@ -105,6 +105,9 @@ 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.dev172 → v440-2.0.0.dev174}/src/v440/_utils/SlotStringer.py

@@ -1,4 +1,3 @@
-from abc import abstractmethod
 from functools import partial
 from typing import *
 
@@ -21,6 +20,3 @@ 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.dev172 → v440-2.0.0.dev174}/src/v440/_utils/cfg.toml

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

v440-2.0.0.dev174/src/v440/_utils/releaseparse/setting.py

@@ -0,0 +1,76 @@
+from __future__ import annotations
+
+import operator
+from typing import *
+
+from v440._utils.releaseparse import listing, ranging
+
+
+def numeral(value: SupportsIndex) -> int:
+    ans: int = operator.index(value)
+    if ans < 0:
+        raise ValueError
+    else:
+        return ans
+
+
+def setitem(data: tuple, key: Any, value: Any) -> tuple:
+    f: Callable
+    k: int | range
+    v: int | tuple[int]
+    if type(key) is slice:
+        f = setitem_range
+        k = ranging.torange(key, len(data))
+        v = tuple(map(numeral, value))
+    else:
+        f = setitem_int
+        k = operator.index(key)
+        v = numeral(value)
+    return f(data, k, v)
+
+
+def setitem_int(data: tuple, key: int, value: int) -> tuple:
+    if key < len(data):
+        edit: list = list(data)
+        edit[key] = value
+        return tuple(edit)
+    if value == 0:
+        return data
+    data += (0,) * (key - len(data))
+    data += (value,)
+    return data
+
+
+def setitem_range(data: tuple, key: range, value: tuple[int]) -> tuple:
+    if key.step == 1:
+        return setitem_range_1(
+            data=data,
+            start=key.start,
+            stop=key.stop,
+            value=value,
+        )
+    else:
+        return setitem_range_align(data, key, value)
+
+
+def setitem_range_align(data: tuple, key: range, value: tuple[int]) -> tuple:
+    key: list = list(key)
+    value: list = listing.tolist(value, slicing=len(key))
+    if len(key) != len(value):
+        e = "attempt to assign sequence of size %s to extended slice of size %s"
+        e %= (len(value), len(key))
+        raise ValueError(e)
+    ext: int = max(0, max(*key) + 1 - len(data))
+    edit: list = list(data)
+    edit += [0] * ext
+    for k, v in zip(key, value):
+        edit[k] = v
+    return tuple(edit)
+
+
+def setitem_range_1(data: tuple, start: int, stop: int, value: tuple[int]) -> tuple:
+    edit: list = list(data)
+    edit += [0] * max(0, start - len(data))
+    edit[start:stop] = value
+    ans: tuple = tuple(edit)
+    return ans

{v440-2.0.0.dev172 → v440-2.0.0.dev174}/src/v440/core/Qual.py

@@ -11,34 +11,38 @@ 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__ = ("_pre", "_post", "_dev")
+    __slots__ = ("_prephase", "_prenum", "_post", "_dev")
     string: str
-    pre: Pre
+    pre: str
+    prephase: str
+    prenum: int
     post: Optional[int]
     dev: Optional[int]
 
     @setdoc.basic
     def __bool__(self: Self) -> bool:
-        return bool(self.string)
+        return self.string == ""
 
     @Overloadable
     @setdoc.basic
     def __init__(self: Self, *args: Any, **kwargs: Any) -> str:
-        self._pre = Pre()
+        self._prephase = ""
+        self._prenum = 0
         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"
-        return "pre"
+        if argc <= 3 and keys <= {"pre", "post", "dev"}:
+            return "pre"
+        return "slots"
 
     @__init__.overload("string")
     @setdoc.basic
@@ -53,7 +57,21 @@ class Qual(SlotStringer):
         post: Any = None,
         dev: Any = None,
     ) -> None:
-        self.pre.string = pre
+        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.post = post
         self.dev = dev
 
@@ -74,7 +92,7 @@ class Qual(SlotStringer):
     def _format(self: Self, format_spec: str) -> str:
         if format_spec:
             raise ValueError
-        ans: str = self.pre.string
+        ans: str = self.pre
         if self.post is not None:
             ans += ".post%s" % self.post
         if self.dev is not None:
@@ -88,7 +106,7 @@ class Qual(SlotStringer):
         y: Any
         self.dev = None
         self.post = None
-        self.pre.string = ""
+        self.pre = ""
         while v:
             m = Pattern.QUALIFIERS.leftbound.search(v)
             v = v[m.end() :]
@@ -103,7 +121,7 @@ class Qual(SlotStringer):
             if x in ("post", "r", "rev"):
                 self.post = int(y)
                 continue
-            self.pre.string = x + y
+            self.pre = x + y
 
     def _todict(self: Self) -> dict:
         return dict(pre=self.pre, post=self.post, dev=self.dev)
@@ -129,7 +147,7 @@ class Qual(SlotStringer):
 
     def isprerelease(self: Self) -> bool:
         "This method returns whether the current instance denotes a pre-release."
-        return self.pre.phase != "" or self.dev is not None
+        return self.prephase != "" or self.dev is not None
 
     def ispostrelease(self: Self) -> bool:
         "This method returns whether the current instance denotes a post-release."
@@ -149,4 +167,59 @@ class Qual(SlotStringer):
 
     @property
     def pre(self: Self) -> str:
-        return self._pre
+        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

{v440-2.0.0.dev172 → v440-2.0.0.dev174}/src/v440/tests/test_testdata.py

@@ -145,12 +145,13 @@ class TestVersionEpochGo(unittest.TestCase):
 
 
 class TestSlicingGo(unittest.TestCase):
-    def test_slicing_3(self: Self) -> None:
+    def test_slicingmethod(self: Self) -> None:
         sli: dict = Util.util.data["slicingmethod"]
         k: str
         v: dict
         for k, v in sli.items():
-            self.go(**v, key=k)
+            with self.subTest(key=k):
+                self.go(**v)
 
     def go(
         self: Self,
@@ -160,11 +161,10 @@ class TestSlicingGo(unittest.TestCase):
         start: Any = None,
         stop: Any = None,
         step: Any = None,
-        key: str = "",
     ) -> None:
         v: Version = Version(query)
         v.public.base.release[start:stop:step] = change
-        self.assertEqual(str(v), solution, "slicingmethod %s" % key)
+        self.assertEqual(str(v), solution)
 
 
 class TestDataProperty(unittest.TestCase):

{v440-2.0.0.dev172 → v440-2.0.0.dev174}/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.pre.phase = "preview"
+        v.public.qual.prephase = "preview"
         self.assertEqual(str(v), "1.2.3rc1")
         self.assertEqual(str(v.public.qual), "rc1")
 
         # Modify subphase to "42"
-        v.public.qual.pre.num = 42
+        v.public.qual.prenum = 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.pre.phase = "BeTa"
+        v.public.qual.prephase = "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.string = "beta.2"
+        v.public.qual.pre = "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.pre.phase = "PrEvIeW"
+        v.public.qual.prephase = "PrEvIeW"
         self.assertEqual(str(v), "2rc2")  # Even further modified pre-release version
 
     def test_example_6(self: Self) -> None:

{v440-2.0.0.dev172 → v440-2.0.0.dev174}/src/v440/tests/testdata.toml

@@ -937,35 +937,35 @@ query = "1.2.3.4.5.6.7.8.9.10"
 start = -8
 stop = 15
 step = 5
-change = "777"
+change = [7, 7, 7]
 solution = "1.2.7.4.5.6.7.7.9.10.0.0.7"
 
 [slicingmethod.test_slicing_3]
 query = "1.2.3.4.5.6.7.8.9.10"
 start = 3
 stop = 4
-change = 777
+change = [777]
 solution = "1.2.3.777.5.6.7.8.9.10"
 
 [slicingmethod.test_slicing_4]
 query = "1.2.3.4.5.6.7.8.9.10"
 start = 3
 stop = 4
-change = "777"
+change = [7, 7, 7]
 solution = "1.2.3.7.7.7.5.6.7.8.9.10"
 
 [slicingmethod.test_slicing_5]
 query = "1"
 start = 3
 stop = 4
-change = "777"
+change = [7, 7, 7]
 solution = "1.0.0.7.7.7"
 
 [slicingmethod.test_slicing_6]
 query = "1"
 start = 3
 stop = 4
-change = 777
+change = [777]
 solution = "1.0.0.777"
 
 [epoch.test_epoch_as_int]

{v440-2.0.0.dev172 → v440-2.0.0.dev174/src/v440.egg-info}/PKG-INFO

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

@@ -13,7 +13,6 @@ src/v440/_utils/BaseStringer.py
 src/v440/_utils/Cfg.py
 src/v440/_utils/ListStringer.py
 src/v440/_utils/Pattern.py
-src/v440/_utils/QualStringer.py
 src/v440/_utils/SlotStringer.py
 src/v440/_utils/__init__.py
 src/v440/_utils/cfg.toml
@@ -27,7 +26,6 @@ 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.dev172/src/v440/_utils/QualStringer.py

@@ -1,126 +0,0 @@
-import operator
-import string as string_
-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.Cfg import Cfg
-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)
-
-    def _format(self: Self, format_spec: str) -> str:
-        return self._format_cls(
-            format_spec=format_spec,
-            phase=self.phase,
-            num=self.num,
-        )
-
-    @classmethod
-    @abstractmethod
-    def _format_cls(
-        cls: type,
-        *,
-        phase: str,
-        num: int,
-        format_spec: str = "",
-    ) -> str: ...
-
-    @abstractmethod
-    def _num_fset(self: Self, value: int) -> None: ...
-
-    @classmethod
-    @abstractmethod
-    def _phasedict(cls: type) -> dict: ...
-
-    @classmethod
-    def _string_parse_common(cls: type, value: str) -> tuple:
-        y: str = value.lower()
-        y = y.replace("_", ".")
-        y = y.replace("-", ".")
-        x: str = y.rstrip(string_.digits)
-        y = y[len(x) :]
-        if x.endswith("."):
-            x = x[:-1]
-            if not y:
-                raise ValueError
-        if x.startswith("."):
-            x = x[1:]
-            if not x:
-                raise ValueError
-        if x:
-            return cls._phasedict()[x], int("0" + y)
-        elif y:
-            raise ValueError
-        else:
-            return "", 0
-
-    @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:
-        v: str = str(value).lower()
-        if v:
-            self._phase = self._phasedict()[v]
-        elif self.num:
-            self.string = str(self.num)
-        else:
-            self._phase = ""

v440-2.0.0.dev172/src/v440/_utils/releaseparse/setting.py

@@ -1,64 +0,0 @@
-from __future__ import annotations
-
-import operator
-from typing import *
-
-from overloadable import Overloadable
-
-from v440._utils.releaseparse import listing, numerals, ranging
-
-
-def setitem(data: tuple, key: Any, value: Any) -> tuple:
-    f: Callable
-    k: int | range
-    if type(key) is slice:
-        k = ranging.torange(key, len(data))
-        f = setitem_range
-    else:
-        k = operator.index(key)
-        f = setitem_int
-    return f(data, k, value)
-
-
-def setitem_int(data: tuple, key: int, value: Any) -> tuple:
-    v: int = numerals.numeral(value)
-    if key < len(data):
-        edit: list = list(data)
-        edit[key] = v
-        return tuple(edit)
-    if v == 0:
-        return data
-    data += (0,) * (key - len(data))
-    data += (v,)
-    return data
-
-
-@Overloadable
-def setitem_range(data: tuple, key: range, value: Any) -> bool:
-    return key.step == 1
-
-
-@setitem_range.overload(False)
-def setitem_range(data: tuple, key: range, value: Any) -> tuple:
-    key: list = list(key)
-    value: list = listing.tolist(value, slicing=len(key))
-    if len(key) != len(value):
-        e = "attempt to assign sequence of size %s to extended slice of size %s"
-        e %= (len(value), len(key))
-        raise ValueError(e)
-    ext: int = max(0, max(*key) + 1 - len(data))
-    edit: list = list(data)
-    edit += [0] * ext
-    for k, v in zip(key, value):
-        edit[k] = v
-    return tuple(edit)
-
-
-@setitem_range.overload(True)
-def setitem_range(data: tuple, key: range, value: Any) -> tuple:
-    edit: list = list(data)
-    ext: int = max(0, key.start - len(data))
-    edit += ext * [0]
-    l: list = listing.tolist(value, slicing="always")
-    edit = edit[: key.start] + l + edit[key.stop :]
-    return tuple(edit)

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

@@ -1,47 +0,0 @@
-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) -> tuple:
-        return {bool(self)}, self.phase, self.num
-
-    @classmethod
-    def _format_cls(
-        cls: type,
-        *,
-        phase: str,
-        num: int,
-        format_spec: str = "",
-    ) -> str:
-        if format_spec:
-            raise ValueError
-        if phase:
-            return phase + str(num)
-        else:
-            return ""
-
-    def _num_fset(self: Self, value: int) -> None:
-        if value < 0:
-            raise ValueError
-        self.string = self.phase + str(value)
-
-    @classmethod
-    def _phasedict(cls: type) -> dict:
-        return Cfg.cfg.data["pre"]
-
-    def _string_fset(self: Self, value: str) -> None:
-        self._phase, self._num = self._string_parse_common(value)