v440 2.0.0.dev26__tar.gz → 2.0.0.dev28__tar.gz

{v440-2.0.0.dev26/src/v440.egg-info → v440-2.0.0.dev28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: v440
-Version: 2.0.0.dev26
+Version: 2.0.0.dev28
 Summary: This project provides mutable version objects in accordance with PEP440.
 Author-email: Johannes <johannes.programming@gmail.com>
 License: The MIT License (MIT)
@@ -46,7 +46,7 @@ Requires-Dist: iterprod<2.0,>=1.0
 Requires-Dist: keyalias<2.0,>=1.0.3
 Requires-Dist: overloadable<2.0,>=1.0.5
 Requires-Dist: packaging>=23.2
-Requires-Dist: scaevola<2.0,>=1.0.11
+Requires-Dist: scaevola<2.0,>=1.1
 Requires-Dist: tofunc<2,>=1.0.0
 Dynamic: license-file
 

{v440-2.0.0.dev26 → v440-2.0.0.dev28}/pyproject.toml

@@ -26,7 +26,7 @@ dependencies = [
     "keyalias>=1.0.3,<2.0",
     "overloadable>=1.0.5,<2.0",
     "packaging>=23.2",
-    "scaevola>=1.0.11,<2.0",
+    "scaevola>=1.1,<2.0",
     "tofunc>=1.0.0,<2",
 ]
 description = "This project provides mutable version objects in accordance with PEP440."
@@ -34,7 +34,7 @@ keywords = []
 name = "v440"
 readme = "README.rst"
 requires-python = ">=3.11"
-version = "2.0.0.dev26"
+version = "2.0.0.dev28"
 
 [project.license]
 file = "LICENSE.txt"

{v440-2.0.0.dev26 → v440-2.0.0.dev28}/src/v440/core/Qualification.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 from typing import *
 
 from v440._utils import SimpleQualifierParser, utils
-from v440._utils.BaseList import BaseList
 from v440._utils.Cfg import Cfg
 from v440._utils.Digest import Digest
 from v440._utils.Pattern import Pattern

{v440-2.0.0.dev26 → v440-2.0.0.dev28}/src/v440/core/Version.py

@@ -98,15 +98,6 @@ class Version(SlotList):
             ans += "+%s" % self.local
         return ans
 
-    def isdevrelease(self: Self) -> bool:
-        return self.qualification.isdevrelease()
-
-    def isprerelease(self: Self) -> bool:
-        return self.qualification.isprerelease()
-
-    def ispostrelease(self: Self) -> bool:
-        return self.qualification.ispostrelease()
-
     @property
     def local(self: Self) -> Local:
         return self._local
@@ -151,11 +142,3 @@ class Version(SlotList):
     @qualification.setter
     def qualification(self: Self, value: Any) -> None:
         self.qualification.data = value
-
-    @property
-    def release(self: Self) -> Release:
-        return self.base.release
-
-    @release.setter
-    def release(self: Self, value: Any) -> None:
-        self.base.release = value

{v440-2.0.0.dev26 → v440-2.0.0.dev28}/src/v440/tests/test_testdata.py

@@ -31,11 +31,11 @@ class TestVersionReleaseAttrs(unittest.TestCase):
         k: str
         v: dict
         for k, v in Util.util.data["release_attr"].items():
-            self.release(**v, key=k)
+            with self.subTest(key=k):
+                self.go(**v)
 
-    def release(
+    def go(
         self: Self,
-        key: str,
         query: list,
         attrname: Optional[str] = None,
         args: list | tuple = (),
@@ -45,13 +45,13 @@ class TestVersionReleaseAttrs(unittest.TestCase):
     ) -> None:
         # Test the append method of the release list-like object
         version: Version = Version()
-        version.release = query
+        version.public.base.release = query
         if attrname is not None:
-            attr: Any = getattr(version.release, attrname)
+            attr: Any = getattr(version.public.base.release, attrname)
             ans: Any = attr(*args, **dict(kwargs))
             self.assertEqual(ans, solution)
         if target is not None:
-            self.assertEqual(version.release, target)
+            self.assertEqual(version.public.base.release, target)
 
 
 class TestVersionReleaseVersionError(unittest.TestCase):
@@ -60,16 +60,16 @@ class TestVersionReleaseVersionError(unittest.TestCase):
         k: str
         v: dict
         for k, v in Util.util.data["release_VersionError"].items():
-            self.release(**v, key=k)
+            with self.subTest(key=k):
+                self.go(**v)
 
-    def release(
+    def go(
         self: Self,
-        key: str,
         query: list,
     ) -> None:
         version: Version = Version()
         with self.assertRaises(VersionError):
-            version.release = query
+            version.public.base.release = query
 
 
 class TestVersionLocalVersionError(unittest.TestCase):
@@ -145,7 +145,7 @@ class TestSlicing(unittest.TestCase):
         v: Version = Version("1.2.3.4.5.6.7.8.9.10")
         catcher: Catcher = Catcher()
         with catcher.catch(Exception):
-            v.release[-8:15:5] = 777
+            v.public.base.release[-8:15:5] = 777
         self.assertNotEqual(catcher.caught, None)
 
     def slicingmethod(
@@ -159,7 +159,7 @@ class TestSlicing(unittest.TestCase):
         key: str = "",
     ) -> None:
         v: Version = Version(query)
-        v.release[start:stop:step] = change
+        v.public.base.release[start:stop:step] = change
         self.assertEqual(str(v), solution, "slicingmethod %s" % key)
 
     def test_slicing_3(self: Self) -> None:
@@ -172,7 +172,7 @@ class TestSlicing(unittest.TestCase):
     def test_slicing_7(self: Self) -> None:
         # test_slicing_7
         v: Version = Version("1.2.3.4.5.6.7.8.9.10")
-        del v.release[-8:15:5]
+        del v.public.base.release[-8:15:5]
         self.assertEqual(str(v), "1.2.4.5.6.7.9.10")
 
 
@@ -199,9 +199,10 @@ class TestVersionRelease(unittest.TestCase):
         k: str
         v: Any
         for k, v in Util.util.data["release"].items():
-            self.go(key=k, **v)
+            with self.subTest(key=k):
+                self.go(**v)
 
-    def go(self: Self, query: Any, solution: Any, key: str = "") -> None:
+    def go(self: Self, query: Any, solution: Any) -> None:
         release: Release = Release(query)
         self.assertEqual(release, solution)
 
@@ -347,9 +348,15 @@ class TestPackaging(unittest.TestCase):
         x: str
         for x in versionable:
             v = Version(x)
-            self.assertEqual(v.isdevrelease(), v.packaging().is_devrelease)
-            self.assertEqual(v.isprerelease(), v.packaging().is_prerelease)
-            self.assertEqual(v.ispostrelease(), v.packaging().is_postrelease)
+            self.assertEqual(
+                v.public.qualification.isdevrelease(), v.packaging().is_devrelease
+            )
+            self.assertEqual(
+                v.public.qualification.isprerelease(), v.packaging().is_prerelease
+            )
+            self.assertEqual(
+                v.public.qualification.ispostrelease(), v.packaging().is_postrelease
+            )
             self.assertEqual(str(v.base), v.packaging().base_version)
             self.assertEqual(str(v.public), v.packaging().public)
             version_obj.local = v.packaging().local

{v440-2.0.0.dev26 → v440-2.0.0.dev28}/src/v440/tests/test_version.py

@@ -13,8 +13,8 @@ class TestVersionManipulation(unittest.TestCase):
         v: Version = Version("1.2.3")
 
         # Modify individual parts of the version
-        v.release.major = 2
-        v.release.minor = 5
+        v.public.base.release.major = 2
+        v.public.base.release.minor = 5
         v.qualification = "beta.1"
         v.local = "local.7.dev"
 
@@ -100,8 +100,8 @@ class TestExample(unittest.TestCase):
     def test_example_2(self: Self) -> None:
         v: Version = Version("2.5.3")
         self.assertEqual(str(v), "2.5.3")  # Modified version
-        v.release[1] = 64
-        v.release.micro = 4
+        v.public.base.release[1] = 64
+        v.public.base.release.micro = 4
         self.assertEqual(str(v), "2.64.4")  # Further modified version
 
     def test_example_3a(self: Self) -> None:
@@ -143,7 +143,7 @@ class TestExample(unittest.TestCase):
     def test_example_4(self: Self) -> None:
         v: Version = Version("2.5.3.9")
         self.assertEqual(str(v), "2.5.3.9")  # before sorting
-        v.release.sort()
+        v.public.base.release.sort()
         self.assertEqual(str(v), "2.3.5.9")  # after sorting
 
     def test_example_5(self: Self) -> None:
@@ -200,66 +200,68 @@ class TestVersionRelease(unittest.TestCase):
     def test_major_minor_micro_aliases(self: Self) -> None:
         # Test major, minor, and micro aliases for the first three indices
         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
+        version.public.base.release = [1, 2, 3]
+        self.assertEqual(version.public.base.release.major, 1)
+        self.assertEqual(version.public.base.release.minor, 2)
+        self.assertEqual(version.public.base.release.micro, 3)
+        self.assertEqual(
+            version.public.base.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
         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)
+        version.public.base.release = [1, 2, 3]
+        version.public.base.release.major = 10
+        version.public.base.release.minor = 20
+        version.public.base.release.micro = 30
+        self.assertEqual(version.public.base.release, [10, 20, 30])
+        self.assertEqual(version.public.base.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
         version: Version = Version()
-        version.release = [1, 2]
-        simulated_release = version.release[:5]
+        version.public.base.release = [1, 2]
+        simulated_release = version.public.base.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
         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)
+        version.public.base.release = []
+        self.assertEqual(version.public.base.release.major, 0)
+        self.assertEqual(version.public.base.release.minor, 0)
+        self.assertEqual(version.public.base.release.micro, 0)
+        self.assertEqual(version.public.base.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
         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])
+        version.public.base.release = [1]
+        version.public.base.release.minor = 5  # This should make release [1, 5]
+        self.assertEqual(version.public.base.release, [1, 5])
+        version.public.base.release.micro = 3  # This should make release [1, 5, 3]
+        self.assertEqual(version.public.base.release, [1, 5, 3])
 
     def test_release_modify_major_only(self: Self) -> None:
         # Test that setting just the major property works
         version: Version = Version()
-        version.release.major = 10
-        self.assertEqual(version.release, [10])
+        version.public.base.release.major = 10
+        self.assertEqual(version.public.base.release, [10])
 
     def test_release_modify_minor_only(self: Self) -> None:
         # Test that setting just the minor property extends release
         version: Version = Version()
-        version.release = []
-        version.release.minor = 1
-        self.assertEqual(version.release, [0, 1])
+        version.public.base.release = []
+        version.public.base.release.minor = 1
+        self.assertEqual(version.public.base.release, [0, 1])
 
     def test_release_modify_micro_only(self: Self) -> None:
         # Test that setting just the micro (patch) property extends release
         version: Version = Version()
-        version.release = []
-        version.release.micro = 1
-        self.assertEqual(version.release, [0, 0, 1])
+        version.public.base.release = []
+        version.public.base.release.micro = 1
+        self.assertEqual(version.public.base.release, [0, 0, 1])
 
 
 class TestAdditionalVersionRelease(unittest.TestCase):
@@ -267,65 +269,65 @@ class TestAdditionalVersionRelease(unittest.TestCase):
     def test_release_inequality_with_list(self: Self) -> None:
         # Test inequality of release with a normal list
         version: Version = Version()
-        version.release = [1, 2, 3]
-        self.assertFalse(version.release == [1, 2, 4])
+        version.public.base.release = [1, 2, 3]
+        self.assertFalse(version.public.base.release == [1, 2, 4])
 
     def test_release_len(self: Self) -> None:
         # Test the length of the release list
         version: Version = Version()
-        version.release = [1, 2, 3]
-        self.assertEqual(len(version.release), 3)
+        version.public.base.release = [1, 2, 3]
+        self.assertEqual(len(version.public.base.release), 3)
 
     def test_release_slice_assignment(self: Self) -> None:
         # Test assigning a slice to release
         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])
