Update dependencies, module constructor and stubgen (#14)

* Update dependencies

* Improve module constructor

* Improve stub generator

Author: gentlegiantJGC

requirements.py

@@ -4,12 +4,12 @@
 
 AMULET_COMPILER_TARGET_REQUIREMENT = "==2.0"
 
-PYBIND11_REQUIREMENT = "==3.0.0"
-AMULET_PYBIND11_EXTENSIONS_REQUIREMENT = "~=1.2.0.0a0"
+PYBIND11_REQUIREMENT = "==3.0.1"
+AMULET_PYBIND11_EXTENSIONS_REQUIREMENT = "~=1.2.0.0a2"
 AMULET_IO_REQUIREMENT = "~=1.0"
-AMULET_UTILS_REQUIREMENT = "~=1.1.3.0a0"
+AMULET_UTILS_REQUIREMENT = "~=1.1.3.0a6"
 AMULET_ZLIB_REQUIREMENT = "~=1.0.8.0a0"
-AMULET_NBT_REQUIREMENT = "~=5.0.2.0a0"
+AMULET_NBT_REQUIREMENT = "~=5.0.2.0a2"
 
 if os.environ.get("AMULET_PYBIND11_EXTENSIONS_REQUIREMENT", None):
     AMULET_PYBIND11_EXTENSIONS_REQUIREMENT = f"{AMULET_PYBIND11_EXTENSIONS_REQUIREMENT},{os.environ['AMULET_PYBIND11_EXTENSIONS_REQUIREMENT']}"

src/amulet/anvil/_amulet_anvil.py.cpp

@@ -28,8 +28,5 @@ void init_module(py::module m)
 
 PYBIND11_MODULE(_amulet_anvil, m)
 {
-    py::options options;
-    options.disable_function_signatures();
-    m.def("init", &init_module, py::doc("init(arg0: types.ModuleType) -> None"));
-    options.enable_function_signatures();
+    m.def("init", &init_module, py::arg("m"));
 }

src/amulet/anvil/_amulet_anvil.pyi

@@ -4,4 +4,4 @@ import types
 
 __all__: list[str] = ["init"]
 
-def init(arg0: types.ModuleType) -> None: ...
+def init(m: types.ModuleType) -> None: ...

tests/test_amulet_anvil/_test_amulet_anvil.py.cpp

@@ -15,8 +15,5 @@ void init_module(py::module m){
 }
 
 PYBIND11_MODULE(_test_amulet_anvil, m) {
-    py::options options;
-    options.disable_function_signatures();
-    m.def("init", &init_module, py::doc("init(arg0: types.ModuleType) -> None"));
-    options.enable_function_signatures();
+    m.def("init", &init_module, py::arg("m"));
 }

tests/test_amulet_anvil/_test_amulet_anvil.pyi

@@ -4,4 +4,4 @@ import types
 
 __all__: list[str] = ["init"]
 
-def init(arg0: types.ModuleType) -> None: ...
+def init(m: types.ModuleType) -> None: ...

tools/generate_pybind_stubs.py

@@ -7,16 +7,28 @@
 import pybind11_stubgen
 from pybind11_stubgen.structs import Identifier
 from pybind11_stubgen.parser.mixins.filter import FilterClassMembers
-from pybind11_stubgen import main as pybind11_stubgen_main
+
+
+ForwardRefPattern = re.compile(r"ForwardRef\('(?P<variable>[a-zA-Z_][a-zA-Z0-9_]*)'\)")
+
+QuotePattern = re.compile(r"'(?P<variable>[a-zA-Z_][a-zA-Z0-9_]*)'")
+
+
+def fix_value(value: str) -> str:
+    value = value.replace("NoneType", "None")
+    value = ForwardRefPattern.sub(lambda match: match.group("variable"), value)
+    value = QuotePattern.sub(lambda match: match.group("variable"), value)
+    return value
+
 
 UnionPattern = re.compile(
-    r"^(?P<variable>[a-zA-Z_][a-zA-Z0-9_]*): types\.UnionType\s*#\s*value = (?P<value>.*)$",
+    r"^(?P<variable>[a-zA-Z_][a-zA-Z0-9_]*): (types\.UnionType|typing\._UnionGenericAlias)\s*#\s*value = (?P<value>.*)$",
     flags=re.MULTILINE,
 )
 
 
 def union_sub_func(match: re.Match[str]) -> str:
-    return f'{match.group("variable")}: typing.TypeAlias = {match.group("value")}'
+    return f'{match.group("variable")}: typing.TypeAlias = {fix_value(match.group("value"))}'
 
 
 ClassVarUnionPattern = re.compile(
@@ -26,7 +38,7 @@ def union_sub_func(match: re.Match[str]) -> str:
 
 
 def class_var_union_sub_func(match: re.Match) -> str:
-    return f'{match.group("variable")}: typing.TypeAlias = {match.group("value")}'
+    return f'{match.group("variable")}: typing.TypeAlias = {fix_value(match.group("value"))}'
 
 
 VersionPattern = re.compile(r"(?P<var>[a-zA-Z0-9_].*): str = '.*?'")
@@ -87,7 +99,7 @@ def eq_sub_func(match: re.Match[str]) -> str:
 
 
 def generic_alias_sub_func(match: re.Match) -> str:
-    return f"{match.group('variable')}: typing.TypeAlias = {match.group('value')}"
+    return f'{match.group("variable")}: typing.TypeAlias = {fix_value(match.group("value"))}'
 
 
 def get_module_path(name: str) -> str: