v440 2.0.0.dev16__tar.gz → 2.0.0.dev18__tar.gz

{v440-2.0.0.dev16/src/v440.egg-info → v440-2.0.0.dev18}/PKG-INFO

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

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

v440-2.0.0.dev18/src/v440/_utils/BaseList.py

@@ -0,0 +1,9 @@
+from abc import abstractmethod
+from typing import *
+
+
+class BaseList:
+    __slots__ = ()
+
+    @abstractmethod
+    def isempty(self: Self) -> bool: ...

v440-2.0.0.dev18/src/v440/_utils/SlotList.py

@@ -0,0 +1,129 @@
+import collections
+import operator
+from abc import abstractmethod
+from typing import *
+
+import scaevola
+from datarepr import datarepr
+from unhash import unhash
+
+from v440._utils.BaseList import BaseList
+from v440._utils.utils import guard
+from v440.core.VersionError import VersionError
+
+__all__ = ["SlotList"]
+
+
+@scaevola.auto
+class SlotList(collections.abc.Collection, BaseList):
+    __slots__ = ()
+
+    data: list
+
+    def __contains__(self: Self, other: Any) -> bool:
+        return other in self.data
+
+    def __eq__(self: Self, other: Any) -> bool:
+        "This magic method implements self==other."
+        try:
+            alt: Self = type(self)(other)
+        except VersionError:
+            return False
+        else:
+            return self.data == alt.data
+
+    def __format__(self: Self, format_spec: Any = "", /) -> str:
+        "This magic method implements format(self, format_spec)."
+        return format(str(self), str(format_spec))
+
+    def __getitem__(self: Self, key: Any) -> Any:
+        return self.data[key]
+
+    def __ge__(self: Self, other: Any, /) -> bool:
+        "This magic method implements self<=other."
+        alt: Self
+        try:
+            alt = type(self)(other)
+        except VersionError:
+            return NotImplemented
+        else:
+            return self._cmp() >= alt._cmp()
+
+    def __gt__(self: Self, other: Any, /) -> bool:
+        "This magic method implements self<=other."
+        alt: Self
+        try:
+            alt = type(self)(other)
+        except VersionError:
+            return NotImplemented
+        else:
+            return self._cmp() > alt._cmp()
+
+    __hash__ = unhash
+
+    def __init__(self: Self, data: Any = None) -> None:
+        self.data = data
+
+    def __iter__(self: Self) -> Any:
+        return iter(self.data)
+
+    def __le__(self: Self, other: Any, /) -> bool:
+        "This magic method implements self<=other."
+        alt: Self
+        try:
+            alt = type(self)(other)
+        except VersionError:
+            return NotImplemented
+        else:
+            return self._cmp() <= alt._cmp()
+
+    def __len__(self: Self) -> int:
+        return len(type(self).__slots__)
+
+    def __lt__(self: Self, other: Any, /) -> bool:
+        "This magic method implements self<=other."
+        alt: Self
+        try:
+            alt = type(self)(other)
+        except VersionError:
+            return NotImplemented
+        else:
+            return self._cmp() < alt._cmp()
+
+    def __ne__(self: Self, other: Any) -> bool:
+        return not (self == other)
+
+    def __repr__(self: Self) -> str:
+        return datarepr(type(self).__name__, self.data)
+
+    def __reversed__(self: Self) -> Iterable:
+        return reversed(self.data)
+
+    def __setitem__(self: Self, key: Any, value: Any) -> None:
+        data: list = self.data
+        data[key] = value
+        self.data = data
+
+    def __str__(self: Self) -> str:
+        return NotImplemented
+
+    @classmethod
+    def __subclasshook__(cls: type, other: type, /) -> bool:
+        "This magic classmethod can be overwritten for a custom subclass check."
+        return NotImplemented
+
+    def _cmp(self: Self) -> Any:
+        return self.data
+
+    def copy(self: Self) -> Self:
+        return type(self)(self)
+
+    def count(self: Self, value: Any) -> Any:
+        return self.data.count(value)
+
+    @property
+    @abstractmethod
+    def data(self: Self) -> list: ...
+
+    def index(self: Self, value: Any) -> Any:
+        return self.data.index(value)

{v440-2.0.0.dev16 → v440-2.0.0.dev18}/src/v440/_utils/VList.py

@@ -2,10 +2,12 @@ from typing import *
 
 from datahold import OkayList
 