+        version.public.base.release = [1, 2, 3, 4, 5]
+        version.public.base.release[1:4] = [20, 30, 40]
+        self.assertEqual(version.public.base.release, [1, 20, 30, 40, 5])
 
     def test_release_iterable(self: Self) -> None:
         # Test if release supports iteration
         version: Version = Version()
-        version.release = [1, 2, 3]
-        result = list(version.release)
+        version.public.base.release = [1, 2, 3]
+        result = list(version.public.base.release)
         self.assertEqual(result, [1, 2, 3])
 
     def test_release_repr(self: Self) -> None:
         # Test the repr of the release property
         version: Version = Version()
-        version.release = [1, 2, 3]
-        self.assertEqual(str(version.release), "1.2.3")
+        version.public.base.release = [1, 2, 3]
+        self.assertEqual(str(version.public.base.release), "1.2.3")
 
     def test_release_data_property(self: Self) -> None:
         # Test the 'data' property
         version: Version = Version()
-        version.release = [1, 2, 3]
-        self.assertEqual(version.release.data, [1, 2, 3])
+        version.public.base.release = [1, 2, 3]
+        self.assertEqual(version.public.base.release.data, [1, 2, 3])
 
     def test_release_data_setter(self: Self) -> None:
         # Test setting the 'data' property directly
         version: Version = Version()
