Fix typing stubs

src/amulet/resource_pack/__init__.pyi

@@ -18,7 +18,7 @@ from . import (
     unknown_resource_pack,
 )
 
-__all__ = [
+__all__: list[str] = [
     "BaseResourcePack",
     "BaseResourcePackManager",
     "JavaResourcePack",

src/amulet/resource_pack/_amulet_resource_pack.pyi

@@ -2,6 +2,6 @@ from __future__ import annotations
 
 import types
 
-__all__ = ["init"]
+__all__: list[str] = ["init"]
 
 def init(arg0: types.ModuleType) -> None: ...

src/amulet/resource_pack/abc/__init__.pyi

@@ -5,7 +5,7 @@ from amulet.resource_pack.abc.resource_pack_manager import BaseResourcePackManag
 
 from . import resource_pack, resource_pack_manager
 
-__all__ = [
+__all__: list[str] = [
     "BaseResourcePack",
     "BaseResourcePackManager",
     "resource_pack",

src/amulet/resource_pack/image/__init__.pyi

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import PIL.Image
 
-__all__ = ["get_missing_pack_icon", "missing_pack_icon_path"]
+__all__: list[str] = ["get_missing_pack_icon", "missing_pack_icon_path"]
 
 def get_missing_pack_icon() -> PIL.Image.Image: ...
 

src/amulet/resource_pack/java/__init__.pyi

@@ -5,7 +5,7 @@ from amulet.resource_pack.java.resource_pack_manager import JavaResourcePackMana
 
 from . import resource_pack, resource_pack_manager
 
-__all__ = [
+__all__: list[str] = [
     "JavaResourcePack",
     "JavaResourcePackManager",
     "resource_pack",

src/amulet/resource_pack/mesh/__init__.pyi

@@ -2,4 +2,4 @@ from __future__ import annotations
 
 from . import block, util
 
-__all__ = ["block", "util"]
+__all__: list[str] = ["block", "util"]

src/amulet/resource_pack/mesh/block/__init__.pyi

@@ -8,7 +8,7 @@ from amulet.resource_pack.mesh.block._cube import get_cube, get_unit_cube
 
 from . import _cube
 
-__all__ = [
+__all__: list[str] = [
     "BlockMesh",
     "BlockMeshCullDirection",
     "BlockMeshPart",
@@ -36,13 +36,13 @@ class BlockMesh:
         transparency: BlockMeshTransparency,
         textures: collections.abc.Sequence[str],
         parts: tuple[
-            amulet.resource_pack.mesh.block.BlockMeshPart | None,
-            amulet.resource_pack.mesh.block.BlockMeshPart | None,
-            amulet.resource_pack.mesh.block.BlockMeshPart | None,
-            amulet.resource_pack.mesh.block.BlockMeshPart | None,
-            amulet.resource_pack.mesh.block.BlockMeshPart | None,
-            amulet.resource_pack.mesh.block.BlockMeshPart | None,
-            amulet.resource_pack.mesh.block.BlockMeshPart | None,
+            BlockMeshPart | None,
+            BlockMeshPart | None,
+            BlockMeshPart | None,
+            BlockMeshPart | None,
+            BlockMeshPart | None,
+            BlockMeshPart | None,
+            BlockMeshPart | None,
         ],
     ) -> None: ...
     def rotate(self, rotx: typing.SupportsInt, roty: typing.SupportsInt) -> BlockMesh:
@@ -54,13 +54,13 @@ class BlockMesh:
     def parts(
         self,
     ) -> tuple[
-        amulet.resource_pack.mesh.block.BlockMeshPart | None,
-        amulet.resource_pack.mesh.block.BlockMeshPart | None,
-        amulet.resource_pack.mesh.block.BlockMeshPart | None,
-        amulet.resource_pack.mesh.block.BlockMeshPart | None,
-        amulet.resource_pack.mesh.block.BlockMeshPart | None,
-        amulet.resource_pack.mesh.block.BlockMeshPart | None,
-        amulet.resource_pack.mesh.block.BlockMeshPart | None,
+        BlockMeshPart | None,
+        BlockMeshPart | None,
+        BlockMeshPart | None,
+        BlockMeshPart | None,
+        BlockMeshPart | None,
+        BlockMeshPart | None,
+        BlockMeshPart | None,
     ]:
         """
         The mesh parts that make up this mesh. The index corresponds to the value of BlockMeshCullDirection.

tests/test_amulet_resource_pack/__init__.pyi

@@ -4,7 +4,7 @@ import faulthandler as _faulthandler
 
 from . import _test_amulet_resource_pack
 
-__all__ = ["compiler_config"]
+__all__: list[str] = ["compiler_config"]
 
 def _init() -> None: ...
 

tests/test_amulet_resource_pack/_test_amulet_resource_pack.pyi

@@ -2,6 +2,6 @@ from __future__ import annotations
 
 import types
 
-__all__ = ["init"]
+__all__: list[str] = ["init"]
 
 def init(arg0: types.ModuleType) -> None: ...

tools/generate_pybind_stubs.py

@@ -26,7 +26,7 @@ def union_sub_func(match: re.Match) -> str:
 
 
 def class_var_union_sub_func(match: re.Match) -> str:
-    return f'{match.group("variable")}: typing.ClassVar[typing.TypeAlias] = {match.group("value")}'
+    return f'{match.group("variable")}: typing.TypeAlias = {match.group("value")}'
 
 
 VersionPattern = re.compile(r"(?P<var>[a-zA-Z0-9_].*): str = '.*?'")