+from v440._utils.BaseList import BaseList
 from v440.core.VersionError import VersionError
 
 
-class VList(OkayList):
+class VList(OkayList, BaseList):
+
     def __eq__(self: Self, other: Any) -> bool:
         "This magic method implements self==other."
         ans: bool
@@ -54,3 +56,6 @@ class VList(OkayList):
         ans: Any = self.copy()
         ans.sort(**kwargs)
         return ans
+
+    def isempty(self: Self) -> bool:
+        return len(self) == 0

{v440-2.0.0.dev16 → v440-2.0.0.dev18}/src/v440/core/Base.py

@@ -3,8 +3,8 @@ from __future__ import annotations
 from typing import *
 
 from v440._utils.Digest import Digest
+from v440._utils.SlotList import SlotList
 from v440._utils.utils import guard
-from v440._utils.WList import WList
 from v440.core.Release import Release
 
 __all__ = ["Base"]
@@ -64,7 +64,7 @@ def parse_epoch(value: str) -> int:
     return ans
 
 
-class Base(WList):
+class Base(SlotList):
 
     __slots__ = ("_epoch", "_release")
 
@@ -81,11 +81,12 @@ class Base(WList):
         return self.format()
 
     @property
-    def _data(self: Self) -> tuple:
-        return self.epoch, self.release
+    def data(self: Self) -> list:
+        return [self.epoch, self.release]
 
-    @_data.setter
-    def _data(self: Self, value: Any) -> None:
+    @data.setter
+    @guard
+    def data(self: Self, value: Iterable) -> None:
         self.epoch, self.release = parse_data(value)
 
     @property

{v440-2.0.0.dev16 → v440-2.0.0.dev18}/src/v440/core/Pre.py

@@ -2,13 +2,11 @@ from __future__ import annotations
 
 from typing import *
 
-import keyalias
-
 from v440._utils import utils
 from v440._utils.Digest import Digest
 from v440._utils.Pattern import Pattern
+from v440._utils.SlotList import SlotList
 from v440._utils.utils import guard
-from v440._utils.WList import WList
 
 __all__ = ["Pre"]
 
@@ -62,8 +60,7 @@ def parse_data(value: str) -> list:
     return [l, n]
 
 
-@keyalias.keyalias(phase=0, subphase=1)
-class Pre(WList):
+class Pre(SlotList):
 
     __slots__ = ("_phase", "_subphase")
 
@@ -84,12 +81,29 @@ class Pre(WList):
         return ans
 
     @property
-    def _data(self: Self) -> tuple:
-        return self._phase, self._subphase
+    def data(self: Self) -> list:
+        return [self._phase, self._subphase]
 
-    @_data.setter
-    def _data(self: Self, value: Any) -> None:
+    @data.setter
+    @guard
+    def data(self: Self, value: Any) -> None:
         self._phase, self._subphase = parse_data(value)
 
     def isempty(self: Self) -> bool:
-        return set(self._data) == {None}
+        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.dev16 → v440-2.0.0.dev18}/src/v440/core/Public.py

@@ -4,8 +4,8 @@ from typing import *
 
 from v440._utils.Digest import Digest
 from v440._utils.Pattern import Pattern
+from v440._utils.SlotList import SlotList
 from v440._utils.utils import guard
-from v440._utils.WList import WList
 from v440.core.Base import Base
 from v440.core.Qualification import Qualification
 
@@ -36,7 +36,7 @@ def parse_data(value: str) -> list:
     return value[: match.end()], value[match.end() :]
 
 
-class Public(WList):
+class Public(SlotList):
 
     __slots__ = ("_base", "_qualification")
 
@@ -52,14 +52,6 @@ class Public(WList):
     def __str__(self: Self) -> str:
         return self.format()
 
-    @property
-    def _data(self: Self) -> list:
-        return [self.base, self.qualification]
-
-    @_data.setter
-    def _data(self: Self, value: Any) -> None:
-        self.base, self.qualification = parse_data(value)
-
     @property
     def base(self: Self) -> Base:
         return self._base
@@ -69,6 +61,15 @@ class Public(WList):
     def base(self: Self, value: Any) -> None:
         self.base.data = value
 
+    @property
+    def data(self: Self) -> list:
+        return [self.base, self.qualification]
+
+    @data.setter
+    @guard
+    def data(self: Self, value: Any) -> None:
+        self.base, self.qualification = parse_data(value)
+
     def format(self: Self, cutoff: Any = None) -> str:
         return self.base.format(cutoff) + str(self.qualification)
 

