Merge pull request #47 from hit9/compat-py311

Compat Python 3.11

Author: hit9

.github/workflows/bench.yml

@@ -17,8 +17,8 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04, ubuntu-18.04, macos-latest]
-        python: ["3.10"]
-        go: ["1.18"]
+        python: ["3.11"]
+        go: ["1.19"]
 
     runs-on: ${{ matrix.os  }}
 

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-18.04]
-        python: [3.7, 3.8, "3.10"]
+        python: [3.7, 3.8, "3.10", "3.11"]
         go: ["1.19", "1.16"]
 
     runs-on: ${{ matrix.os  }}
@@ -47,24 +47,24 @@ jobs:
       run: |
         pip install -r compiler/requirements_dev.txt
         pip install -r lib/py/requirements_dev.txt
+      if: "matrix.python == '3.11'"
 
     - name: Install tests requirements
       run: |
         pip install -r tests/requirements_tests.txt
 
-
     - name: Install clang-format 11.0
       run: |
         wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
         sudo apt-add-repository 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main'
         sudo apt update
         sudo apt-get install clang-format-11 -y
-      if: "matrix.python == '3.10'"
+      if: "matrix.python == '3.11'"
 
     - name: Run lints
       run: |
         make lint CLANG_FORMAT=clang-format-11
-      if: "matrix.python == '3.10'"
+      if: "matrix.python == '3.11'"
 
     - name: Run tests
       run: |

changes.rst

@@ -1,5 +1,12 @@
 .. currentmodule:: bitproto
 
+Version 1.0.1
+-------------
+
+.. _version-1.0.1
+
+- Add support for Python 3.11
+
 Version 1.0.0
 -------------
 

compiler/bitproto/__init__.py

@@ -8,5 +8,5 @@
 
 """
 
-__version__ = "1.0.0"
+__version__ = "1.0.1"
 __description__ = "bit level data interchange format."

compiler/bitproto/_ast.py

@@ -761,7 +761,7 @@ class Array(CompositeType, ExtensibleType):
     Constraint: Capacity of array should be smaller than 65536.
     """
 
-    element_type: Type = _TYPE_MISSING
+    element_type: Type = dataclass_field(default_factory=lambda: _TYPE_MISSING)
     cap: int = 0
 
     @classmethod
@@ -817,7 +817,7 @@ class Alias(Type, BoundDefinition):
     :param type: The referenced type.
     """
 
-    type: Type = _TYPE_MISSING
+    type: Type = dataclass_field(default_factory=lambda: _TYPE_MISSING)
 
     def __repr__(self) -> str:
         return f"<alias {self.name}>"
@@ -884,7 +884,7 @@ class Enum(BoundScope, SingleType):
     Enum in bitproto constraints to uint type.
     """
 
-    type: Uint = _UINT_MISSING
+    type: Uint = dataclass_field(default_factory=lambda: _UINT_MISSING)
 
     def __repr__(self) -> str:
         return f"<enum {self.name}>"
@@ -934,7 +934,7 @@ def validate_enum_field_on_push(self, field: EnumField) -> None:
 @frozen
 @dataclass
 class MessageField(Field):
-    type: Type = Type()
+    type: Type = dataclass_field(default_factory=Type)
     number: int = 0
 
     def __repr__(self) -> str:

compiler/bitproto/_main.py

@@ -137,6 +137,7 @@ def main(
         fatal(str(error))
 
     # Lint
+    lint_warnings = 0
     if not disable_linter:
         lint_warnings = lint(proto)
 

compiler/bitproto/errors.py

@@ -16,7 +16,7 @@
 """
 
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, ClassVar, Optional, Type as T, TypeVar
+from typing import TYPE_CHECKING, Any, Optional, Type as T, TypeVar
 
 from bitproto.utils import Color, colored, overridable, override, write_stderr
 
@@ -40,7 +40,7 @@ def format_default_description(self) -> str:
 
     @overridable
     def _message_prefix(self) -> str:
-        pass
+        raise NotImplementedError
 
     def __str__(self) -> str:
         description = self.description

compiler/bitproto/linter.py

@@ -6,8 +6,7 @@
 """
 
 from abc import abstractmethod
-from dataclasses import dataclass
-from typing import Callable, Generic, List, Optional, Tuple, Type as T, TypeVar
+from typing import Generic, List, Optional, Tuple, Type as T, TypeVar
 
 from bitproto._ast import (
     Alias,
@@ -18,7 +17,6 @@
     EnumField,
     Message,
     MessageField,
-    Node,
     Proto,
 )
 from bitproto.errors import (
@@ -31,7 +29,6 @@
     LintWarning,
     MessageFieldNameNotSnake,
     MessageNameNotPascal,
-    Warning,
     warning,
 )
 from bitproto.utils import pascal_case, snake_case

compiler/bitproto/options.py

@@ -6,7 +6,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Callable, Optional, Tuple, Union, cast
+from typing import Callable, Optional, Tuple, Union
 
 Value = Union[bool, int, str]
 Validator = Callable[..., bool]

compiler/bitproto/utils.py

@@ -8,6 +8,7 @@
     Any,
     Callable,
     List,
+    NoReturn,
     Optional,
     Type as T,
     TypeVar,
@@ -126,7 +127,7 @@ def __get__(self, obj: None, cls: T[I]) -> "cached_property":
         ...
 
     @overload
-    def __get__(self, obj: I, cls: T[I]) -> O:
+    def __get__(self, obj: I, cls: T[I]) -> O:  # type: ignore
         ...
 
     def __get__(self, obj: Optional[I], cls: T[I]) -> Union["cached_property", O]:
@@ -292,7 +293,7 @@ def write_stderr(s: str) -> None:
     sys.stderr.write(s + "\n")
 
 
-def fatal(s: str = "", code: int = 1) -> None:
+def fatal(s: str = "", code: int = 1) -> NoReturn:
     """Exit the whole program with given code and message."""
     if s:
         write_stderr(s)

compiler/requirements_dev.txt

@@ -1,6 +1,6 @@
-black>=22.0,<=23.0
-isort>=5.7.0,<=6.0.0
-mypy>=0.790,<=0.800
-mypy-extensions>=0.4.3,<=0.5.0
-pyinstaller>=4.2,<=5.0
+black>=22.0
+isort>=5.7.0
+mypy>=0.790
+mypy-extensions>=0.4.3
+pyinstaller>=4.2
 twine>=3.4.2

compiler/setup.py

@@ -72,5 +72,6 @@
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
     ],
 )

lib/c/bitproto.h

@@ -22,6 +22,8 @@
 extern "C" {
 #endif
 
+#define __BITPROTO_VERSION__ "1.0.1"
+
 ////////////////////
 // Macros
 ////////////////////

lib/py/requirements_dev.txt

@@ -1,4 +1,4 @@
-black>=22.0,<=23.0
-isort>=5.7.0,<=6.0.0
-mypy>=0.790,<=0.800
-mypy-extensions>=0.4.3,<=0.5.0
+black>=22.0
+isort>=5.7.0
+mypy>=0.790
+mypy-extensions>=0.4.3

lib/py/setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="bitprotolib",
-    version="1.0.0",
+    version="1.0.1",
     url="https://github.com/hit9/bitproto",
     author="Chao Wang",
     author_email="hit9@icloud.com",
@@ -22,5 +22,7 @@
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
     ],
 )