amulet-core 2.0a9__tar.gz → 2.0.1a0__tar.gz

{amulet_core-2.0a9/src/amulet_core.egg-info → amulet_core-2.0.1a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amulet-core
-Version: 2.0a9
+Version: 2.0.1a0
 Summary: A Python library for reading/writing Minecraft's various save formats.
 Author: James Clare, Ben Gothard
 Project-URL: Homepage, https://www.amuletmc.com
@@ -12,10 +12,9 @@ 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-version==1.3.0
-Requires-Dist: amulet_pybind11_extensions~=1.0
-Requires-Dist: amulet_io~=1.0
-Requires-Dist: amulet_nbt==4.0a20
+Requires-Dist: amulet-compiler-version==3.0.0
+Requires-Dist: amulet-io~=1.0
+Requires-Dist: amulet-nbt~=4.0.0.0a24
 Provides-Extra: docs
 Requires-Dist: Sphinx>=1.7.4; extra == "docs"
 Requires-Dist: sphinx-autodoc-typehints>=1.3.0; extra == "docs"

{amulet_core-2.0a9 → amulet_core-2.0.1a0}/build_requires.py

@@ -10,7 +10,8 @@ def get_requires_for_build_wheel(
 ) -> list[str]:
     return [
         *build_meta.get_requires_for_build_wheel(config_settings),
-        *requirements.get_compile_dependencies(config_settings),
+        "wheel",
+        *requirements.get_build_dependencies(),
     ]
 
 
@@ -19,5 +20,5 @@ def get_requires_for_build_editable(
 ) -> list[str]:
     return [
         *build_meta.get_requires_for_build_editable(config_settings),
-        *requirements.get_compile_dependencies(config_settings),
+        *requirements.get_build_dependencies(),
     ]

{amulet_core-2.0a9 → amulet_core-2.0.1a0}/pyproject.toml

@@ -2,7 +2,8 @@
 requires = [
     "setuptools>=42",
     "versioneer",
-    "packaging"
+    "packaging",
+    "amulet-compiler-version@git+https://github.com/Amulet-Team/Amulet-Compiler-Version.git@3.0"
 ]
 build-backend = "build_requires"
 backend-path = [""]
@@ -73,4 +74,4 @@ style = "pep440"
 versionfile_source = "src/amulet/core/_version.py"
 versionfile_build = "amulet/core/_version.py"
 tag_prefix = ""
-parentdir_prefix = "amulet-"
+parentdir_prefix = "amulet-core-"

amulet_core-2.0.1a0/requirements.py

@@ -0,0 +1,70 @@
+import os
+import amulet_compiler_version
+from packaging.version import Version
+
+AMULET_COMPILER_TARGET_REQUIREMENT = "==1.0"
+AMULET_COMPILER_VERSION_REQUIREMENT = "==3.0.0"
+
+PYBIND11_REQUIREMENT = "==2.13.6"
+AMULET_PYBIND11_EXTENSIONS_REQUIREMENT = "~=1.0"
+
+AMULET_IO_REQUIREMENT = "~=1.0"
+# AMULET_NBT_REQUIREMENT = "~=4.0"
+AMULET_NBT_REQUIREMENT = "~=4.0.0.0a24"
+NUMPY_REQUIREMENT = "~=2.0"
+
+
+def get_specifier_set(version_str: str, compiler_suffix_: str = "") -> str:
+    """
+    version_str: The PEP 440 version number of the library.
+    compiler_suffix_: Only specified if it is a compiled library and the compiler is being frozen.
+    """
+    version = Version(version_str)
+    if version.epoch != 0 or version.is_devrelease or version.is_postrelease:
+        raise RuntimeError(f"Unsupported version format. {version_str}")
+
+    major, minor, patch, fix, *_ = version.release + (0, 0, 0, 0)
+
+    return f"~={major}.{minor}.{patch}.{fix}{compiler_suffix_}{''.join(map(str, version.pre or ()))}"
+
+
+if os.environ.get("AMULET_FREEZE_COMPILER", None):
+    AMULET_COMPILER_VERSION_REQUIREMENT = f"=={amulet_compiler_version.__version__}"
+
+    compiler_suffix = f".{'.'.join(amulet_compiler_version.__version__.split('.')[3:])}"
+
+    try:
+        import amulet.io
+    except ImportError:
+        pass
+    else:
+        AMULET_IO_REQUIREMENT = get_specifier_set(amulet.io.__version__)
+
+    try:
+        import amulet.nbt
+    except ImportError:
+        pass
+    else:
+        AMULET_NBT_REQUIREMENT = get_specifier_set(
+            amulet.nbt.__version__, compiler_suffix
+        )
+
+
+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}",
+    ]
+
+
+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"amulet-io{AMULET_IO_REQUIREMENT}",
+        f"amulet-nbt{AMULET_NBT_REQUIREMENT}",
+    ]

