v440 1.1.0.dev5__tar.gz → 2.0.0.dev0__tar.gz

{v440-1.1.0.dev5/src/v440.egg-info → v440-2.0.0.dev0}/PKG-INFO

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

{v440-1.1.0.dev5 → v440-2.0.0.dev0}/pyproject.toml

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

{v440-1.1.0.dev5 → v440-2.0.0.dev0}/src/v440/core/Version.py

@@ -8,6 +8,7 @@ from catchlib import Catcher
 
 from v440._utils.Base import Base
 from v440._utils.Digest import Digest
+from v440._utils.WList import WList
 from v440.core.Base_ import Base_
 from v440.core.Local import Local
 from v440.core.Pre import Pre
@@ -16,23 +17,37 @@ from v440.core.Qualification import Qualification
 from v440.core.Release import Release
 from v440.core.VersionError import VersionError
 
+parse_data: Digest = Digest("parse_data")
 
-@dataclasses.dataclass(order=True)
-class _Version:
-    public_: Public_ = dataclasses.field(default_factory=Public_)
-    local: Local = dataclasses.field(default_factory=Local)
 
-    def copy(self: Self) -> Self:
-        return dataclasses.replace(self)
+@parse_data.overload()
+def parse_data() -> list:
+    return [None, None]
 
-    def todict(self: Self) -> dict:
-        return dataclasses.asdict(self)
 
+@parse_data.overload(int)
+def parse_data(value: int) -> list:
+    return [value, None]
 
-class Version(Base):
+
+@parse_data.overload(list)
+def parse_data(value: list) -> list:
+    return value
+
+
+@parse_data.overload(str)
+def parse_data(value: str) -> list:
+    if "+" in value:
+        return value.split("+")
+    else:
+        return [value, None]
+
+
+class Version(WList):
+    __slots__ = ("_public_", "_local")
     base: Self
     base_: Base_
-    data: str
+    data: list
     dev: Optional[int]
     epoch: int
     local: Local
@@ -43,58 +58,14 @@ class Version(Base):
     qualification: Qualification
     release: Release
 
-    def __bool__(self: Self) -> bool:
-        return self._data != _Version()
-
     def __init__(self: Self, data: Any = "0", /, **kwargs: Any) -> None:
-        object.__setattr__(self, "_data", _Version())
+        self._public_ = Public_()
+        self._local = Local()
         self.data = data
         self.update(**kwargs)
 
-    def __le__(self: Self, other: Any) -> bool:
-        return self._data <= type(self)(other)._data
-
-    def __setattr__(self: Self, name: str, value: Any) -> None:
-        a: dict = dict()
-        b: dict = dict()
-        catcher: Catcher = Catcher()
-        x: Any
-        y: Any
-        for x, y in self._data.todict().items():
-            with catcher.catch(AttributeError):
-                a[x] = y.data
-            if catcher.caught is not None:
-                b[x] = y
-        try:
-            Base.__setattr__(self, name, value)
-        except VersionError:
-            for x, y in a.items():
-                getattr(self._data, x).data = y
-            for x, y in b.items():
-                setattr(self._data, x, y)
-            raise
-
     def __str__(self: Self) -> str:
-        return self.data
-
-    _data_fset: Digest = Digest("_data_fset")
-
-    @_data_fset.overload()
-    def _data_fset(self: Self) -> None:
-        self.public_ = None
-        self.local = None
-
-    @_data_fset.overload(int)
-    def _data_fset(self: Self, value: int) -> None:
-        self.public_ = value
-        self.local = None
-
-    @_data_fset.overload(str)
-    def _data_fset(self: Self, value: str) -> None:
-        if "+" in value:
-            self.public_, self.local = value.split("+", 1)
-        else:
-            self.public_, self.local = value, None
+        return self.format()
 
     @property
     def base(self: Self) -> Self:
@@ -102,27 +73,23 @@ class Version(Base):
 
     @base.setter
     def base(self: Self, value: Any) -> None:
-        self.public_.base_ = value
+        self.base_ = value
 
     @property
     def base_(self: Self) -> Base_:
-        return self._data.public_.base_
+        return self.public_.base_
 
     @base_.setter
     def base_(self: Self, value: Any) -> None:
         self.base_.data = value
 
-    def clear(self: Self) -> None:
-        self.data = None
-
-    def copy(self: Self) -> Self:
-        return type(self)(self)
-
     @property
     def data(self: Self) -> str:
-        return self.format()
+        return [self.public_, self.local]
 
-    data = data.setter(_data_fset)
+    @data.setter
+    def data(self: Self, value: Any) -> None:
+        self.public_, self.local = parse_data(value)
 
     @property
     def dev(self: Self) -> Optional[int]:
@@ -141,15 +108,7 @@ class Version(Base):
         self.base_.epoch = value
 
     def format(self: Self, cutoff: Any = None) -> str:
-        ans: str = ""
-        if self.epoch:
-            ans += "%s!" % self.epoch
-        ans += self.release.format(cutoff)
-        ans += 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
+        ans: str = self.public_.format(cutoff)
         if self.local:
             ans += "+%s" % self.local
         return ans
@@ -165,11 +124,11 @@ class Version(Base):
 
     @property
     def local(self: Self) -> Local:
-        return self._data.local
+        return self._local
 
     @local.setter
     def local(self: Self, value: Any) -> None:
-        self._data.local.data = value
+        self.local.data = value
 
     def packaging(self: Self) -> packaging.version.Version:
         return packaging.version.Version(str(self))
@@ -196,11 +155,11 @@ class Version(Base):
 
     @public.setter
     def public(self: Self, value: Any) -> None:
-        self.public_.data = value
+        self.public_ = value
 
     @property
     def public_(self: Self) -> Self:
-        return self._data.public_
+        return self._public_
 
     @public_.setter
     def public_(self: Self, value: Any) -> None:
@@ -208,7 +167,7 @@ class Version(Base):
 
     @property
     def qualification(self: Self) -> Qualification:
-        return self._data.public_.qualification
+        return self.public_.qualification
 
     @qualification.setter
     def qualification(self: Self, value: Any) -> None:
@@ -235,3 +194,5 @@ class Version(Base):
             m: str = "%r is not a property"
             m %= x
             raise AttributeError(m)
+
+    _data = data

{v440-1.1.0.dev5 → v440-2.0.0.dev0}/src/v440/tests/test_testdata.py

@@ -191,8 +191,6 @@ class TestDataProperty(unittest.TestCase):
         msg: str = "data_property %r" % key
         self.v.data = query
         self.assertEqual(solution, str(self.v), msg=msg)
-        self.assertEqual(self.v.data, str(self.v), msg=msg)
-        self.assertEqual(type(self.v.data), str, msg=msg)
 
 
 class TestVersionRelease(unittest.TestCase):

{v440-1.1.0.dev5 → v440-2.0.0.dev0/src/v440.egg-info}/PKG-INFO

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

{v440-1.1.0.dev5 → v440-2.0.0.dev0}/src/v440/tests/testdata.toml

@@ -721,7 +721,6 @@ Post-releases = [
 "Invalid cases (testing error handling for extreme cases)" = [
     "1.0.0alpha_beta",
     "1!2.0.0+",
-    "1.0.0++local.version.doubleplus",
 ]
 "Cases with inconsistent pre-release and post-release ordering" = [
     "1.0.0.post1a1",
@@ -741,6 +740,7 @@ Post-releases = [
     "1.0.0a1..post2",
     "2!1..0",
     "1.0.0+build@sha.123",
+    "1.0.0++local.version.doubleplus",
 ]
 
 [devint.test_dev_as_int]