v440 2.0.0.dev13__tar.gz → 2.0.0.dev15__tar.gz

{v440-2.0.0.dev13/src/v440.egg-info → v440-2.0.0.dev15}/PKG-INFO

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

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

{v440-2.0.0.dev13 → v440-2.0.0.dev15}/src/v440/_utils/SimpleQualifierParser.py

@@ -38,13 +38,15 @@ class SimpleQualifierParser:
         v = v.replace("_", ".")
         v = v.replace("-", ".")
         m: Any = Pattern.PARSER.bound.search(v)
-        l, n = m.groups()
-        if l not in self.keysforstr:
+        x: Any
+        y: Any
+        x, y = m.groups()
+        if x not in self.keysforstr:
             raise ValueError
-        if n is None:
+        if y is None:
             return None
         else:
-            return int(n)
+            return int(y)
 
     def __init__(
         self: Self,

{v440-2.0.0.dev13 → v440-2.0.0.dev15}/src/v440/_utils/utils.py

@@ -44,7 +44,7 @@ def _segment():
 
 
 @_segment.overload(int)
-def byInt(value: int, /) -> Any:
+def _segment(value: int, /) -> Any:
     if value < 0:
         raise ValueError
     return value

{v440-2.0.0.dev13 → v440-2.0.0.dev15}/src/v440/core/Public.py

@@ -51,6 +51,14 @@ 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
@@ -59,14 +67,6 @@ 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
-    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)
 
@@ -77,5 +77,3 @@ class Public(WList):
     @qualification.setter
     def qualification(self: Self, value: Any) -> None:
         self.qualification.data = value
-
-    _data = data

{v440-2.0.0.dev13 → v440-2.0.0.dev15}/src/v440/tests/test_testdata.py

@@ -10,6 +10,7 @@ import iterprod
 import packaging.version
 from catchlib import Catcher
 
+from v440.core.Release import Release
 from v440.core.Version import Version
 from v440.core.VersionError import VersionError
 
@@ -77,9 +78,9 @@ class TestVersionLocalVersionError(unittest.TestCase):
         k: str
         v: dict
         for k, v in Util.util.data["local_VersionError"].items():
-            self.local(**v, key=k)
+            self.go(**v, key=k)
 