{amulet_core-2.0a9 → amulet_core-2.0.1a0}/setup.py

@@ -2,83 +2,23 @@ import os
 import subprocess
 import sys
 from pathlib import Path
-import requirements
 
 from setuptools import setup, Extension, Command
 from setuptools.command.build_ext import build_ext
+
 from packaging.version import Version
 
 import versioneer
 
+import requirements
+import amulet_compiler_version
+
 
 def fix_path(path: str) -> str:
     return os.path.realpath(path).replace(os.sep, "/")
 
 
-dependencies = requirements.get_fixed_runtime_dependencies()
-setup_args = {}
-
-
-def add_dependency(lib_name: str, version_str: str) -> None:
-    version = Version(version_str)
-    if version.is_prerelease:
-        # Breaking API changes can be made between pre-release versions. Pin to this exact release.
-        dependencies.append(f"{lib_name}=={version_str}")
-    else:
-        # Major - breaking API change. Dependents must be updated and recompiled.
-        major = version.major
-        # Minor - backwards compatible API change. Dependents must be recompiled.
-        minor = version.minor
-        # Patch - API unchanged. Dependents must be recompiled.
-        patch = version.micro
-        # Fix - API unchanged. Dependents do not need to be recompiled.
-        dependencies.append(f"{lib_name}~={major}.{minor}.{patch}.0")
-
-
-try:
-    import amulet_compiler_version
-except ImportError:
-    dependencies.append(
-        f"amulet-compiler-version{requirements.AMULET_COMPILER_VERSION_REQUIREMENT}"
-    )
-else:
-    if os.environ.get("AMULET_FREEZE_COMPILER", None):
-        dependencies.append(
-            f"amulet-compiler-version=={amulet_compiler_version.__version__}"
-        )
-        setup_args["options"] = {
-            "bdist_wheel": {
-                "build_number": f"1.{amulet_compiler_version.compiler_id}.{amulet_compiler_version.compiler_version}"
-            }
-        }
-    else:
-        dependencies.append(
-            f"amulet-compiler-version{requirements.AMULET_COMPILER_VERSION_REQUIREMENT}"
-        )
-
-try:
-    import amulet.pybind11_extensions
-except ImportError:
-    dependencies.append(
-        f"amulet_pybind11_extensions{requirements.AMULET_PYBIND11_EXTENSIONS_REQUIREMENT}"
-    )
-else:
-    add_dependency("amulet_pybind11_extensions", amulet.pybind11_extensions.__version__)
-
-try:
-    import amulet.io
-except ImportError:
-    dependencies.append(f"amulet_io{requirements.AMULET_IO_REQUIREMENT}")
-else:
-    add_dependency("amulet_io", amulet.io.__version__)
-
-try:
-    import amulet.nbt
-except ImportError:
-    dependencies.append(f"amulet_nbt{requirements.AMULET_NBT_REQUIREMENT}")
-else:
-    add_dependency("amulet_nbt", amulet.nbt.__version__)
-
+dependencies = requirements.get_runtime_dependencies()
 
 cmdclass: dict[str, type[Command]] = versioneer.get_cmdclass()
 
@@ -138,10 +78,31 @@ class CMakeBuild(cmdclass.get("build_ext", build_ext)):
 cmdclass["build_ext"] = CMakeBuild
 
 
+def _get_version() -> str:
+    version_str: str = versioneer.get_version()
+
+    if os.environ.get("AMULET_FREEZE_COMPILER", None):
+        # Add the compiler version to the library version so that pip sees it as a distinct version.
+        compiler_version_str = ".".join(
+            amulet_compiler_version.__version__.split(".")[3:]
+        )
+        if compiler_version_str:
+            version = Version(version_str)
+            if version.epoch != 0 or version.is_devrelease or version.is_postrelease:
+                raise RuntimeError(f"Unsupported version format. {version_str}")
+            major, minor, patch, fix, *_ = version.release + (0, 0, 0, 0)
+            pre = "".join(map(str, version.pre)) if version.is_prerelease else ""
+            local = f"+{version.local}" if version.local else ""
+            version_str = (
+                f"{major}.{minor}.{patch}.{fix}.{compiler_version_str}{pre}{local}"
+            )
+
+    return version_str
+
+
 setup(
-    version=versioneer.get_version(),
+    version=_get_version(),
     cmdclass=cmdclass,
     ext_modules=[Extension("amulet.core._amulet_core", [])],
     install_requires=dependencies,
-    **setup_args,
 )