{v440-2.0.0.dev16 → v440-2.0.0.dev18}/src/v440/core/Qualification.py

@@ -3,10 +3,10 @@ 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._utils.WList import WList
 from v440.core.Pre import Pre
 
 __all__ = ["Qualification"]
@@ -57,7 +57,7 @@ def parse_data(value: str) -> list:
     return [pre, post, dev]
 
 
-class Qualification(WList):
+class Qualification(BaseList):
 
     __slots__ = ("_pre", "_post", "_dev")
 
@@ -72,9 +72,6 @@ class Qualification(WList):
         self._dev = None
         self.data = data
 
-    def __le__(self: Self, other: Any) -> bool:
-        return self._cmpkey() <= type(self)(other)._cmpkey()
-
     def __str__(self: Self) -> str:
         ans: str = str(self.pre)
         if self.post is not None:
@@ -83,7 +80,7 @@ class Qualification(WList):
             ans += ".dev%s" % self.dev
         return ans
 
-    def _cmpkey(self: Self) -> tuple:
+    def _cmp(self: Self) -> list:
         ans = self.data
         if not ans[0].isempty():
             ans[0] = tuple(ans[0])
@@ -100,11 +97,12 @@ class Qualification(WList):
         return ans
 
     @property
-    def _data(self: Self) -> tuple:
-        return self.pre, self.post, self.dev
+    def data(self: Self) -> list:
+        return [self.pre, self.post, self.dev]
 
-    @_data.setter
-    def _data(self: Self, value: Any) -> None:
+    @data.setter
+    @guard
+    def data(self: Self, value: Any) -> None:
         self.pre, self.post, self.dev = parse_data(value)
 
     @property

{v440-2.0.0.dev16 → v440-2.0.0.dev18}/src/v440/core/Version.py

@@ -5,8 +5,8 @@ from typing import *
 import packaging.version
 
 from v440._utils.Digest import Digest
+from v440._utils.SlotList import SlotList
 from v440._utils.utils import guard
-from v440._utils.WList import WList
 from v440.core.Base import Base
 from v440.core.Local import Local
 from v440.core.Pre import Pre
@@ -40,7 +40,7 @@ def parse_data(value: str) -> list:
         return [value, None]
 
 
-class Version(WList):
+class Version(SlotList):
     __slots__ = ("_public", "_local")
     base: Base
     data: list
@@ -63,11 +63,12 @@ class Version(WList):
         return self.format()
 
     @property
-    def _data(self: Self) -> tuple:
-        return (self.public, self.local)
+    def data(self: Self) -> list:
+        return [self.public, self.local]
 
-    @_data.setter
-    def _data(self: Self, value: Any) -> None:
+    @data.setter
+    @guard
+    def data(self: Self, value: Any) -> None:
         self.public, self.local = parse_data(value)
 
     @property

{v440-2.0.0.dev16 → v440-2.0.0.dev18}/src/v440/tests/test_testdata.py

@@ -355,14 +355,6 @@ class TestPackaging(unittest.TestCase):
             version_obj.local = v.packaging().local
             self.assertEqual(str(v.local), str(version_obj.local))
 
-    def test_exc(self: Self) -> None:
-        l: list
-        x: str
-        for l in Util.util.data["strings"]["exc"].values():
-            for x in l:
-                with self.assertRaises(VersionError):
-                    Version(x)
-
     def test_exc_pack(self: Self) -> None:
         impure: list = list()
         l: list
@@ -376,5 +368,20 @@ class TestPackaging(unittest.TestCase):
                 packaging.version.Version(x)
 
 
+class TestExc(unittest.TestCase):
+    def test_exc(self: Self) -> None:
+        k: str
+        l: list
+        for k, l in Util.util.data["strings"]["exc"].items():
+            self.go(key=k, queries=l)
+
+    def go(self: Self, key: str, queries: list) -> None:
+        x: str
+        with self.subTest(key=key):
+            for x in queries:
+                with self.assertRaises(VersionError):
+                    Version(x)
+
+
 if __name__ == "__main__":
     unittest.main()

{v440-2.0.0.dev16 → v440-2.0.0.dev18}/src/v440/tests/test_version.py

@@ -104,9 +104,9 @@ class TestExample(unittest.TestCase):
         v.release.micro = 4
         self.assertEqual(str(v), "2.64.4")  # Further modified version
 
