Update pybind11 and enable meta build (#6)

* Update dependencies

* Enable meta build

* Update stubs

* Fix target name

Author: gentlegiantJGC

requirements.py

@@ -4,13 +4,13 @@
 AMULET_COMPILER_TARGET_REQUIREMENT = "==2.0"
 AMULET_COMPILER_VERSION_REQUIREMENT = "==3.0.0"
 
-PYBIND11_REQUIREMENT = "==2.13.6"
+PYBIND11_REQUIREMENT = "==3.0.0"
 AMULET_PYBIND11_EXTENSIONS_REQUIREMENT = "~=1.1.0.0a0"
 AMULET_IO_REQUIREMENT = "~=1.0"
-AMULET_UTILS_REQUIREMENT = "~=1.1.0.0a6"
-AMULET_ZLIB_REQUIREMENT = "~=1.0.0.0a7"
-AMULET_NBT_REQUIREMENT = "~=5.0.0.0a6"
-AMULET_CORE_REQUIREMENT = "~=2.0.3.0a1"
+AMULET_UTILS_REQUIREMENT = "~=1.1.1.0a0"
+AMULET_ZLIB_REQUIREMENT = "~=1.0.1.0a0"
+AMULET_NBT_REQUIREMENT = "~=5.0.1.0a0"
+AMULET_CORE_REQUIREMENT = "~=2.0.4.0a0"
 
 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/__init__.pyi

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import logging as logging
 import typing
 
 import amulet.nbt
@@ -17,7 +16,6 @@ __all__ = [
     "RegionDoesNotExist",
     "compiler_config",
     "dimension",
-    "logging",
     "region",
 ]
 

src/amulet/anvil/dimension.pyi

@@ -21,7 +21,7 @@ class AnvilDimension:
         layer_names: collections.abc.Iterable[str],
         mcc: bool = False,
     ) -> None: ...
-    def all_chunk_coords(self) -> typing.Iterator[tuple[int, int]]:
+    def all_chunk_coords(self) -> collections.abc.Iterator[tuple[int, int]]:
         """
         Get an iterator for all the chunks that exist in this dimension.
         External Read::SharedReadWrite lock required.
@@ -34,7 +34,7 @@ class AnvilDimension:
         External ReadWrite::SharedReadOnly lock required.
         """
 
-    def delete_chunk(self, cx: int, cz: int) -> None:
+    def delete_chunk(self, cx: typing.SupportsInt, cz: typing.SupportsInt) -> None:
         """
         Delete all data for the given chunk.
         External ReadWrite::SharedReadWrite lock required.
@@ -48,7 +48,9 @@ class AnvilDimension:
         External ReadWrite:Unique lock required.
         """
 
-    def get_chunk_data(self, cx: int, cz: int) -> dict[str, amulet.nbt.NamedTag]:
+    def get_chunk_data(
+        self, cx: typing.SupportsInt, cz: typing.SupportsInt
+    ) -> dict[str, amulet.nbt.NamedTag]:
         """
         Get the data for a chunk
         External Read::SharedReadWrite lock required.
@@ -62,7 +64,7 @@ class AnvilDimension:
         // External ReadWrite::SharedReadWrite lock required if calling ReadWrite methods on AnvilDimensionLayer.
         """
 
-    def has_chunk(self, cx: int, cz: int) -> bool:
+    def has_chunk(self, cx: typing.SupportsInt, cz: typing.SupportsInt) -> bool:
         """
         Check if a chunk exists.
         External Read::SharedReadWrite lock required.
@@ -85,8 +87,8 @@ class AnvilDimension:
 
     def set_chunk_data(
         self,
-        cx: int,
-        cz: int,
+        cx: typing.SupportsInt,
+        cz: typing.SupportsInt,
         data_layers: collections.abc.Iterable[tuple[str, amulet.nbt.NamedTag]],
     ) -> None:
         """