{amulet_core-2.0a9 → amulet_core-2.0.1a0}/src/amulet/core/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-05-15T16:15:17+0100",
+ "date": "2025-05-28T10:06:43+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "9046da0e208a70cf6d95b1d9661cc2e03a853825",
- "version": "2.0a9"
+ "full-revisionid": "25debe9d8c82b3c964e68035a723bed4a6f2e2e4",
+ "version": "2.0.1a0"
 }
 '''  # END VERSION_JSON
 

{amulet_core-2.0a9 → amulet_core-2.0.1a0/src/amulet_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amulet-core
-Version: 2.0a9
+Version: 2.0.1a0
 Summary: A Python library for reading/writing Minecraft's various save formats.
 Author: James Clare, Ben Gothard
 Project-URL: Homepage, https://www.amuletmc.com
@@ -12,10 +12,9 @@ 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-version==1.3.0
-Requires-Dist: amulet_pybind11_extensions~=1.0
-Requires-Dist: amulet_io~=1.0
-Requires-Dist: amulet_nbt==4.0a20
+Requires-Dist: amulet-compiler-version==3.0.0
+Requires-Dist: amulet-io~=1.0
+Requires-Dist: amulet-nbt~=4.0.0.0a24
 Provides-Extra: docs
 Requires-Dist: Sphinx>=1.7.4; extra == "docs"
 Requires-Dist: sphinx-autodoc-typehints>=1.3.0; extra == "docs"

{amulet_core-2.0a9 → amulet_core-2.0.1a0}/src/amulet_core.egg-info/requires.txt

@@ -1,9 +1,8 @@
 amulet-compiler-target==1.0
 numpy~=2.0
-amulet-compiler-version==1.3.0
-amulet_pybind11_extensions~=1.0
-amulet_io~=1.0
-amulet_nbt==4.0a20
+amulet-compiler-version==3.0.0
+amulet-io~=1.0
+amulet-nbt~=4.0.0.0a24
 
 [dev]
 setuptools>=42

amulet_core-2.0a9/requirements.py

@@ -1,46 +0,0 @@
-from typing import Union, Mapping
-import os
-
-AMULET_COMPILER_VERSION_REQUIREMENT = "==1.3.0"
-# AMULET_NBT_REQUIREMENT = "~=4.0"
-AMULET_NBT_REQUIREMENT = "==4.0a20"
-AMULET_PYBIND11_EXTENSIONS_REQUIREMENT = "~=1.0"
-AMULET_IO_REQUIREMENT = "~=1.0"
-
-_compile_dependencies: dict[str, str] = {
-    "wheel": "",
-    "pybind11": "==2.13.6",
-    "amulet_pybind11_extensions": AMULET_PYBIND11_EXTENSIONS_REQUIREMENT,
-    "amulet_nbt": AMULET_NBT_REQUIREMENT,
-    "amulet_io": AMULET_IO_REQUIREMENT,
-}
-
-fixed_runtime_dependencies_data: dict[str, str] = {
-    "amulet-compiler-target": "==1.0",
-    "numpy": "~=2.0",
-}
-
-
-def get_compile_dependencies_data(
-    config_settings: Union[Mapping[str, Union[str, list[str], None]], None] = None,
-) -> dict[str, str]:
-    reqs = _compile_dependencies.copy()
-    if (
-        config_settings and config_settings.get("AMULET_FREEZE_COMPILER")
-    ) or os.environ.get("AMULET_FREEZE_COMPILER", None):
-        reqs["amulet-compiler-version"] = (
-            "@git+https://github.com/Amulet-Team/Amulet-Compiler-Version.git@1.0"
-        )
-    return reqs
-
-
-def get_compile_dependencies(
-    config_settings: Union[Mapping[str, Union[str, list[str], None]], None] = None,
-) -> list:
-    return [
-        f"{k}{v}" for k, v in get_compile_dependencies_data(config_settings).items()
-    ]
-
-
-def get_fixed_runtime_dependencies() -> list[str]:
-    return [f"{k}{v}" for k, v in fixed_runtime_dependencies_data.items()]