-    def test_example_3(self: Self) -> None:
+    def test_example_3a(self: Self) -> None:
         v1: Version = Version("1.6.3")
-        v2: Version = Version("1.6.4")
+        v2: str = "1.6.4"
         self.assertEqual(str(v1), "1.6.3")  # v1
         self.assertEqual(str(v2), "1.6.4")  # v2
         self.assertFalse(v1 == v2)  # v1 == v2 gives False
@@ -116,9 +116,9 @@ class TestExample(unittest.TestCase):
         self.assertFalse(v1 > v2)  # v1 > v2 gives False
         self.assertTrue(v1 < v2)  # v1 < v2 gives True
 
-    def test_example_3a(self: Self) -> None:
-        v1: Version = Version("1.6.3")
-        v2: str = "1.6.4"
+    def test_example_3b(self: Self) -> None:
+        v1: str = "1.6.3"
+        v2: Version = Version("1.6.4")
         self.assertEqual(str(v1), "1.6.3")  # v1
         self.assertEqual(str(v2), "1.6.4")  # v2
         self.assertFalse(v1 == v2)  # v1 == v2 gives False
@@ -128,8 +128,8 @@ class TestExample(unittest.TestCase):
         self.assertFalse(v1 > v2)  # v1 > v2 gives False
         self.assertTrue(v1 < v2)  # v1 < v2 gives True
 
-    def test_example_3b(self: Self) -> None:
-        v1: str = "1.6.3"
+    def test_example_3c(self: Self) -> None:
+        v1: Version = Version("1.6.3")
         v2: Version = Version("1.6.4")
         self.assertEqual(str(v1), "1.6.3")  # v1
         self.assertEqual(str(v2), "1.6.4")  # v2
@@ -181,7 +181,7 @@ class TestExample(unittest.TestCase):
         self.assertEqual(str(v), "0")  # After reset
         v.base = "4!5.0.1"
         self.assertEqual(str(v), "4!5.0.1")  # Before error
-        with self.assertRaises(VersionError) as context:
+        with self.assertRaises(VersionError):
             v.base = "9!x"
         self.assertEqual(str(v), "4!5.0.1")  # After error
 
@@ -190,7 +190,7 @@ class TestPatch(unittest.TestCase):
     def test_example_0(self: Self) -> None:
         x: Pre = Pre("a1")
         y: Pre = Pre("b2")
-        with self.assertRaises(VersionError):
+        with self.assertRaises(Exception):
             x += y
 
 
@@ -286,7 +286,7 @@ class TestAdditionalVersionRelease(unittest.TestCase):
         # Test if release supports iteration
         version: Version = Version()
         version.release = [1, 2, 3]
-        result = [x for x in version.release]
+        result = list(version.release)
         self.assertEqual(result, [1, 2, 3])
 
     def test_release_repr(self: Self) -> None:
@@ -389,7 +389,7 @@ class TestVersionLocal(unittest.TestCase):
         # Test if local supports iteration
         version: Version = Version()
         version.local = "1.dev.build"
-        result: list = [x for x in version.local]
+        result: list = list(version.local)
         self.assertEqual(result, [1, "dev", "build"])
 
 

{v440-2.0.0.dev16 → v440-2.0.0.dev18/src/v440.egg-info}/PKG-INFO

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

@@ -9,11 +9,12 @@ src/v440.egg-info/SOURCES.txt
 src/v440.egg-info/dependency_links.txt
 src/v440.egg-info/requires.txt
 src/v440.egg-info/top_level.txt
+src/v440/_utils/BaseList.py
 src/v440/_utils/Digest.py
 src/v440/_utils/Pattern.py
 src/v440/_utils/SimpleQualifierParser.py
+src/v440/_utils/SlotList.py
 src/v440/_utils/VList.py
-src/v440/_utils/WList.py
 src/v440/_utils/__init__.py
 src/v440/_utils/utils.py
 src/v440/core/Base.py

v440-2.0.0.dev16/src/v440/_utils/WList.py

@@ -1,17 +0,0 @@
-from typing import *
-
-from v440._utils.utils import guard
-from v440._utils.VList import VList
-
-__all__ = ["WList"]
-
-
-class WList(VList):
-    @property
-    def data(self: Self) -> list:
-        return list(self._data)
-
-    @data.setter
-    @guard
-    def data(self: Self, value: Any) -> None:
-        self._data = value