Update build tools and dependencies (#25)

* Update build tools

* Improve module constructor

* Update dependencies

Author: gentlegiantJGC

build_requires.py

@@ -1,3 +1,5 @@
+# mypy: disable-error-code=no-redef
+
 from typing import Union, Mapping
 
 from setuptools import build_meta

mypy.ini

@@ -2,6 +2,14 @@
 disallow_untyped_defs = True
 check_untyped_defs = True
 warn_return_any = True
-python_version = 3.11
-mypy_path = $MYPY_CONFIG_FILE_DIR/src
-packages = amulet
+python_version = 3.12
+explicit_package_bases = True
+mypy_path = $MYPY_CONFIG_FILE_DIR/src,$MYPY_CONFIG_FILE_DIR/tests
+files = 
+    src,
+    tests,
+    tools,
+    get_compiler,
+    build_requires.py,
+    requirements.py,
+    setup.py

pyproject.toml

@@ -28,7 +28,9 @@ docs = [
 ]
 dev = [
     "setuptools>=42",
+    "types-setuptools",
     "versioneer",
+    "types-versioneer",
     "packaging",
     "wheel",
     "pybind11_stubgen>=2.5.4",

requirements.py

@@ -4,8 +4,8 @@
 
 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"
 
 if os.environ.get("AMULET_PYBIND11_EXTENSIONS_REQUIREMENT", None):
     AMULET_PYBIND11_EXTENSIONS_REQUIREMENT = f"{AMULET_PYBIND11_EXTENSIONS_REQUIREMENT},{os.environ['AMULET_PYBIND11_EXTENSIONS_REQUIREMENT']}"

setup.py

@@ -4,6 +4,7 @@
 from pathlib import Path
 import platform
 from tempfile import TemporaryDirectory
+from typing import TypeAlias, TYPE_CHECKING
 
 from setuptools import setup, Extension, Command
 from setuptools.command.build_ext import build_ext
@@ -13,15 +14,20 @@
 import requirements
 
 
-def fix_path(path: str) -> str:
+def fix_path(path: str | os.PathLike[str]) -> str:
     return os.path.realpath(path).replace(os.sep, "/")
 
 
 cmdclass: dict[str, type[Command]] = versioneer.get_cmdclass()
 
+if TYPE_CHECKING:
+    BuildExt: TypeAlias = build_ext
+else:
+    BuildExt = cmdclass.get("build_ext", build_ext)
 
-class CMakeBuild(cmdclass.get("build_ext", build_ext)):
-    def build_extension(self, ext):
+
+class CMakeBuild(BuildExt):
+    def build_extension(self, ext: Extension) -> None:
         import pybind11
         import amulet.pybind11_extensions
 
@@ -74,7 +80,7 @@ def build_extension(self, ext):
                 raise RuntimeError("Error installing amulet-zlib")
 
 
-cmdclass["build_ext"] = CMakeBuild
+cmdclass["build_ext"] = CMakeBuild  # type: ignore
 
 
 setup(

src/amulet/zlib/_amulet_zlib.py.cpp

@@ -62,8 +62,5 @@ void init_module(py::module m)
 
 PYBIND11_MODULE(_amulet_zlib, 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/zlib/_amulet_zlib.pyi

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

tests/test_amulet_zlib/_test_amulet_zlib.py.cpp

@@ -15,8 +15,5 @@ void init_module(py::module m){
 }
 
 PYBIND11_MODULE(_test_amulet_zlib, 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_zlib/_test_amulet_zlib.pyi

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

tools/cmake_generate.py

@@ -15,7 +15,7 @@ def fix_path(path: str) -> str:
 RootDir = fix_path(os.path.dirname(os.path.dirname(__file__)))
 
 
-def main():
+def main() -> None:
     platform_args = []
     if sys.platform == "win32":
         platform_args.extend(["-G", "Visual Studio 17 2022"])