v440 2.0.0.dev68__tar.gz → 2.0.0.dev71__tar.gz

{v440-2.0.0.dev68/src/v440.egg-info → v440-2.0.0.dev71}/PKG-INFO

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

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

{v440-2.0.0.dev68 → v440-2.0.0.dev71}/src/v440/_utils/ListStringer.py

@@ -178,9 +178,7 @@ class ListStringer(BaseStringer, collections.abc.MutableSequence):
         self._data = ()
 
     def _set(self: Self, value: Any) -> None:
-        if value is None:
-            self.data = ()
-        elif isinstance(value, str):
+        if isinstance(value, str):
             self.string = value
         elif hasattr(value, "__iter__"):
             self.data = value

{v440-2.0.0.dev68 → v440-2.0.0.dev71}/src/v440/tests/test_testdata.py

@@ -198,36 +198,39 @@ class TestVersionRelease(unittest.TestCase):
 
 class TestDevGo(unittest.TestCase):
     def test_dev_as_tuple(self: Self) -> None:
-        self.go(
+        self.go_key(
             key="test_dev_as_tuple",
-            v_version="1.2.3",
-            v_dev=("dev", "5000"),
-            v_str="1.2.3.dev5000",
-            v_ans=5000,
+            setup="1.2.3",
+            update=("dev", "5000"),
+            text="1.2.3.dev5000",
+            answer=5000,
         )
 
     def test_strings_a(self: Self) -> None:
         k: str
         v: dict
         for k, v in Util.util.data["devint"].items():
-            with self.subTest(key=k):
-                self.go(**v, key=k)
+            self.go_key(**v, key=k)
+
+    def go_key(self: Self, key: str, **kwargs: Any) -> None:
+        msg: str = "dev %r" % key
+        with self.subTest(key=key):
+            self.go(**kwargs, msg=msg)
 
     def go(
         self: Self,
-        key: str,
-        v_version: Any,
-        v_str: Any,
-        v_ans: Any,
-        v_dev: Any = None,
+        msg: str,
+        setup: Any,
+        text: str,
+        answer: Any,
+        update: Any = None,
         dev_type: type = int,
     ):
-        msg: str = "dev %r" % key
-        v: Version = Version(v_version)
-        v.public.qual.dev = v_dev
-        self.assertEqual(str(v), v_str, msg=msg)
+        v: Version = Version(setup)
+        v.public.qual.dev = update
+        self.assertEqual(str(v), text, msg=msg)
         self.assertIsInstance(v.public.qual.dev, dev_type, msg=msg)
-        self.assertEqual(v.public.qual.dev, v_ans, msg=msg)
+        self.assertEqual(v.public.qual.dev, answer, msg=msg)
 
 
 class TestVersionSpecifiersGo(unittest.TestCase):
@@ -255,14 +258,10 @@ class TestPackagingA(unittest.TestCase):
                     self.go(text=s)
 
     def go(self: Self, text: str) -> None:
-        a: packaging.version.Version
-        b: str
-        f: int
-        g: str
-        a = packaging.version.Version(text)
-        b = str(a)
-        f = len(a.release)
-        g = format(Version(text), str(f))
+        a: packaging.version.Version = packaging.version.Version(text)
+        b: str = str(a)
+        f: int = len(a.release)
+        g: str = format(Version(text), str(f))
         self.assertEqual(b, g)
 
 
@@ -289,9 +288,9 @@ class TestPackagingB(unittest.TestCase):
 class TestPackagingC(unittest.TestCase):
     def test_strings_c(self: Self) -> None:
         pure: list = list()
-        l: list
-        for l in Util.util.data["strings"]["valid"].values():
-            pure += l
+        part: list
+        for part in Util.util.data["strings"]["valid"].values():
+            pure += part
         ops: list = [
             operator.eq,
             operator.ne,
@@ -300,57 +299,85 @@ class TestPackagingC(unittest.TestCase):
             operator.le,
             operator.lt,
         ]
-        a: packaging.version.Version
-        b: packaging.version.Version
-        c: packaging.version.Version
-        d: packaging.version.Version
-        native: bool
-        convert: bool
-        msg: str
-        op: Any
-        for x, y, op in iterprod.iterprod(pure, pure, ops):
-            a = packaging.version.Version(x)
-            b = Version(x).packaging()
-            c = packaging.version.Version(y)
-            d = Version(y).packaging()
-            native = op(a, c)
-            convert = op(b, d)
-            msg = f"{op} should match for {x!r} and {y!r}"
-            self.assertEqual(native, convert, msg=msg)
+        args: tuple
+        for args in iterprod.iterprod(pure, pure, ops):
+            with self.subTest(args=args):
+                self.go(*args)
+
+    def go(self: Self, x: str, y: str, func: Callable, /) -> None:
+        a: packaging.version.Version = packaging.version.Version(x)
+        b: packaging.version.Version = Version(string=x).packaging()
+        c: packaging.version.Version = packaging.version.Version(y)
+        d: packaging.version.Version = Version(string=y).packaging()
+        native: bool = func(a, c)
+        convert: bool = func(b, d)
+        msg: str = f"{func} should match for {x!r} and {y!r}"
+        self.assertEqual(native, convert, msg=msg)
 
 
 class TestPackagingField(unittest.TestCase):
     def test_field(self: Self) -> None:
-        versionable: list = list()
+        k: str
         l: list
-        for l in Util.util.data["strings"]["valid"].values():
-            versionable += l
-        for l in Util.util.data["strings"]["incomp"].values():
-            versionable += l
-        version_obj: Version = Version()
-        v: Version
+        for k, l in Util.util.data["strings"]["valid"].items():
+            with self.subTest(key=k):
+                self.go_list(l)
+        for k, l in Util.util.data["strings"]["incomp"].items():
+            with self.subTest(key=k):
+                self.go_list(l)
+
+    def go_list(self: Self, listing: list) -> None:
         x: str
-        for x in versionable:
-            v = Version(x)
-            self.assertEqual(v.public.qual.isdevrelease(), v.packaging().is_devrelease)
-            self.assertEqual(v.public.qual.isprerelease(), v.packaging().is_prerelease)
-            self.assertEqual(
-                v.public.qual.ispostrelease(), v.packaging().is_postrelease
-            )
-            self.assertEqual(str(v.public.base), v.packaging().base_version)
-            self.assertEqual(str(v.public), v.packaging().public)
-            version_obj.local = v.packaging().local
-            self.assertEqual(str(v.local), str(version_obj.local))
+        for x in listing:
+            with self.subTest():
+                self.go(query=x)
+
+    def go(self: Self, query: str) -> None:
+        v: Version = Version(query)
+        self.assertEqual(
+            v.public.qual.isdevrelease(),
+            v.packaging().is_devrelease,
+        )
+        self.assertEqual(
+            v.public.qual.isprerelease(),
+            v.packaging().is_prerelease,
+        )
+        self.assertEqual(
+            v.public.qual.ispostrelease(),
+            v.packaging().is_postrelease,
+        )
+        self.assertEqual(
+            str(v.public.base),
+            v.packaging().base_version,
+        )
+        self.assertEqual(
+            str(v.public),
+            v.packaging().public,
+        )
+        local_packaging: Optional[str] = v.packaging().local
+        if local_packaging is None:
+            local_packaging = ""
+        self.assertEqual(
+            str(v.local),
+            str(local_packaging),
+        )
 
 
 class TestPackagingExc(unittest.TestCase):
     def test_exc_pack(self: Self) -> None:
-        impure: list = list()
+        k: str
+        for k in ("incomp", "exc"):
+            with self.subTest(strings=k):
+                self.go_dict(Util.util.data["strings"][k])
+
+    def go_dict(self: Self, dictionary: dict, /) -> None:
+        k: str
         l: list
-        for l in Util.util.data["strings"]["incomp"].values():
-            impure += l
-        for l in Util.util.data["strings"]["exc"].values():
-            impure += l
+        for k, l in dictionary.items():
+            with self.subTest(key=k):
+                self.go_list(l)
+
+    def go_list(self: Self, impure: list, /) -> None:
         x: str
         for x in impure:
             with self.assertRaises(packaging.version.InvalidVersion):

{v440-2.0.0.dev68 → v440-2.0.0.dev71}/src/v440/tests/testdata.toml

@@ -748,82 +748,82 @@ Post-releases = [
 ]
 
 [devint.test_dev_as_int]
-v_version = "1.2.3"
-v_dev = 1
-v_str = "1.2.3.dev1"
-v_ans = 1
+setup = "1.2.3"
+update = 1
+text = "1.2.3.dev1"
+answer = 1
 
 [devint.test_dev_as_string_int]
-v_version = "1.2.3"
-v_dev = "42"
-v_str = "1.2.3.dev42"
-v_ans = 42
+setup = "1.2.3"
+update = "42"
+text = "1.2.3.dev42"
+answer = 42
 
 [devint.test_dev_as_string_with_dev_prefix]
-v_version = "1.2.3"
-v_dev = "dev1000"
-v_str = "1.2.3.dev1000"
-v_ans = 1000
+setup = "1.2.3"
+update = "dev1000"
+text = "1.2.3.dev1000"
+answer = 1000
 
 [devint.test_dev_as_string_with_dev_dot_prefix]
-v_version = "1.2.3"
-v_dev = "dev.2000"
-v_str = "1.2.3.dev2000"
-v_ans = 2000
+setup = "1.2.3"
+update = "dev.2000"
+text = "1.2.3.dev2000"
+answer = 2000
 
 [devint.test_dev_as_string_with_dot_dev_prefix]
-v_version = "1.2.3"
-v_dev = ".dev.3000"
-v_str = "1.2.3.dev3000"
-v_ans = 3000
+setup = "1.2.3"
+update = ".dev.3000"
+text = "1.2.3.dev3000"
+answer = 3000
 
 [devint.test_dev_as_string_with_dot_dev_number_prefix]
-v_version = "1.2.3"
-v_dev = ".dev4000"
-v_str = "1.2.3.dev4000"
-v_ans = 4000
+setup = "1.2.3"
+update = ".dev4000"
+text = "1.2.3.dev4000"
+answer = 4000
 
 [devint.test_dev_as_list]
-v_version = "1.2.3"
-v_dev = [
+setup = "1.2.3"
+update = [
     "dev",
     "6000",
 ]
-v_str = "1.2.3.dev6000"
-v_ans = 6000
+text = "1.2.3.dev6000"
+answer = 6000
 
 [devint.test_dev_as_uppercase_string]
-v_version = "1.2.3"
-v_dev = "DEV7000"
-v_str = "1.2.3.dev7000"
-v_ans = 7000
+setup = "1.2.3"
+update = "DEV7000"
+text = "1.2.3.dev7000"
+answer = 7000
 
 [devint.test_dev_as_mixed_case_string]
-v_version = "1.2.3"
-v_dev = "dEv8000"
-v_str = "1.2.3.dev8000"
-v_ans = 8000
+setup = "1.2.3"
+update = "dEv8000"
+text = "1.2.3.dev8000"
+answer = 8000
 
 [devint.test_dev_as_list_mixed_case]
-v_version = "1.2.3"
-v_dev = [
+setup = "1.2.3"
+update = [
     "dEV",
     "9000",
 ]
-v_str = "1.2.3.dev9000"
-v_ans = 9000
+text = "1.2.3.dev9000"
+answer = 9000
 
 [devint.test_dev_as_false]
-v_version = "1.2.3"
-v_dev = false
-v_str = "1.2.3.dev0"
-v_ans = 0
+setup = "1.2.3"
+update = false
+text = "1.2.3.dev0"
+answer = 0
 
 [devint.test_dev_as_true]
-v_version = "1.2.3"
-v_dev = true
-v_str = "1.2.3.dev1"
-v_ans = 1
+setup = "1.2.3"
+update = true
+text = "1.2.3.dev1"
+answer = 1
 
 [spec.test_basic_version_with_post_specifier]
 string_a = "1.2.3-4"

{v440-2.0.0.dev68 → v440-2.0.0.dev71/src/v440.egg-info}/PKG-INFO

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