@@ -129,14 +131,14 @@ class AnvilDimensionLayer:
     """
 
     def __init__(self, directory: str, mcc: bool = False) -> None: ...
-    def all_chunk_coords(self) -> typing.Iterator[tuple[int, int]]:
+    def all_chunk_coords(self) -> collections.abc.Iterator[tuple[int, int]]:
         """
         An iterator of all chunk coordinates in this layer.
         External Read::SharedReadWrite lock required.
         External Read::SharedReadOnly lock optional.
         """
 
-    def all_region_coords(self) -> typing.Iterator[tuple[int, int]]:
+    def all_region_coords(self) -> collections.abc.Iterator[tuple[int, int]]:
         """
         An iterator of all region coordinates in this layer.
         External Read::SharedReadWrite lock required.
@@ -149,7 +151,7 @@ class AnvilDimensionLayer:
         External ReadWrite::SharedReadOnly lock required.
         """
 
-    def delete_chunk(self, cx: int, cz: int) -> None:
+    def delete_chunk(self, cx: typing.SupportsInt, cz: typing.SupportsInt) -> None:
         """
         Delete the chunk data from this layer.
         External ReadWrite::SharedReadWrite lock required.
@@ -163,15 +165,17 @@ class AnvilDimensionLayer:
         External ReadWrite:Unique lock required.
         """
 
-    def get_chunk_data(self, cx: int, cz: int) -> amulet.nbt.NamedTag:
+    def get_chunk_data(
+        self, cx: typing.SupportsInt, cz: typing.SupportsInt
+    ) -> amulet.nbt.NamedTag:
         """
         Get a NamedTag of a chunk from the database.
         Will raise ChunkDoesNotExist if the region or chunk does not exist
         External Read::SharedReadWrite lock required.
         """
 
     def get_region(
-        self, rx: int, rz: int, create: bool = False
+        self, rx: typing.SupportsInt, rz: typing.SupportsInt, create: bool = False
     ) -> amulet.anvil.region.AnvilRegion:
         """
         Get an AnvilRegion instance from chunk coordinates it contains. This must not be stored long-term.
@@ -181,7 +185,7 @@ class AnvilDimensionLayer:
         """
 
     def get_region_at_chunk(
-        self, cx: int, cz: int, create: bool = False
+        self, cx: typing.SupportsInt, cz: typing.SupportsInt, create: bool = False
     ) -> amulet.anvil.region.AnvilRegion:
         """
         Get an AnvilRegion instance from chunk coordinates it contains. This must not be stored long-term.
@@ -190,21 +194,23 @@ class AnvilDimensionLayer:
         External ReadWrite::SharedReadWrite lock required if calling ReadWrite methods on AnvilRegion.
         """
 
-    def has_chunk(self, cx: int, cz: int) -> bool:
+    def has_chunk(self, cx: typing.SupportsInt, cz: typing.SupportsInt) -> bool:
         """
         Check if the chunk has data in this layer.
         External Read::SharedReadWrite lock required.
         External Read::SharedReadOnly lock optional.
         """
 
-    def has_region(self, rx: int, rz: int) -> bool:
+    def has_region(self, rx: typing.SupportsInt, rz: typing.SupportsInt) -> bool:
         """
         Check if a region file exists in this layer at given the coordinates.
         External Read::SharedReadWrite lock required.
         External Read::SharedReadOnly lock optional.
         """
 
-    def has_region_at_chunk(self, cx: int, cz: int) -> bool:
+    def has_region_at_chunk(
+        self, cx: typing.SupportsInt, cz: typing.SupportsInt
+    ) -> bool:
         """
         Check if a region file exists in this layer that contains the given chunk.
         External Read::SharedReadWrite lock required.
@@ -218,7 +224,9 @@ class AnvilDimensionLayer:
         External Read:SharedReadWrite lock required.
         """
 
-    def set_chunk_data(self, cx: int, cz: int, tag: amulet.nbt.NamedTag) -> None:
+    def set_chunk_data(
+        self, cx: typing.SupportsInt, cz: typing.SupportsInt, tag: amulet.nbt.NamedTag
+    ) -> None:
         """
         Set the chunk data for this layer.
         External ReadWrite::SharedReadWrite lock required.

src/amulet/anvil/region.pyi

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import collections.abc
 import typing
 
 import amulet.nbt
@@ -24,14 +25,25 @@ class AnvilRegion:
 
     @typing.overload
     def __init__(
-        self, directory: str, file_name: str, rx: int, rz: int, mcc: bool = False
+        self,
+        directory: str,
+        file_name: str,
+        rx: typing.SupportsInt,
+        rz: typing.SupportsInt,
+        mcc: bool = False,
     ) -> None:
         """
         Construct from the directory path, name of the file and region coordinates.
         """
 
     @typing.overload
