amulet-core 2.0.3a0__tar.gz → 2.0.3a2__tar.gz

{amulet_core-2.0.3a0 → amulet_core-2.0.3a2}/MANIFEST.in

@@ -1,6 +1,9 @@
 include build_requires.py
 include requirements.py
 
+include get_compiler/CMakeLists.txt
+include get_compiler/__init__.py
+
 recursive-include src/amulet *.cpp *.hpp *Config.cmake
 
 include CMakeLists.txt

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amulet-core
-Version: 2.0.3a0
+Version: 2.0.3a2
 Summary: A Python library for reading/writing Minecraft's various save formats.
 Author: James Clare, Ben Gothard
 Project-URL: Homepage, https://www.amuletmc.com
@@ -15,8 +15,8 @@ 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-zlib~=1.0.0.0a4
-Requires-Dist: amulet-nbt~=5.0.0.0a4
+Requires-Dist: amulet-zlib~=1.0.0.0a7
+Requires-Dist: amulet-nbt~=5.0.0.0a7
 Requires-Dist: numpy~=2.0
 Provides-Extra: docs
 Requires-Dist: Sphinx>=1.7.4; extra == "docs"

amulet_core-2.0.3a2/get_compiler/CMakeLists.txt

@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 3.13)
+
+project(get_compiler LANGUAGES CXX)
+
+# Set C++20
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+write_file("${CMAKE_BINARY_DIR}/compiler_id.txt" "${CMAKE_CXX_COMPILER_ID}")
+write_file("${CMAKE_BINARY_DIR}/compiler_version.txt" "${CMAKE_CXX_COMPILER_VERSION}")

amulet_core-2.0.3a2/get_compiler/__init__.py

@@ -0,0 +1,32 @@
+import os
+import subprocess
+
+Dir = os.path.dirname(__file__)
+
+
+def main() -> str:
+    if subprocess.run(["cmake", "--version"]).returncode:
+        raise RuntimeError("Could not find cmake")
+
+    # get the compiler id and version
+    if subprocess.run(
+        ["cmake", "-S", Dir, "-B", os.path.join(Dir, "build")]
+    ).returncode:
+        raise RuntimeError(
+            "Could not find a C++ 20 compiler. Do you have a C++ 20 compiler installed?"
+        )
+
+    # Get the compiler variables generated by the cmake file
+    with open(os.path.join(Dir, "build", "compiler_id.txt")) as f:
+        compiler_id_str = f.read().strip()
+    with open(os.path.join(Dir, "build", "compiler_version.txt")) as f:
+        compiler_version = f.read().strip()
+
+    # convert the compiler id to an int so it can be used in a version number
+    compiler_id_int = 0
+    for b in compiler_id_str.encode("utf-8"):
+        compiler_id_int <<= 8
+        compiler_id_int += b
+
+    # combine the compiler id and compiler version into a version number
+    return f"==3.0.0.{compiler_id_int}.{compiler_version}"

{amulet_core-2.0.3a0 → amulet_core-2.0.3a2}/pyproject.toml

@@ -3,7 +3,6 @@ requires = [
     "setuptools>=42",
     "versioneer",
     "packaging",
-    "amulet-compiler-version@git+https://github.com/Amulet-Team/Amulet-Compiler-Version.git@3.0"
 ]
 build-backend = "build_requires"
 backend-path = [""]

{amulet_core-2.0.3a0 → amulet_core-2.0.3a2}/requirements.py

@@ -1,5 +1,4 @@
 import os
-import amulet_compiler_version
 from packaging.version import Version
 
 AMULET_COMPILER_TARGET_REQUIREMENT = "==2.0"
@@ -8,8 +7,8 @@ AMULET_COMPILER_VERSION_REQUIREMENT = "==3.0.0"
 PYBIND11_REQUIREMENT = "==2.13.6"
 AMULET_PYBIND11_EXTENSIONS_REQUIREMENT = "~=1.1.0.0a0"
 AMULET_IO_REQUIREMENT = "~=1.0"
-AMULET_ZLIB_REQUIREMENT = "~=1.0.0.0a4"
-AMULET_NBT_REQUIREMENT = "~=5.0.0.0a4"
+AMULET_ZLIB_REQUIREMENT = "~=1.0.0.0a7"
+AMULET_NBT_REQUIREMENT = "~=5.0.0.0a7"
 NUMPY_REQUIREMENT = "~=2.0"
 
 if os.environ.get("AMULET_PYBIND11_EXTENSIONS_REQUIREMENT", None):
@@ -43,7 +42,9 @@ 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__}"
+    import get_compiler
+
+    AMULET_COMPILER_VERSION_REQUIREMENT = get_compiler.main()
 
     try:
         import amulet.pybind11_extensions

{amulet_core-2.0.3a0 → amulet_core-2.0.3a2}/setup.py

@@ -4,6 +4,7 @@ import sys
 from pathlib import Path
 import platform
 import datetime
