amulet-core 2.0.2a1__tar.gz → 2.0.3a0__tar.gz

{amulet_core-2.0.2a1 → amulet_core-2.0.3a0}/CMakeLists.txt

@@ -21,10 +21,8 @@ if (MSVC)
     add_definitions("/MP")
 endif()
 
-# Add pybind11
+# Find libraries
 find_package(pybind11 CONFIG REQUIRED)
-
-# Add Amulet libraries
 find_package(amulet_pybind11_extensions CONFIG REQUIRED)
 find_package(amulet_io CONFIG REQUIRED)
 find_package(amulet_nbt CONFIG REQUIRED)
@@ -40,9 +38,9 @@ list(REMOVE_ITEM HEADERS ${EXTENSION_HEADERS})
 
 # Add implementation
 add_library(amulet_core SHARED)
-target_link_libraries( amulet_core PRIVATE amulet_io )
-target_link_libraries( amulet_core PRIVATE amulet_nbt )
 target_compile_definitions(amulet_core PRIVATE ExportAmuletCore)
+target_link_libraries(amulet_core PUBLIC amulet_io)
+target_link_libraries(amulet_core PUBLIC amulet_nbt)
 target_include_directories(amulet_core PUBLIC ${SOURCE_PATH})
 target_sources(amulet_core PRIVATE ${SOURCES} ${HEADERS})
 foreach(FILE ${SOURCES} ${HEADERS})
@@ -54,10 +52,8 @@ endforeach()
 
 # Add python extension
 pybind11_add_module(_amulet_core)
-target_link_libraries( _amulet_core PRIVATE amulet_pybind11_extensions )
-target_link_libraries( _amulet_core PRIVATE amulet_io )
-target_link_libraries( _amulet_core PRIVATE amulet_nbt )
-target_link_libraries( _amulet_core PRIVATE amulet_core )
+target_link_libraries(_amulet_core PRIVATE amulet_pybind11_extensions)
+target_link_libraries(_amulet_core PRIVATE amulet_core)
 target_compile_definitions(_amulet_core PRIVATE PYBIND11_DETAILED_ERROR_MESSAGES)
 target_compile_definitions(_amulet_core PRIVATE PYBIND11_VERSION="${pybind11_VERSION}")
 target_compile_definitions(_amulet_core PRIVATE COMPILER_ID="${CMAKE_CXX_COMPILER_ID}")