-        version.release.data = [10, 20, 30]
-        self.assertEqual(version.release, [10, 20, 30])
+        version.public.base.release.data = [10, 20, 30]
+        self.assertEqual(version.public.base.release, [10, 20, 30])
 
     def test_release_contains(self: Self) -> None:
         # Test 'in' keyword with release
         version: Version = Version()
-        version.release = [1, 2, 3]
-        self.assertIn(2, version.release)
-        self.assertNotIn(4, version.release)
+        version.public.base.release = [1, 2, 3]
+        self.assertIn(2, version.public.base.release)
+        self.assertNotIn(4, version.public.base.release)
 
     def test_release_mul(self: Self) -> None:
         # Test multiplying the release (list behavior)
         version: Version = Version()
-        version.release = [1, 2]
-        self.assertEqual(version.release * 3, [1, 2, 1, 2, 1, 2])
+        version.public.base.release = [1, 2]
+        self.assertEqual(version.public.base.release * 3, [1, 2, 1, 2, 1, 2])
 
     def test_release_addition(self: Self) -> None:
         # Test adding another list to release
         version: Version = Version()
-        version.release = [1, 2, 3]
-        self.assertEqual(version.release + [4, 5], [1, 2, 3, 4, 5])
+        version.public.base.release = [1, 2, 3]
+        self.assertEqual(version.public.base.release + [4, 5], [1, 2, 3, 4, 5])
 
 
 class TestVersionLocal(unittest.TestCase):

{v440-2.0.0.dev26 → v440-2.0.0.dev28/src/v440.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: v440
-Version: 2.0.0.dev26
+Version: 2.0.0.dev28
 Summary: This project provides mutable version objects in accordance with PEP440.
 Author-email: Johannes <johannes.programming@gmail.com>
 License: The MIT License (MIT)
@@ -46,7 +46,7 @@ Requires-Dist: iterprod<2.0,>=1.0
 Requires-Dist: keyalias<2.0,>=1.0.3
 Requires-Dist: overloadable<2.0,>=1.0.5
 Requires-Dist: packaging>=23.2
-Requires-Dist: scaevola<2.0,>=1.0.11
+Requires-Dist: scaevola<2.0,>=1.1
 Requires-Dist: tofunc<2,>=1.0.0
 Dynamic: license-file
 

{v440-2.0.0.dev26 → v440-2.0.0.dev28}/src/v440.egg-info/requires.txt

@@ -4,5 +4,5 @@ iterprod<2.0,>=1.0
 keyalias<2.0,>=1.0.3
 overloadable<2.0,>=1.0.5
 packaging>=23.2
-scaevola<2.0,>=1.0.11
+scaevola<2.0,>=1.1
 tofunc<2,>=1.0.0