+from tempfile import TemporaryDirectory
 
 from setuptools import setup, Extension, Command
 from setuptools.command.build_ext import build_ext
@@ -59,31 +60,32 @@ class CMakeBuild(cmdclass.get("build_ext", build_ext)):
 
         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={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])}",
-                f"-Damulet_core_DIR={fix_path(core_src_dir)}",
-                f"-DAMULET_CORE_EXT_DIR={fix_path(ext_dir)}",
-                f"-DCMAKE_INSTALL_PREFIX=install",
-                "-B",
-                "build",
-            ]
-        ).returncode:
-            raise RuntimeError("Error configuring amulet-core")
-        if subprocess.run(
-            ["cmake", "--build", "build", "--config", "Release"]
-        ).returncode:
-            raise RuntimeError("Error installing amulet-core")
-        if subprocess.run(
-            ["cmake", "--install", "build", "--config", "Release"]
-        ).returncode:
-            raise RuntimeError("Error installing amulet-core")
+        with TemporaryDirectory() as tempdir:
+            if subprocess.run(
+                [
+                    "cmake",
+                    *platform_args,
+                    f"-DPYTHON_EXECUTABLE={sys.executable}",
+                    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])}",
+                    f"-Damulet_core_DIR={fix_path(core_src_dir)}",
+                    f"-DAMULET_CORE_EXT_DIR={fix_path(ext_dir)}",
+                    f"-DCMAKE_INSTALL_PREFIX=install",
+                    "-B",
+                    tempdir,
+                ]
+            ).returncode:
+                raise RuntimeError("Error configuring amulet-core")
+            if subprocess.run(
+                ["cmake", "--build", tempdir, "--config", "Release"]
+            ).returncode:
+                raise RuntimeError("Error building amulet-core")
+            if subprocess.run(
+                ["cmake", "--install", tempdir, "--config", "Release"]
+            ).returncode:
+                raise RuntimeError("Error installing amulet-core")
 
 
 cmdclass["build_ext"] = CMakeBuild

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

@@ -23,6 +23,7 @@ def _init() -> None:
         raise RuntimeError(f"Unsupported platform {sys.platform}")
 
     # Import dependencies
+    import amulet.zlib
     import amulet.nbt
 
     # Load the shared library

{amulet_core-2.0.3a0 → amulet_core-2.0.3a2}/src/amulet/core/_amulet_core.py.cpp

@@ -1,7 +1,6 @@
 #include <pybind11/pybind11.h>
 
 #include <amulet/pybind11_extensions/compatibility.hpp>
-#include <amulet/pybind11_extensions/py_module.hpp>
 
 namespace py = pybind11;
 namespace pyext = Amulet::pybind11_extensions;
@@ -18,6 +17,7 @@ void init_chunk(py::module);
 void init_module(py::module m)
 {
     pyext::init_compiler_config(m);
+    pyext::check_compatibility(py::module::import("amulet.zlib"), m);
     pyext::check_compatibility(py::module::import("amulet.nbt"), m);
 
     // Submodules

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

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-06-24T15:49:50+0100",
+ "date": "2025-06-27T16:04:02+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "2360770e8508f0ae742ac79673ff6f84b539349f",
- "version": "2.0.3a0"
+ "full-revisionid": "e066fffa9dd7f65769e62a638a8b55659eae70d0",
+ "version": "2.0.3a2"
 }
 '''  # END VERSION_JSON
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amulet-core
-Version: 2.0.3a0
+Version: 2.0.3a2
 Summary: A Python library for reading/writing Minecraft's various save formats.
 Author: James Clare, Ben Gothard
 Project-URL: Homepage, https://www.amuletmc.com
@@ -15,8 +15,8 @@ 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-zlib~=1.0.0.0a4
-Requires-Dist: amulet-nbt~=5.0.0.0a4
+Requires-Dist: amulet-zlib~=1.0.0.0a7
+Requires-Dist: amulet-nbt~=5.0.0.0a7
 Requires-Dist: numpy~=2.0
 Provides-Extra: docs
 Requires-Dist: Sphinx>=1.7.4; extra == "docs"

{amulet_core-2.0.3a0 → amulet_core-2.0.3a2}/src/amulet_core.egg-info/SOURCES.txt

@@ -5,6 +5,8 @@ build_requires.py
 pyproject.toml
 requirements.py
 setup.py
+get_compiler/CMakeLists.txt
+get_compiler/__init__.py
 src/amulet/core/__init__.py
 src/amulet/core/_amulet_core.py.cpp
 src/amulet/core/_amulet_core.pyi

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

@@ -3,8 +3,8 @@ amulet-compiler-version==3.0.0
 pybind11==2.13.6
 amulet-pybind11-extensions~=1.1.0.0a0
 amulet-io~=1.0
-amulet-zlib~=1.0.0.0a4
-amulet-nbt~=5.0.0.0a4
+amulet-zlib~=1.0.0.0a7
+amulet-nbt~=5.0.0.0a7
 numpy~=2.0
 
 [dev]