datahold 3.1.0.dev2__tar.gz → 3.1.0.dev3__tar.gz

datahold-3.1.0.dev3/PKG-INFO

@@ -0,0 +1,33 @@
+Metadata-Version: 2.4
+Name: datahold
+Version: 3.1.0.dev3
+Summary: This project wraps common mutable datastructures for inheritance with modification.
+Author-email: Johannes <johannes.programming@gmail.com>
+License-Expression: MIT
+Project-URL: Download, https://pypi.org/project/datahold/#files
+Project-URL: Index, https://pypi.org/project/datahold/
+Project-URL: Source, https://github.com/johannes-programming/datahold/
+Project-URL: Website, http://datahold.johannes-programming.online/
+Classifier: Development Status :: 3 - Alpha
+Classifier: Intended Audience :: Developers
+Classifier: Natural Language :: English
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Requires-Python: >=3.11
+Description-Content-Type: text/x-rst
+License-File: LICENSE.txt
+Requires-Dist: cmp3<2,>=1.0
+Requires-Dist: copyable<2,>=1.0
+Requires-Dist: datarepr<2,>=1.0
+Requires-Dist: frozendict<3,>=2.4.6
+Requires-Dist: namings<2,>=1.0
+Requires-Dist: setdoc<2,>=1.2.20
+Dynamic: license-file
+
+========
+datahold
+========
+
+Visit the website `https://datahold.johannes-programming.online/ <https://datahold.johannes-programming.online/>`_ for more information.

{datahold-3.1.0.dev2 → datahold-3.1.0.dev3}/pyproject.toml

@@ -1,7 +1,7 @@
 [build-system]
 build-backend = "setuptools.build_meta"
 requires = [
-    "setuptools>=64.0",
+    "setuptools>=77.0",
 ]
 
 [project]