{amulet_core-2.0.2a1/src/amulet_core.egg-info → amulet_core-2.0.3a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amulet-core
-Version: 2.0.2a1
+Version: 2.0.3a0
 Summary: A Python library for reading/writing Minecraft's various save formats.
 Author: James Clare, Ben Gothard
 Project-URL: Homepage, https://www.amuletmc.com
@@ -10,11 +10,14 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: amulet-compiler-target==1.0
-Requires-Dist: numpy~=2.0
+Requires-Dist: amulet-compiler-target==2.0
 Requires-Dist: amulet-compiler-version==3.0.0
+Requires-Dist: pybind11==2.13.6
+Requires-Dist: amulet-pybind11-extensions~=1.1.0.0a0
 Requires-Dist: amulet-io~=1.0
-Requires-Dist: amulet-nbt~=5.0.0.0a1
+Requires-Dist: amulet-zlib~=1.0.0.0a4
+Requires-Dist: amulet-nbt~=5.0.0.0a4
+Requires-Dist: numpy~=2.0
 Provides-Extra: docs
 Requires-Dist: Sphinx>=1.7.4; extra == "docs"
 Requires-Dist: sphinx-autodoc-typehints>=1.3.0; extra == "docs"
@@ -24,7 +27,6 @@ Requires-Dist: setuptools>=42; extra == "dev"
 Requires-Dist: versioneer; extra == "dev"
 Requires-Dist: packaging; extra == "dev"
 Requires-Dist: wheel; extra == "dev"
-Requires-Dist: pybind11==2.13.6; extra == "dev"
 Requires-Dist: amulet_pybind11_extensions~=1.0; extra == "dev"
 Requires-Dist: pybind11_stubgen>=2.5.4; extra == "dev"
 Requires-Dist: black>=22.3; extra == "dev"

{amulet_core-2.0.2a1 → amulet_core-2.0.3a0}/build_requires.py

@@ -1,9 +1,10 @@
 from typing import Union, Mapping
-import requirements
 
 from setuptools import build_meta
 from setuptools.build_meta import *
 
+import requirements
+
 
 def get_requires_for_build_wheel(
     config_settings: Union[Mapping[str, Union[str, list[str], None]], None] = None,

{amulet_core-2.0.2a1 → amulet_core-2.0.3a0}/pyproject.toml

@@ -33,7 +33,6 @@ dev = [
     "versioneer",
     "packaging",
     "wheel",
-    "pybind11==2.13.6",
     "amulet_pybind11_extensions~=1.0",
     "pybind11_stubgen>=2.5.4",
     "black>=22.3",
@@ -74,4 +73,4 @@ style = "pep440"
 versionfile_source = "src/amulet/core/_version.py"
 versionfile_build = "amulet/core/_version.py"
 tag_prefix = ""
-parentdir_prefix = "amulet-core-"
+parentdir_prefix = "amulet_core-"

{amulet_core-2.0.2a1 → amulet_core-2.0.3a0}/requirements.py

@@ -2,23 +2,29 @@ import os
 import amulet_compiler_version
 from packaging.version import Version
 
-AMULET_COMPILER_TARGET_REQUIREMENT = "==1.0"
+AMULET_COMPILER_TARGET_REQUIREMENT = "==2.0"
 AMULET_COMPILER_VERSION_REQUIREMENT = "==3.0.0"
 
 PYBIND11_REQUIREMENT = "==2.13.6"
-AMULET_PYBIND11_EXTENSIONS_REQUIREMENT = "~=1.0"
-
+AMULET_PYBIND11_EXTENSIONS_REQUIREMENT = "~=1.1.0.0a0"
 AMULET_IO_REQUIREMENT = "~=1.0"
-# AMULET_NBT_REQUIREMENT = "~=5.0"
-AMULET_NBT_REQUIREMENT = "~=5.0.0.0a1"
+AMULET_ZLIB_REQUIREMENT = "~=1.0.0.0a4"
+AMULET_NBT_REQUIREMENT = "~=5.0.0.0a4"
 NUMPY_REQUIREMENT = "~=2.0"
 
+if os.environ.get("AMULET_PYBIND11_EXTENSIONS_REQUIREMENT", None):
+    AMULET_PYBIND11_EXTENSIONS_REQUIREMENT = f"{AMULET_PYBIND11_EXTENSIONS_REQUIREMENT},{os.environ['AMULET_PYBIND11_EXTENSIONS_REQUIREMENT']}"
 
 if os.environ.get("AMULET_IO_REQUIREMENT", None):
     AMULET_IO_REQUIREMENT = (
         f"{AMULET_IO_REQUIREMENT},{os.environ['AMULET_IO_REQUIREMENT']}"
     )
 
+if os.environ.get("AMULET_ZLIB_REQUIREMENT", None):
+    AMULET_ZLIB_REQUIREMENT = (
+        f"{AMULET_ZLIB_REQUIREMENT},{os.environ['AMULET_ZLIB_REQUIREMENT']}"
+    )
+
 if os.environ.get("AMULET_NBT_REQUIREMENT", None):
     AMULET_NBT_REQUIREMENT = (
         f"{AMULET_NBT_REQUIREMENT},{os.environ['AMULET_NBT_REQUIREMENT']}"
@@ -39,6 +45,15 @@ def get_specifier_set(version_str: str) -> str:
 if os.environ.get("AMULET_FREEZE_COMPILER", None):
     AMULET_COMPILER_VERSION_REQUIREMENT = f"=={amulet_compiler_version.__version__}"
 
+    try:
+        import amulet.pybind11_extensions
+    except ImportError:
+        pass
+    else:
+        AMULET_PYBIND11_EXTENSIONS_REQUIREMENT = get_specifier_set(
+            amulet.pybind11_extensions.__version__
+        )
+
     try:
         import amulet.io
     except ImportError:
@@ -46,6 +61,13 @@ if os.environ.get("AMULET_FREEZE_COMPILER", None):
     else:
         AMULET_IO_REQUIREMENT = get_specifier_set(amulet.io.__version__)
 
+    try:
+        import amulet.zlib
+    except ImportError:
+        pass
+    else:
+        AMULET_ZLIB_REQUIREMENT = get_specifier_set(amulet.zlib.__version__)
+
     try:
         import amulet.nbt
     except ImportError:
@@ -56,19 +78,23 @@ if os.environ.get("AMULET_FREEZE_COMPILER", None):
 
 def get_build_dependencies() -> list:
     return [
-        f"pybind11{PYBIND11_REQUIREMENT}",
-        f"amulet_pybind11_extensions{AMULET_PYBIND11_EXTENSIONS_REQUIREMENT}",
-        f"amulet_nbt{AMULET_NBT_REQUIREMENT}",
-        f"amulet_io{AMULET_IO_REQUIREMENT}",
         f"amulet-compiler-version{AMULET_COMPILER_VERSION_REQUIREMENT}",
-    ]
+        f"pybind11{PYBIND11_REQUIREMENT}",
+        f"amulet-pybind11-extensions{AMULET_PYBIND11_EXTENSIONS_REQUIREMENT}",
+        f"amulet-io{AMULET_IO_REQUIREMENT}",
+        f"amulet-zlib{AMULET_ZLIB_REQUIREMENT}",
+        f"amulet-nbt{AMULET_NBT_REQUIREMENT}",
+    ] * (not os.environ.get("AMULET_SKIP_COMPILE", None))
 
 
 def get_runtime_dependencies() -> list[str]:
     return [
         f"amulet-compiler-target{AMULET_COMPILER_TARGET_REQUIREMENT}",
-        f"numpy{NUMPY_REQUIREMENT}",
         f"amulet-compiler-version{AMULET_COMPILER_VERSION_REQUIREMENT}",
+        f"pybind11{PYBIND11_REQUIREMENT}",
+        f"amulet-pybind11-extensions{AMULET_PYBIND11_EXTENSIONS_REQUIREMENT}",
         f"amulet-io{AMULET_IO_REQUIREMENT}",
+        f"amulet-zlib{AMULET_ZLIB_REQUIREMENT}",
         f"amulet-nbt{AMULET_NBT_REQUIREMENT}",
+        f"numpy{NUMPY_REQUIREMENT}",
     ]

{amulet_core-2.0.2a1 → amulet_core-2.0.3a0}/setup.py

@@ -14,7 +14,6 @@ import versioneer
 
 import requirements
 
-
 if (
     os.environ.get("AMULET_FREEZE_COMPILER", None)
     and sys.platform == "darwin"
@@ -27,8 +26,6 @@ def fix_path(path: str) -> str:
     return os.path.realpath(path).replace(os.sep, "/")
 
 
-dependencies = requirements.get_runtime_dependencies()
-
 cmdclass: dict[str, type[Command]] = versioneer.get_cmdclass()
 
 
@@ -60,12 +57,14 @@ class CMakeBuild(cmdclass.get("build_ext", build_ext)):
             if platform.machine() == "arm64":
                 platform_args.append("-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64")
 
+        if subprocess.run(["cmake", "--version"]).returncode:
+            raise RuntimeError("Could not find cmake")
         if subprocess.run(
             [
                 "cmake",
                 *platform_args,
                 f"-DPYTHON_EXECUTABLE={sys.executable}",
-                f"-Dpybind11_DIR={pybind11.get_cmake_dir().replace(os.sep, '/')}",
+                f"-Dpybind11_DIR={fix_path(pybind11.get_cmake_dir())}",
                 f"-Damulet_pybind11_extensions_DIR={fix_path(amulet.pybind11_extensions.__path__[0])}",
                 f"-Damulet_io_DIR={fix_path(amulet.io.__path__[0])}",
                 f"-Damulet_nbt_DIR={fix_path(amulet.nbt.__path__[0])}",
@@ -76,15 +75,15 @@ class CMakeBuild(cmdclass.get("build_ext", build_ext)):
                 "build",
             ]
         ).returncode:
-            raise RuntimeError("Error configuring amulet_core")
+            raise RuntimeError("Error configuring amulet-core")
         if subprocess.run(
             ["cmake", "--build", "build", "--config", "Release"]
         ).returncode:
-            raise RuntimeError("Error installing amulet_core")
+            raise RuntimeError("Error installing amulet-core")
         if subprocess.run(
             ["cmake", "--install", "build", "--config", "Release"]
         ).returncode:
-            raise RuntimeError("Error installing amulet_core")
+            raise RuntimeError("Error installing amulet-core")
 
 
 cmdclass["build_ext"] = CMakeBuild
@@ -98,11 +97,9 @@ def _get_version() -> str:
         try:
             with open("build/timestamp.txt", "r") as f:
                 timestamp = datetime.datetime.strptime(f.read(), date_format)
-            print("using cached timestamp")
         except Exception:
             timestamp = datetime.datetime(1, 1, 1)
         if datetime.timedelta(minutes=10) < datetime.datetime.now() - timestamp:
-            print("get timestamp")
             timestamp = datetime.datetime.now()
             os.makedirs("build", exist_ok=True)
             with open("build/timestamp.txt", "w") as f:
@@ -122,6 +119,7 @@ def _get_version() -> str:
 setup(
     version=_get_version(),
     cmdclass=cmdclass,
-    ext_modules=[Extension("amulet.core._amulet_core", [])],
-    install_requires=dependencies,
+    ext_modules=[Extension("amulet.core._amulet_core", [])]
+    * (not os.environ.get("AMULET_SKIP_COMPILE", None)),
+    install_requires=requirements.get_runtime_dependencies(),
 )

{amulet_core-2.0.2a1 → amulet_core-2.0.3a0}/src/amulet/core/__init__.py

@@ -1,11 +1,11 @@
-import logging
+import logging as _logging
 
 from . import _version
 
 __version__ = _version.get_versions()["version"]
 
 # init a default logger
-logging.basicConfig(level=logging.INFO, format="%(levelname)s - %(message)s")
+_logging.basicConfig(level=_logging.INFO, format="%(levelname)s - %(message)s")
 
 
 def _init() -> None:

{amulet_core-2.0.2a1 → amulet_core-2.0.3a0}/src/amulet/core/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-06-09T17:02:54+0100",
+ "date": "2025-06-24T15:49:50+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "5e21128f2822d09e8438f2de676f713055f70af2",
- "version": "2.0.2a1"
+ "full-revisionid": "2360770e8508f0ae742ac79673ff6f84b539349f",
+ "version": "2.0.3a0"
 }
 '''  # END VERSION_JSON
 

{amulet_core-2.0.2a1 → amulet_core-2.0.3a0/src/amulet_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amulet-core
-Version: 2.0.2a1
+Version: 2.0.3a0
 Summary: A Python library for reading/writing Minecraft's various save formats.
 Author: James Clare, Ben Gothard
 Project-URL: Homepage, https://www.amuletmc.com
@@ -10,11 +10,14 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: amulet-compiler-target==1.0
-Requires-Dist: numpy~=2.0
+Requires-Dist: amulet-compiler-target==2.0
 Requires-Dist: amulet-compiler-version==3.0.0
+Requires-Dist: pybind11==2.13.6
+Requires-Dist: amulet-pybind11-extensions~=1.1.0.0a0
 Requires-Dist: amulet-io~=1.0
-Requires-Dist: amulet-nbt~=5.0.0.0a1
+Requires-Dist: amulet-zlib~=1.0.0.0a4
+Requires-Dist: amulet-nbt~=5.0.0.0a4
+Requires-Dist: numpy~=2.0
 Provides-Extra: docs
 Requires-Dist: Sphinx>=1.7.4; extra == "docs"
 Requires-Dist: sphinx-autodoc-typehints>=1.3.0; extra == "docs"
@@ -24,7 +27,6 @@ Requires-Dist: setuptools>=42; extra == "dev"
 Requires-Dist: versioneer; extra == "dev"
 Requires-Dist: packaging; extra == "dev"
 Requires-Dist: wheel; extra == "dev"
-Requires-Dist: pybind11==2.13.6; extra == "dev"
 Requires-Dist: amulet_pybind11_extensions~=1.0; extra == "dev"
 Requires-Dist: pybind11_stubgen>=2.5.4; extra == "dev"
 Requires-Dist: black>=22.3; extra == "dev"

{amulet_core-2.0.2a1 → amulet_core-2.0.3a0}/src/amulet_core.egg-info/requires.txt

@@ -1,15 +1,17 @@
-amulet-compiler-target==1.0
-numpy~=2.0
+amulet-compiler-target==2.0
 amulet-compiler-version==3.0.0
+pybind11==2.13.6
+amulet-pybind11-extensions~=1.1.0.0a0
 amulet-io~=1.0
-amulet-nbt~=5.0.0.0a1
+amulet-zlib~=1.0.0.0a4
+amulet-nbt~=5.0.0.0a4
+numpy~=2.0
 
 [dev]
 setuptools>=42
 versioneer
 packaging
 wheel
-pybind11==2.13.6
 amulet_pybind11_extensions~=1.0
 pybind11_stubgen>=2.5.4
 black>=22.3