pybare 1.2.4__tar.gz → 1.2.5__tar.gz

{pybare-1.2.4 → pybare-1.2.5}/PKG-INFO

@@ -1,27 +1,28 @@
 Metadata-Version: 2.1
 Name: pybare
-Version: 1.2.4
+Version: 1.2.5
 Summary: A BARE Encoding Library and Data Validation Library for Python.
 Author-Email: Noah Pederson <noah@packetlost.dev>
 License: Copyright 2020 Noah Pederson
-        
-        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.
+         
+         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.
+         
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3.10
@@ -38,6 +39,8 @@ Description-Content-Type: text/markdown
 
 # PyBARE
 [![builds.sr.ht status](https://builds.sr.ht/~chiefnoah/pybare.svg)](https://builds.sr.ht/~chiefnoah/pybare?)
+[![Static
+Badge](https://img.shields.io/badge/Docs-green?style=flat&logo=python)](https://pybare.ngp.computer)
 
 A declarative implementation of the [BARE](https://baremessages.org/) message
 format for Python 3.10+

{pybare-1.2.4 → pybare-1.2.5}/README.md

@@ -1,5 +1,7 @@
 # PyBARE
 [![builds.sr.ht status](https://builds.sr.ht/~chiefnoah/pybare.svg)](https://builds.sr.ht/~chiefnoah/pybare?)
+[![Static
+Badge](https://img.shields.io/badge/Docs-green?style=flat&logo=python)](https://pybare.ngp.computer)
 
 A declarative implementation of the [BARE](https://baremessages.org/) message
 format for Python 3.10+

{pybare-1.2.4 → pybare-1.2.5}/bare/barestruct.py

@@ -122,7 +122,7 @@ class Struct(BAREType, metaclass=StructMeta):
         return NotImplemented
 
 
-def struct(**kwargs: Dict[str, Type[BAREType]]) -> Type[Struct]:
+def struct(**kwargs: Type[BAREType]) -> Type[Struct]:
     """
     A function that defines and returnes an anonymous BARE `Struct` subclass with the
     provided `kwargs` as fields. The name of each kwarg becomes the field name, with the

{pybare-1.2.4 → pybare-1.2.5}/bare/baretype.py

@@ -7,14 +7,17 @@ T = TypeVar("T", covariant=True)
 
 class BAREType(Protocol, Generic[T]):
     @abstractmethod
-    def __init__(self, *arg, **kwargs): ...
+    def __init__(self, *arg, **kwargs):
+        ...
 
     @abstractmethod
-    def pack(self) -> bytes: ...
+    def pack(self) -> bytes:
+        ...
 
     @classmethod
     @abstractmethod
-    def unpack(cls, fp: BinaryIO) -> BAREType: ...
+    def unpack(cls, fp: BinaryIO) -> BAREType:
+        ...
 
     @classmethod
     @abstractmethod

{pybare-1.2.4 → pybare-1.2.5}/bare/test_barearray.py

@@ -5,11 +5,15 @@ import bare
 import pytest
 import io
 
+__all__ = []
+
 
 def test_2d_array_unsized():
-    class InnerArray(Array, inner=UInt): ...
+    class InnerArray(Array, inner=UInt):
+        ...
 
-    class My2DArray(Array, inner=InnerArray): ...
+    class My2DArray(Array, inner=InnerArray):
+        ...
 
     input = [[1, 2], [3, 4]]
     x = My2DArray(input)
@@ -45,7 +49,8 @@ def test_anonymous_array_sized():
 
 
 def test_array_sized():
-    class MyArry(Array, inner=UInt, size=3): ...
+    class MyArry(Array, inner=UInt, size=3):
+        ...
 
     input = [1, 2, 3]
     x = MyArry(input)

{pybare-1.2.4 → pybare-1.2.5}/bare/test_barestruct.py

@@ -1,6 +1,8 @@
 import io
 from bare import Struct, UInt, Str, Field, struct
 
+__all__ = []
+
 
 def test_struct_basic():
     class MyStruct(Struct):

{pybare-1.2.4 → pybare-1.2.5}/bare/test_data.py

@@ -1,9 +1,12 @@
 from bare import Data, data
 import io
 
+__all__ = []
+
 
 def test_data_sized():
-    class SizedData(Data, size=5): ...
+    class SizedData(Data, size=5):
+        ...
 
     x = SizedData(b"12345")
     b = x.pack()
@@ -13,7 +16,8 @@ def test_data_sized():
 
 
 def test_data_unsized():
-    class SizedData(Data): ...
+    class SizedData(Data):
+        ...
 
     x = SizedData(b"12345")
     b = x.pack()

{pybare-1.2.4 → pybare-1.2.5}/bare/test_encoder.py

@@ -27,6 +27,8 @@ from bare import (
     UnionVariant,
 )
 
+__all__ = []
+
 
 class Nested(Struct):
     s = Field(Str)
@@ -100,7 +102,8 @@ def test_map():
     assert map2.value["another"] == "test"
 
 
-class MyArray(Array, inner=Int): ...
+class MyArray(Array, inner=Int):
+    ...
 
 
 class ArrayTest(Struct):
@@ -141,7 +144,8 @@ def test_optional():
         ex.nested = "test"
 
 
-class ExampleUnion(Union, variants=(Str, Int)): ...
+class ExampleUnion(Union, variants=(Str, Int)):
+    ...
 
 
 class UnionTest(Struct):
@@ -234,7 +238,8 @@ class TerminatedEmployee(Void):
     pass
 
 
-class Person(Union, variants=(Customer, Employee, TerminatedEmployee)): ...
+class Person(Union, variants=(Customer, Employee, TerminatedEmployee)):
+    ...
 
 
 @pytest.mark.parametrize(

{pybare-1.2.4 → pybare-1.2.5}/bare/test_map.py

@@ -4,8 +4,11 @@ import io
 
 import pytest
 
+__all__ = []
 
-class MyMap(Map, key_type=Str, value_type=Int): ...
+
+class MyMap(Map, key_type=Str, value_type=Int):
+    ...
 
 
 def test_basic_map():
@@ -30,7 +33,8 @@ def test_anonymous_map():
 def test_nested_map():
     InnerMap = map(Str, Str)
 
-    class NestedMap(Map, key_type=Str, value_type=InnerMap): ...
+    class NestedMap(Map, key_type=Str, value_type=InnerMap):
+        ...
 
     x = NestedMap({"outer": {"hello": "world"}})
     b = x.pack()

{pybare-1.2.4 → pybare-1.2.5}/bare/test_misc.py

@@ -3,6 +3,8 @@ from bare import Enum, UInt, Void, Str
 import io
 import pytest
 
+__all__ = []
+
 
 class MyEnum(Enum):
     A = 1
@@ -19,7 +21,8 @@ def test_enum_basic():
         MyEnum.unpack(io.BytesIO(b))
 
 
-class MyVoid(Void): ...
+class MyVoid(Void):
+    ...
 
 
 def test_custom_void():

{pybare-1.2.4 → pybare-1.2.5}/bare/test_number.py

@@ -2,6 +2,8 @@ import io
 import bare
 import pytest
 
+__all__ = []
+
 
 @pytest.mark.parametrize(
     "type_, good_values, bad_values",

{pybare-1.2.4 → pybare-1.2.5}/bare/test_union.py

@@ -3,8 +3,11 @@ import bare
 import io
 import pytest
 
+__all__ = []
 
-class MyUnion(Union, variants=(Str, Int)): ...
+
+class MyUnion(Union, variants=(Str, Int)):
+    ...
 
 
 def test_union_basic():
@@ -37,7 +40,8 @@ def test_anonymous_union():
 
 
 def test_explicit_discriminant_implicit_following():
-    class MyUnion(Union, variants=(UnionVariant(Str, 4), Int)): ...
+    class MyUnion(Union, variants=(UnionVariant(Str, 4), Int)):
+        ...
 
     x = MyUnion(Str("Hello"))
     b = x.pack()
@@ -57,7 +61,8 @@ def test_explicit_discriminant_implicit_following():
 
 
 def test_explicit_discriminant_all_cases():
-    class MyUnion(Union, variants=(UnionVariant(Str, 4), UnionVariant(Int, 10))): ...
+    class MyUnion(Union, variants=(UnionVariant(Str, 4), UnionVariant(Int, 10))):
+        ...
 
     x = MyUnion(Str("Hello"))
     b = x.pack()
@@ -96,7 +101,8 @@ class AllPrimativeTypes(
         bare.Data,
         bare.Void,
     ),
-): ...
+):
+    ...
 
 
 @pytest.mark.parametrize(

{pybare-1.2.4 → pybare-1.2.5}/bare/util.py

@@ -1,4 +1,5 @@
-from typing import Generic, Type, TypeVar
+from typing import Type, TypeVar
+from .misc import Enum
 
 from .baretype import BAREType
 
@@ -21,15 +22,15 @@ class Field:
 
     attr: str
     name: str
-    ty: Type[BAREType]
+    ty: Type[BAREType | Enum]
 
-    def __init__(self, ty: Type[BAREType], attr: str | None = None):
+    def __init__(self, ty: Type[BAREType | Enum], attr: str | None = None):
         # ignore the typing here because these will always be set when assigned to an
         # object
         self.attr = attr  # type: ignore
         self.ty = ty
 
-    def __get__(self, inst, _) -> T | Type[BAREType[T]]:
+    def __get__(self, inst, _) -> T | Type[BAREType[T] | Enum]:
         if inst is None:
             return self.ty
         return inst.__dict__[self.attr]

{pybare-1.2.4 → pybare-1.2.5}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "pdm.backend"
 
 [project]
 name = "pybare"
-version = "1.2.4"
+version = "1.2.5"
 description = "A BARE Encoding Library and Data Validation Library for Python."
 dependencies = []
 requires-python = ">= 3.10"