-    def local(
+    def go(
         self: Self,
         key: str,
         query: list,
@@ -177,37 +178,32 @@ class TestSlicing(unittest.TestCase):
 
 class TestDataProperty(unittest.TestCase):
     def test_data(self: Self) -> None:
-        self.v = Version()
-        for k, v in Util.util.data["data_property"].items():
-            self.data(**v, key=k)
-        self.data(query=None, solution="0")
+        for k, v in Util.util.data["data-property"].items():
+            self.go(**v, key=k)
 
-    def data(
+    def go(
         self: Self,
-        query: Any,
-        solution: str,
+        query: Any = None,
+        solution: Any = None,
         key: str = "",
     ) -> None:
-        msg: str = "data_property %r" % key
-        self.v.data = query
-        self.assertEqual(solution, str(self.v), msg=msg)
+        msg: str = "data-property %r" % key
+        version: Version = Version()
+        version.data = query
+        self.assertEqual(solution, str(version), msg=msg)
 
 
 class TestVersionRelease(unittest.TestCase):
 
-    def setUp(self: Self) -> None:
-        # Create a version class instance
-        self.version = Version()
-
     def test_0(self: Self) -> None:
         k: str
         v: Any
         for k, v in Util.util.data["release"].items():
-            self.release(key=k, **v)
+            self.go(key=k, **v)
 
-    def release(self: Self, query: Any, solution: Any, key: str = "") -> None:
-        self.version.release = query
-        self.assertEqual(self.version.release, solution)
+    def go(self: Self, query: Any, solution: Any, key: str = "") -> None:
+        release: Release = Release(query)
+        self.assertEqual(release, solution)
 
 
 class TestDev(unittest.TestCase):

{v440-2.0.0.dev13 → v440-2.0.0.dev15}/src/v440/tests/test_version.py

@@ -10,7 +10,7 @@ class TestVersionManipulation(unittest.TestCase):
 
     def test_version_modification(self: Self) -> None:
         # Create an instance of the v440.Version class
-        v = Version("1.2.3")
+        v: Version = Version("1.2.3")
 
         # Modify individual parts of the version
         v.release.major = 2
@@ -25,7 +25,7 @@ class TestVersionManipulation(unittest.TestCase):
 class TestVersionLocal(unittest.TestCase):
 
     def test_version_operations(self: Self) -> None:
-        v = Version("1.2.3")
+        v: Version = Version("1.2.3")
         backup = v.local
         v.local = "local.1.2.3"
         self.assertEqual(str(v), "1.2.3+local.1.2.3")
@@ -53,7 +53,7 @@ class TestVersionLocal(unittest.TestCase):
 class TestVersion(unittest.TestCase):
 
     def test_version_pre(self: Self) -> None:
-        v = Version("1.2.3")
+        v: Version = Version("1.2.3")
         backup = v.pre
 
         # Initial version, no pre-release version
@@ -93,20 +93,20 @@ class TestVersion(unittest.TestCase):
 class TestExample(unittest.TestCase):
 
     def test_example_1(self: Self) -> None:
-        v = Version("v1.0.0")
+        v: Version = Version("v1.0.0")
         self.assertEqual(str(v), "1")  # Initial version
         self.assertEqual(v.format("3"), "1.0.0")  # Initial version formatted
 
     def test_example_2(self: Self) -> None:
-        v = Version("2.5.3")
+        v: Version = Version("2.5.3")
         self.assertEqual(str(v), "2.5.3")  # Modified version
         v.release[1] = 64
         v.release.micro = 4
         self.assertEqual(str(v), "2.64.4")  # Further modified version
 
     def test_example_3(self: Self) -> None:
-        v1 = Version("1.6.3")
-        v2 = Version("1.6.4")
+        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
         self.assertFalse(v1 == v2)  # v1 == v2 gives False
@@ -117,8 +117,8 @@ class TestExample(unittest.TestCase):
         self.assertTrue(v1 < v2)  # v1 < v2 gives True
 
     def test_example_3a(self: Self) -> None:
-        v1 = Version("1.6.3")
-        v2 = "1.6.4"
+        v1: Version = Version("1.6.3")
+        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
@@ -129,8 +129,8 @@ class TestExample(unittest.TestCase):
         self.assertTrue(v1 < v2)  # v1 < v2 gives True
 
     def test_example_3b(self: Self) -> None:
-        v1 = "1.6.3"
-        v2 = Version("1.6.4")
+        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
@@ -141,13 +141,13 @@ class TestExample(unittest.TestCase):
         self.assertTrue(v1 < v2)  # v1 < v2 gives True
 
     def test_example_4(self: Self) -> None:
-        v = Version("2.5.3.9")
+        v: Version = Version("2.5.3.9")
         self.assertEqual(str(v), "2.5.3.9")  # before sorting
         v.release.sort()
         self.assertEqual(str(v), "2.3.5.9")  # after sorting
 
     def test_example_5(self: Self) -> None:
-        v = Version("2.0.0-alpha.1")
+        v: Version = Version("2.0.0-alpha.1")
         self.assertEqual(str(v), "2a1")  # Pre-release version
         v.pre = "beta.2"
         self.assertEqual(str(v), "2b2")  # Modified pre-release version
@@ -157,7 +157,7 @@ class TestExample(unittest.TestCase):
         self.assertEqual(str(v), "2rc4")  # Even further modified pre-release version
 
     def test_example_6(self: Self) -> None:
-        v = Version("1.2.3")
+        v: Version = Version("1.2.3")
         v.post = "post1"
         v.local = "local.7.dev"
         self.assertEqual(str(v), "1.2.3.post1+local.7.dev")  # Post-release version
@@ -175,7 +175,7 @@ class TestExample(unittest.TestCase):
         self.assertEqual(str(v), "1.2.3.post3+3.test.19")  # Modified local again
 
     def test_example_7(self: Self) -> None:
-        v = Version("5.0.0")
+        v: Version = Version("5.0.0")
         self.assertEqual(str(v), "5")  # Original version
         v.data = None
         self.assertEqual(str(v), "0")  # After reset
@@ -199,184 +199,200 @@ class TestPatch(unittest.TestCase):
 
 class TestVersionRelease(unittest.TestCase):
 
-    def setUp(self: Self) -> None:
-        # Create a version class instance
-        self.version = Version()
-
     def test_major_minor_micro_aliases(self: Self) -> None:
         # Test major, minor, and micro aliases for the first three indices
-        self.version.release = [1, 2, 3]
-        self.assertEqual(self.version.release.major, 1)
-        self.assertEqual(self.version.release.minor, 2)
-        self.assertEqual(self.version.release.micro, 3)
-        self.assertEqual(self.version.release.patch, 3)  # 'patch' is an alias for micro
+        version: Version = Version()
+        version.release = [1, 2, 3]
+        self.assertEqual(version.release.major, 1)
+        self.assertEqual(version.release.minor, 2)
+        self.assertEqual(version.release.micro, 3)
+        self.assertEqual(version.release.patch, 3)  # 'patch' is an alias for micro
 
     def test_release_modify_aliases(self: Self) -> None:
         # Test modifying the release via major, minor, and micro properties
-        self.version.release = [1, 2, 3]
-        self.version.release.major = 10
-        self.version.release.minor = 20
-        self.version.release.micro = 30
-        self.assertEqual(self.version.release, [10, 20, 30])
-        self.assertEqual(self.version.release.patch, 30)
+        version: Version = Version()
+        version.release = [1, 2, 3]
+        version.release.major = 10
+        version.release.minor = 20
+        version.release.micro = 30
+        self.assertEqual(version.release, [10, 20, 30])
+        self.assertEqual(version.release.patch, 30)
 
     def test_release_with_tailing_zeros_simulation(self: Self) -> None:
         # Test that the release can simulate arbitrary high number of tailing zeros
-        self.version.release = [1, 2]
-        simulated_release = self.version.release[:5]
+        version: Version = Version()
+        version.release = [1, 2]
+        simulated_release = version.release[:5]
         self.assertEqual(simulated_release, [1, 2, 0, 0, 0])
 
     def test_release_empty_major(self: Self) -> None:
         # Test that an empty release still has valid major, minor, micro values
-        self.version.release = []
-        self.assertEqual(self.version.release.major, 0)
-        self.assertEqual(self.version.release.minor, 0)
-        self.assertEqual(self.version.release.micro, 0)
-        self.assertEqual(self.version.release.patch, 0)
+        version: Version = Version()
+        version.release = []
+        self.assertEqual(version.release.major, 0)
+        self.assertEqual(version.release.minor, 0)
+        self.assertEqual(version.release.micro, 0)
+        self.assertEqual(version.release.patch, 0)
 
     def test_release_modify_with_alias_increase_length(self: Self) -> None:
         # Test that modifying an alias can extend the length of release
-        self.version.release = [1]
-        self.version.release.minor = 5  # This should make release [1, 5]
-        self.assertEqual(self.version.release, [1, 5])
-        self.version.release.micro = 3  # This should make release [1, 5, 3]
-        self.assertEqual(self.version.release, [1, 5, 3])
+        version: Version = Version()
+        version.release = [1]
+        version.release.minor = 5  # This should make release [1, 5]
+        self.assertEqual(version.release, [1, 5])
+        version.release.micro = 3  # This should make release [1, 5, 3]
+        self.assertEqual(version.release, [1, 5, 3])
 
     def test_release_modify_major_only(self: Self) -> None:
         # Test that setting just the major property works
-        self.version.release.major = 10
-        self.assertEqual(self.version.release, [10])
+        version: Version = Version()
+        version.release.major = 10
+        self.assertEqual(version.release, [10])
 
     def test_release_modify_minor_only(self: Self) -> None:
         # Test that setting just the minor property extends release
-        self.version.release = []
-        self.version.release.minor = 1
-        self.assertEqual(self.version.release, [0, 1])
+        version: Version = Version()
+        version.release = []
+        version.release.minor = 1
+        self.assertEqual(version.release, [0, 1])
 
     def test_release_modify_micro_only(self: Self) -> None:
         # Test that setting just the micro (patch) property extends release
-        self.version.release = []
-        self.version.release.micro = 1
-        self.assertEqual(self.version.release, [0, 0, 1])
+        version: Version = Version()
+        version.release = []
+        version.release.micro = 1
+        self.assertEqual(version.release, [0, 0, 1])
 
 
 class TestAdditionalVersionRelease(unittest.TestCase):
 
-    def setUp(self: Self) -> None:
-        # Initialize a fresh Version instance for every test
-        self.version = Version()
-
     def test_release_inequality_with_list(self: Self) -> None:
         # Test inequality of release with a normal list
-        self.version.release = [1, 2, 3]
-        self.assertFalse(self.version.release == [1, 2, 4])
+        version: Version = Version()
+        version.release = [1, 2, 3]
+        self.assertFalse(version.release == [1, 2, 4])
 
     def test_release_len(self: Self) -> None:
         # Test the length of the release list
-        self.version.release = [1, 2, 3]
-        self.assertEqual(len(self.version.release), 3)
+        version: Version = Version()
+        version.release = [1, 2, 3]
+        self.assertEqual(len(version.release), 3)
 
     def test_release_slice_assignment(self: Self) -> None:
         # Test assigning a slice to release
-        self.version.release = [1, 2, 3, 4, 5]
-        self.version.release[1:4] = [20, 30, 40]
-        self.assertEqual(self.version.release, [1, 20, 30, 40, 5])
+        version: Version = Version()
+        version.release = [1, 2, 3, 4, 5]
+        version.release[1:4] = [20, 30, 40]
+        self.assertEqual(version.release, [1, 20, 30, 40, 5])
 
     def test_release_iterable(self: Self) -> None:
         # Test if release supports iteration
-        self.version.release = [1, 2, 3]
-        result = [x for x in self.version.release]
+        version: Version = Version()
+        version.release = [1, 2, 3]
+        result = [x for x in version.release]
         self.assertEqual(result, [1, 2, 3])
 
     def test_release_repr(self: Self) -> None:
         # Test the repr of the release property
-        self.version.release = [1, 2, 3]
-        self.assertEqual(str(self.version.release), "1.2.3")
+        version: Version = Version()
+        version.release = [1, 2, 3]
+        self.assertEqual(str(version.release), "1.2.3")
 
     def test_release_data_property(self: Self) -> None:
         # Test the 'data' property
-        self.version.release = [1, 2, 3]
-        self.assertEqual(self.version.release.data, [1, 2, 3])
+        version: Version = Version()
+        version.release = [1, 2, 3]
+        self.assertEqual(version.release.data, [1, 2, 3])
 
     def test_release_data_setter(self: Self) -> None:
         # Test setting the 'data' property directly
-        self.version.release.data = [10, 20, 30]
-        self.assertEqual(self.version.release, [10, 20, 30])
+        version: Version = Version()
+        version.release.data = [10, 20, 30]
+        self.assertEqual(version.release, [10, 20, 30])
 
     def test_release_contains(self: Self) -> None:
         # Test 'in' keyword with release
-        self.version.release = [1, 2, 3]
-        self.assertIn(2, self.version.release)
-        self.assertNotIn(4, self.version.release)
+        version: Version = Version()
+        version.release = [1, 2, 3]
+        self.assertIn(2, version.release)
+        self.assertNotIn(4, version.release)
 
     def test_release_mul(self: Self) -> None:
         # Test multiplying the release (list behavior)
-        self.version.release = [1, 2]
-        self.assertEqual(self.version.release * 3, [1, 2, 1, 2, 1, 2])
+        version: Version = Version()
+        version.release = [1, 2]
+        self.assertEqual(version.release * 3, [1, 2, 1, 2, 1, 2])
 
     def test_release_addition(self: Self) -> None:
         # Test adding another list to release
-        self.version.release = [1, 2, 3]
-        self.assertEqual(self.version.release + [4, 5], [1, 2, 3, 4, 5])
+        version: Version = Version()
+        version.release = [1, 2, 3]
+        self.assertEqual(version.release + [4, 5], [1, 2, 3, 4, 5])
 
 
 class TestVersionLocal(unittest.TestCase):
 
-    def setUp(self: Self) -> None:
-        # Initialize a fresh Version instance for every test
-        self.version = Version()
-
     def test_local_len(self: Self) -> None:
         # Test the length of the local list
-        self.version.local = [1, "dev", "build"]
-        self.assertEqual(len(self.version.local), 3)
+        version: Version = Version()
+        version.local = [1, "dev", "build"]
+        self.assertEqual(len(version.local), 3)
 
     def test_local_slice_assignment(self: Self) -> None:
         # Test assigning a slice to the local list
-        self.version.local = [1, "dev", "build"]
-        self.version.local[1:3] = ["alpha", "beta"]
-        self.assertEqual(self.version.local, [1, "alpha", "beta"])
+        version: Version = Version()
+        version.local = [1, "dev", "build"]
+        version.local[1:3] = ["alpha", "beta"]
+        self.assertEqual(version.local, [1, "alpha", "beta"])
 
     def test_local_contains(self: Self) -> None:
         # Test 'in' keyword with local list
-        self.version.local = [1, "dev", "build"]
-        self.assertIn("dev", self.version.local)
-        self.assertNotIn("alpha", self.version.local)
+        version: Version = Version()
+        version.local = [1, "dev", "build"]
+        self.assertIn("dev", version.local)
+        self.assertNotIn("alpha", version.local)
 
     def test_local_mul(self: Self) -> None:
         # Test multiplying the local list
-        self.version.local = [1, "dev"]
-        self.assertEqual(self.version.local * 3, [1, "dev", 1, "dev", 1, "dev"])
+        version: Version = Version()
+        version.local = [1, "dev"]
+        self.assertEqual(version.local * 3, [1, "dev", 1, "dev", 1, "dev"])
 
     def test_local_addition(self: Self) -> None:
         # Test adding another list to local
-        self.version.local = [1, "dev"]
-        self.assertEqual(self.version.local + ["build"], [1, "dev", "build"])
+        version: Version = Version()
+        version.local = [1, "dev"]
+        self.assertEqual(version.local + ["build"], [1, "dev", "build"])
 
     def test_local_inequality_with_list(self: Self) -> None:
         # Test inequality of local with a normal list
-        self.version.local = [1, "dev"]
-        self.assertFalse(self.version.local == [1, "build"])
+        version: Version = Version()
+        version.local = [1, "dev"]
+        self.assertFalse(version.local == [1, "build"])
 
     def test_local_repr(self: Self) -> None:
         # Test repr of local list
-        self.version.local = [1, "dev", "build"]
-        self.assertEqual(str(self.version.local), "1.dev.build")
+        version: Version = Version()
+        version.local = [1, "dev", "build"]
+        self.assertEqual(str(version.local), "1.dev.build")
 
     def test_local_data_property(self: Self) -> None:
         # Test that 'data' property correctly reflects local's internal list
-        self.version.local = [1, "dev", "build"]
-        self.assertEqual(self.version.local.data, [1, "dev", "build"])
+        version: Version = Version()
+        version.local = [1, "dev", "build"]
+        self.assertEqual(version.local.data, [1, "dev", "build"])
 
     def test_local_data_setter(self: Self) -> None:
         # Test that 'data' property can be set directly
-        self.version.local.data = ["custom", "data"]
-        self.assertEqual(self.version.local, ["custom", "data"])
+        version: Version = Version()
+        version.local.data = ["custom", "data"]
+        self.assertEqual(version.local, ["custom", "data"])
 
     def test_local_iterable(self: Self) -> None:
         # Test if local supports iteration
-        self.version.local = "1.dev.build"
-        result = [x for x in self.version.local]
+        version: Version = Version()
+        version.local = "1.dev.build"
+        result: list = [x for x in version.local]
         self.assertEqual(result, [1, "dev", "build"])
 
 

{v440-2.0.0.dev13 → v440-2.0.0.dev15}/src/v440/tests/testdata.toml

@@ -941,22 +941,25 @@ solution = [
     3,
 ]
 
-[data_property.local]
+[data-property.local]
 query = "42!1.2.3.dev1337+5.nov"
 solution = "42!1.2.3.dev1337+5.nov"
 
-[data_property.hitch]
+[data-property.hitch]
 query = 4.2
 solution = "4.2"
 
-[data_property.dragon]
+[data-property.dragon]
 query = 9001
 solution = "9001"
 
-[data_property.local_again]
+[data-property.local_again]
 query = "1701!4.5.6.rc255+reset"
 solution = "1701!4.5.6rc255+reset"
 
+[data-property.none]
+solution = "0"
+
 [slicingmethod.test_slicing_1]
 query = "1.2.3.4.5.6.7.8.9.10"
 start = -8

{v440-2.0.0.dev13 → v440-2.0.0.dev15/src/v440.egg-info}/PKG-INFO

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