-    def __init__(self, directory: str, rx: int, rz: int, mcc: bool = False) -> None:
+    def __init__(
+        self,
+        directory: str,
+        rx: typing.SupportsInt,
+        rz: typing.SupportsInt,
+        mcc: bool = False,
+    ) -> None:
         """
         Construct from the directory path and region coordinates.
         File name is computed from region coordinates.
@@ -60,22 +72,25 @@ class AnvilRegion:
         External ReadWrite:SharedReadWrite lock required.
         """
 
-    def contains(self, cx: int, cz: int) -> bool:
+    def contains(self, cx: typing.SupportsInt, cz: typing.SupportsInt) -> bool:
         """
         Is the coordinate in the region.
         This returns true even if there is no value for the coordinate.
         Coordinates are in world space.
         Thread safe.
         """
 
-    def delete_batch(self, coords: list[tuple[int, int]]) -> None:
+    def delete_batch(
+        self,
+        coords: collections.abc.Sequence[tuple[typing.SupportsInt, typing.SupportsInt]],
+    ) -> None:
         """
         Delete multiple chunk's data.
         Coordinates are in world space.
         External ReadWrite:SharedReadWrite lock required.
         """
 
-    def delete_value(self, cx: int, cz: int) -> None:
+    def delete_value(self, cx: typing.SupportsInt, cz: typing.SupportsInt) -> None:
         """
         Delete the chunk data.
         Coordinates are in world space.
@@ -107,14 +122,16 @@ class AnvilRegion:
         Thread safe.
         """
 
-    def get_value(self, cx: int, cz: int) -> amulet.nbt.NamedTag:
+    def get_value(
+        self, cx: typing.SupportsInt, cz: typing.SupportsInt
+    ) -> amulet.nbt.NamedTag:
         """
         Get the value for this coordinate.
         Coordinates are in world space.
         External Read:SharedReadWrite lock required.
         """
 
-    def has_value(self, cx: int, cz: int) -> bool:
+    def has_value(self, cx: typing.SupportsInt, cz: typing.SupportsInt) -> bool:
         """
         Is there a value stored for this coordinate.
         Coordinates are in world space.
@@ -129,7 +146,9 @@ class AnvilRegion:
         External Read:SharedReadWrite lock required.
         """
 
-    def set_value(self, cx: int, cz: int, tag: amulet.nbt.NamedTag) -> None:
+    def set_value(
+        self, cx: typing.SupportsInt, cz: typing.SupportsInt, tag: amulet.nbt.NamedTag
+    ) -> None:
         """
         Set the value for this coordinate.
         Coordinates are in world space.

tests/CMakeLists.txt

@@ -18,10 +18,18 @@ else()
 endif()
 
 # Find dependencies
-find_package(pybind11 CONFIG REQUIRED)
-find_package(amulet_pybind11_extensions CONFIG REQUIRED)
-find_package(amulet_test_utils CONFIG REQUIRED)
-find_package(amulet_anvil CONFIG REQUIRED)
+if (NOT TARGET pybind11::module)
+    find_package(pybind11 CONFIG REQUIRED)
+endif()
+if (NOT TARGET amulet_pybind11_extensions)
+    find_package(amulet_pybind11_extensions CONFIG REQUIRED)
+endif()
+if (NOT TARGET amulet_test_utils)
+    find_package(amulet_test_utils CONFIG REQUIRED)
+endif()
+if (NOT TARGET amulet_anvil)
+    find_package(amulet_anvil CONFIG REQUIRED)
+endif()
 
 # Find sources
 file(GLOB_RECURSE SOURCES LIST_DIRECTORIES false "${CMAKE_CURRENT_LIST_DIR}/*.py.cpp")

tests/test_amulet_anvil/__init__.pyi

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
-import faulthandler as faulthandler
+import faulthandler as _faulthandler
 
 from . import _test_amulet_anvil, test_region_
 
-__all__ = ["compiler_config", "faulthandler", "test_region_"]
+__all__ = ["compiler_config", "test_region_"]
 
 def _init() -> None: ...