@@ -11,31 +11,30 @@ authors = [
 classifiers = [
     "Development Status :: 3 - Alpha",
     "Intended Audience :: Developers",
-    "License :: OSI Approved :: MIT License",
     "Natural Language :: English",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Typing :: Typed",
 ]
 dependencies = [
     "cmp3>=1.0,<2",
     "copyable>=1.0,<2",
     "datarepr>=1.0,<2",
     "frozendict>=2.4.6,<3",
-    "namings>=1.1,<2",
-    "setdoc>=1.2.8,<2",
+    "namings>=1.0,<2",
+    "setdoc>=1.2.20,<2",
 ]
 description = "This project wraps common mutable datastructures for inheritance with modification."
 keywords = []
+license = "MIT"
+license-files = [
+    "LICENSE.txt",
+]
 name = "datahold"
 readme = "README.rst"
 requires-python = ">=3.11"
-version = "3.1.0.dev2"
-
-[project.license]
-file = "LICENSE.txt"
+version = "3.1.0.dev3"
 
 [project.urls]
 Download = "https://pypi.org/project/datahold/#files"

{datahold-3.1.0.dev2 → datahold-3.1.0.dev3}/src/datahold/core/BaseDataNaming.py

@@ -1,7 +1,7 @@
-import collections
 from abc import abstractmethod
 from typing import *
 
+import namings
 from namings import FrozenNaming, Naming
 
 from datahold._utils.wrapping import wraps
@@ -15,7 +15,7 @@ Value = TypeVar("Value")
 
 class BaseDataNaming(
     BaseDataObject,
-    collections.abc.Mapping[str, Value],
+    namings.abc.BaseNamingABC.BaseNamingABC[Value],
 ):
     data: FrozenNaming[Value]
     __slots__ = ()
@@ -96,12 +96,6 @@ class BaseDataNaming(
         "This doc string is overwritten together with the signature to match the original as closely as possible."
         return Naming[Value](self.data).__str__(*args, **kwargs)
 
-    @classmethod
-    @wraps(Naming[Value])
-    def fromkeys(cls: type[Self], *args: Any, **kwargs: Any) -> Any:
-        "This doc string is overwritten together with the signature to match the original as closely as possible."
-        return cls[Value](Naming[Value].fromkeys(*args, **kwargs))
-
     @wraps(Naming[Value])
     def get(self: Self, *args: Any, **kwargs: Any) -> Any:
         "This doc string is overwritten together with the signature to match the original as closely as possible."

{datahold-3.1.0.dev2 → datahold-3.1.0.dev3}/src/datahold/core/DataNaming.py

@@ -1,6 +1,6 @@
-import collections
 from typing import *
 
+import namings
 import setdoc
 from namings import FrozenNaming, Naming
 
@@ -15,7 +15,7 @@ Value = TypeVar("Value")
 
 
 class DataNaming(
-    DataObject, BaseDataNaming[Value], collections.abc.MutableMapping[str, Value]
+    DataObject, BaseDataNaming[Value], namings.abc.NamingABC.NamingABC[Value]
 ):
     data: FrozenNaming[Value]
     __slots__ = ()
@@ -74,16 +74,6 @@ class DataNaming(
         self.data = FrozenNaming[Value](data)
         return ans
 
-    @wraps(Naming[Value])
-    def popitem(self: Self, *args: Any, **kwargs: Any) -> Any:
-        "This doc string is overwritten together with the signature to match the original as closely as possible."
-        ans: Any
-        data: Naming[Value]
-        data = Naming[Value](self.data)
-        ans = data.popitem(*args, **kwargs)
-        self.data = FrozenNaming[Value](data)
-        return ans
-
     @wraps(Naming[Value])
     def setdefault(self: Self, *args: Any, **kwargs: Any) -> Any:
         "This doc string is overwritten together with the signature to match the original as closely as possible."

{datahold-3.1.0.dev2 → datahold-3.1.0.dev3}/src/datahold/core/FrozenDataNaming.py

@@ -1,5 +1,6 @@
 from typing import *
 
+import namings
 from namings import FrozenNaming
 
 from .BaseDataNaming import BaseDataNaming
@@ -10,6 +11,10 @@ __all__ = ["FrozenDataNaming"]
 Value = TypeVar("Value")
 
 
-class FrozenDataNaming(FrozenDataObject, BaseDataNaming[Value]):
+class FrozenDataNaming(
+    FrozenDataObject,
+    BaseDataNaming[Value],
+    namings.abc.FrozenNamingABC.FrozenNamingABC[Value],
+):
     data: FrozenNaming[Value]
     __slots__ = ()

{datahold-3.1.0.dev2 → datahold-3.1.0.dev3}/src/datahold/tests/test_datahold_TestAbstractness.py

@@ -2,8 +2,6 @@ import unittest
 from inspect import isabstract
 from typing import Self
 
-from frozendict import frozendict
-
 from datahold.core.DataDict import DataDict
 from datahold.core.DataList import DataList
 from datahold.core.DataNaming import DataNaming

{datahold-3.1.0.dev2 → datahold-3.1.0.dev3}/src/datahold/tests/test_datahold_TestProtocols.py

@@ -1,3 +1,4 @@
+import collections.abc
 import unittest
 from collections.abc import (
     Mapping,
@@ -9,6 +10,8 @@ from collections.abc import (
 from collections.abc import Set as AbstractSet
 from typing import Self
 
+import namings
+
 from datahold.core.FrozenHoldDict import FrozenHoldDict
 from datahold.core.FrozenHoldList import FrozenHoldList
 from datahold.core.FrozenHoldNaming import FrozenHoldNaming
@@ -51,17 +54,29 @@ class TestProtocols(unittest.TestCase):
 
     def test_naming_protocols_x(self: Self) -> None:
         x: FrozenHoldNaming
-        x = FrozenHoldNaming({"a": 1}.items())
+        x = FrozenHoldNaming({"a": 1})
 
-        self.assertIsInstance(x, Mapping)
+        self.assertIsInstance(x, collections.abc.Collection)
+
+        self.assertIsInstance(x, namings.abc.BaseNamingABC.BaseNamingABC)
+        self.assertIsInstance(x, namings.abc.FrozenNamingABC.FrozenNamingABC)
+        self.assertNotIsInstance(x, namings.abc.NamingABC.NamingABC)
+
+        self.assertNotIsInstance(x, Mapping)
         self.assertNotIsInstance(x, MutableMapping)
 
     def test_naming_protocols_y(self: Self) -> None:
         y: HoldNaming
-        y = HoldNaming({"a": 1}.items())
+        y = HoldNaming({"a": 1})
 
-        self.assertIsInstance(y, Mapping)
-        self.assertIsInstance(y, MutableMapping)
+        self.assertIsInstance(y, collections.abc.Collection)
+
+        self.assertIsInstance(y, namings.abc.BaseNamingABC.BaseNamingABC)
+        self.assertNotIsInstance(y, namings.abc.FrozenNamingABC.FrozenNamingABC)
+        self.assertIsInstance(y, namings.abc.NamingABC.NamingABC)
+
+        self.assertNotIsInstance(y, Mapping)
+        self.assertNotIsInstance(y, MutableMapping)
 
     def test_set_protocols(self: Self) -> None:
         f: FrozenHoldSet

datahold-3.1.0.dev3/src/datahold.egg-info/PKG-INFO

@@ -0,0 +1,33 @@
+Metadata-Version: 2.4
+Name: datahold
+Version: 3.1.0.dev3
+Summary: This project wraps common mutable datastructures for inheritance with modification.
+Author-email: Johannes <johannes.programming@gmail.com>
+License-Expression: MIT
+Project-URL: Download, https://pypi.org/project/datahold/#files
+Project-URL: Index, https://pypi.org/project/datahold/
+Project-URL: Source, https://github.com/johannes-programming/datahold/
+Project-URL: Website, http://datahold.johannes-programming.online/
+Classifier: Development Status :: 3 - Alpha
+Classifier: Intended Audience :: Developers
+Classifier: Natural Language :: English
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Requires-Python: >=3.11
+Description-Content-Type: text/x-rst
+License-File: LICENSE.txt
+Requires-Dist: cmp3<2,>=1.0
+Requires-Dist: copyable<2,>=1.0
+Requires-Dist: datarepr<2,>=1.0
+Requires-Dist: frozendict<3,>=2.4.6
+Requires-Dist: namings<2,>=1.0
+Requires-Dist: setdoc<2,>=1.2.20
+Dynamic: license-file
+
+========
+datahold
+========
+
+Visit the website `https://datahold.johannes-programming.online/ <https://datahold.johannes-programming.online/>`_ for more information.

{datahold-3.1.0.dev2 → datahold-3.1.0.dev3}/src/datahold.egg-info/requires.txt

@@ -2,5 +2,5 @@ cmp3<2,>=1.0
 copyable<2,>=1.0
 datarepr<2,>=1.0
 frozendict<3,>=2.4.6
-namings<2,>=1.1
-setdoc<2,>=1.2.8
+namings<2,>=1.0
+setdoc<2,>=1.2.20

datahold-3.1.0.dev2/PKG-INFO

@@ -1,55 +0,0 @@
-Metadata-Version: 2.4
-Name: datahold
-Version: 3.1.0.dev2
-Summary: This project wraps common mutable datastructures for inheritance with modification.
-Author-email: Johannes <johannes.programming@gmail.com>
-License: The MIT License (MIT)
-        
-        Copyright (c) 2024 Johannes
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-        SOFTWARE.
-Project-URL: Download, https://pypi.org/project/datahold/#files
-Project-URL: Index, https://pypi.org/project/datahold/
-Project-URL: Source, https://github.com/johannes-programming/datahold/
-Project-URL: Website, http://datahold.johannes-programming.online/
-Classifier: Development Status :: 3 - Alpha
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Natural Language :: English
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Typing :: Typed
-Requires-Python: >=3.11
-Description-Content-Type: text/x-rst
-License-File: LICENSE.txt
-Requires-Dist: cmp3<2,>=1.0
-Requires-Dist: copyable<2,>=1.0
-Requires-Dist: datarepr<2,>=1.0
-Requires-Dist: frozendict<3,>=2.4.6
-Requires-Dist: namings<2,>=1.1
-Requires-Dist: setdoc<2,>=1.2.8
-Dynamic: license-file
-
-========
-datahold
-========
-
-Visit the website `https://datahold.johannes-programming.online/ <https://datahold.johannes-programming.online/>`_ for more information.

datahold-3.1.0.dev2/src/datahold.egg-info/PKG-INFO

@@ -1,55 +0,0 @@
-Metadata-Version: 2.4
-Name: datahold
-Version: 3.1.0.dev2
-Summary: This project wraps common mutable datastructures for inheritance with modification.
-Author-email: Johannes <johannes.programming@gmail.com>
-License: The MIT License (MIT)
-        
-        Copyright (c) 2024 Johannes
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-        SOFTWARE.
-Project-URL: Download, https://pypi.org/project/datahold/#files
-Project-URL: Index, https://pypi.org/project/datahold/
-Project-URL: Source, https://github.com/johannes-programming/datahold/
-Project-URL: Website, http://datahold.johannes-programming.online/
-Classifier: Development Status :: 3 - Alpha
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Natural Language :: English
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Typing :: Typed
-Requires-Python: >=3.11
-Description-Content-Type: text/x-rst
-License-File: LICENSE.txt
-Requires-Dist: cmp3<2,>=1.0
-Requires-Dist: copyable<2,>=1.0
-Requires-Dist: datarepr<2,>=1.0
-Requires-Dist: frozendict<3,>=2.4.6
-Requires-Dist: namings<2,>=1.1
-Requires-Dist: setdoc<2,>=1.2.8
-Dynamic: license-file
-
-========
-datahold
-========
-
-Visit the website `https://datahold.johannes-programming.online/ <https://datahold.johannes-programming.online/>`_ for more information.