amulet-core 2.0.1a3__tar.gz → 2.0.2a1__tar.gz

{amulet_core-2.0.1a3 → amulet_core-2.0.2a1}/CMakeLists.txt

@@ -21,32 +21,6 @@ if (MSVC)
     add_definitions("/MP")
 endif()
 
-include(FetchContent)
-
-# Add zlib
-set(ZLIB_BUILD_EXAMPLES OFF)
-FetchContent_Declare(
-  zlib
-  GIT_REPOSITORY https://github.com/madler/zlib.git
-  GIT_TAG        51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf
-)
-FetchContent_MakeAvailable(zlib)
-set(ZLIB_ROOT ${zlib_SOURCE_DIR})
-set(ZLIB_USE_STATIC_LIBS ON)
-set(ZLIB_LIBRARY ${INSTALL_LIB_DIR})
-find_package(ZLIB REQUIRED)
-target_compile_definitions(zlibstatic PUBLIC ZLIB_CONST)
-
-# Add lz4
-FetchContent_Declare(
-  lz4
-  GIT_REPOSITORY https://github.com/lz4/lz4.git
-  GIT_TAG        ebb370ca83af193212df4dcbadcc5d87bc0de2f0
-)
-FetchContent_MakeAvailable(lz4)
-set(LZ4_BUILD_CLI OFF)
-add_subdirectory(${lz4_SOURCE_DIR}/build/cmake)
-
 # Add pybind11
 find_package(pybind11 CONFIG REQUIRED)
 
@@ -66,8 +40,6 @@ list(REMOVE_ITEM HEADERS ${EXTENSION_HEADERS})
 
 # Add implementation
 add_library(amulet_core SHARED)
-target_link_libraries( amulet_core PRIVATE zlibstatic )
-target_link_libraries( amulet_core PRIVATE lz4_static )
 target_link_libraries( amulet_core PRIVATE amulet_io )
 target_link_libraries( amulet_core PRIVATE amulet_nbt )
 target_compile_definitions(amulet_core PRIVATE ExportAmuletCore)

{amulet_core-2.0.1a3/src/amulet_core.egg-info → amulet_core-2.0.2a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amulet-core
-Version: 2.0.1a3
+Version: 2.0.2a1
 Summary: A Python library for reading/writing Minecraft's various save formats.
 Author: James Clare, Ben Gothard
 Project-URL: Homepage, https://www.amuletmc.com
@@ -14,7 +14,7 @@ Requires-Dist: amulet-compiler-target==1.0
 Requires-Dist: numpy~=2.0
 Requires-Dist: amulet-compiler-version==3.0.0
 Requires-Dist: amulet-io~=1.0
-Requires-Dist: amulet-nbt~=4.0.1.0a2
+Requires-Dist: amulet-nbt~=5.0.0.0a1
 Provides-Extra: docs
 Requires-Dist: Sphinx>=1.7.4; extra == "docs"
 Requires-Dist: sphinx-autodoc-typehints>=1.3.0; extra == "docs"
@@ -24,7 +24,7 @@ Requires-Dist: setuptools>=42; extra == "dev"
 Requires-Dist: versioneer; extra == "dev"
 Requires-Dist: packaging; extra == "dev"
 Requires-Dist: wheel; extra == "dev"
-Requires-Dist: pybind11[global]==2.13.6; 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.1a3 → amulet_core-2.0.2a1}/pyproject.toml

@@ -33,7 +33,7 @@ dev = [
     "versioneer",
     "packaging",
     "wheel",
-    "pybind11[global]==2.13.6",
+    "pybind11==2.13.6",
     "amulet_pybind11_extensions~=1.0",
     "pybind11_stubgen>=2.5.4",
     "black>=22.3",

{amulet_core-2.0.1a3 → amulet_core-2.0.2a1}/requirements.py

@@ -9,11 +9,22 @@ 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.1.0a2"
+# AMULET_NBT_REQUIREMENT = "~=5.0"
+AMULET_NBT_REQUIREMENT = "~=5.0.0.0a1"
 NUMPY_REQUIREMENT = "~=2.0"
 
 
+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_NBT_REQUIREMENT", None):
+    AMULET_NBT_REQUIREMENT = (
+        f"{AMULET_NBT_REQUIREMENT},{os.environ['AMULET_NBT_REQUIREMENT']}"
+    )
+
+
 def get_specifier_set(version_str: str) -> str:
     """
     version_str: The PEP 440 version number of the library.

{amulet_core-2.0.1a3 → amulet_core-2.0.2a1}/src/amulet/core/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-05-29T11:10:53+0100",
+ "date": "2025-06-09T17:02:54+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "42817cff563cf9b72f468fa1dcb677eb84944621",
- "version": "2.0.1a3"
+ "full-revisionid": "5e21128f2822d09e8438f2de676f713055f70af2",
+ "version": "2.0.2a1"
 }
 '''  # END VERSION_JSON
 

{amulet_core-2.0.1a3 → amulet_core-2.0.2a1}/src/amulet/core/amulet_coreConfig.cmake

@@ -8,11 +8,14 @@ if (NOT TARGET amulet_core)
     find_library(amulet_core_LIBRARY NAMES amulet_core PATHS "${CMAKE_CURRENT_LIST_DIR}")
     message(STATUS "amulet_core_LIBRARY: ${amulet_core_LIBRARY}")
 
-    add_library(amulet_core SHARED IMPORTED)
-    set_target_properties(amulet_core PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES "${amulet_core_INCLUDE_DIR}"
-        INTERFACE_LINK_LIBRARIES amulet_io
-        INTERFACE_LINK_LIBRARIES amulet_nbt
+    add_library(amulet_core_bin SHARED IMPORTED)
+    set_target_properties(amulet_core_bin PROPERTIES
         IMPORTED_IMPLIB "${amulet_core_LIBRARY}"
     )
+
+    add_library(amulet_core INTERFACE)
+    target_link_libraries(amulet_core INTERFACE amulet_io)
+    target_link_libraries(amulet_core INTERFACE amulet_nbt)
+    target_link_libraries(amulet_core INTERFACE amulet_core_bin)
+    target_include_directories(amulet_core INTERFACE ${amulet_core_INCLUDE_DIR})
 endif()

{amulet_core-2.0.1a3 → amulet_core-2.0.2a1/src/amulet_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amulet-core
-Version: 2.0.1a3
+Version: 2.0.2a1
 Summary: A Python library for reading/writing Minecraft's various save formats.
 Author: James Clare, Ben Gothard
 Project-URL: Homepage, https://www.amuletmc.com
@@ -14,7 +14,7 @@ Requires-Dist: amulet-compiler-target==1.0
 Requires-Dist: numpy~=2.0
 Requires-Dist: amulet-compiler-version==3.0.0
 Requires-Dist: amulet-io~=1.0
-Requires-Dist: amulet-nbt~=4.0.1.0a2
+Requires-Dist: amulet-nbt~=5.0.0.0a1
 Provides-Extra: docs
 Requires-Dist: Sphinx>=1.7.4; extra == "docs"
 Requires-Dist: sphinx-autodoc-typehints>=1.3.0; extra == "docs"
@@ -24,7 +24,7 @@ Requires-Dist: setuptools>=42; extra == "dev"
 Requires-Dist: versioneer; extra == "dev"
 Requires-Dist: packaging; extra == "dev"
 Requires-Dist: wheel; extra == "dev"
-Requires-Dist: pybind11[global]==2.13.6; 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.1a3 → amulet_core-2.0.2a1}/src/amulet_core.egg-info/requires.txt

@@ -2,14 +2,14 @@ amulet-compiler-target==1.0
 numpy~=2.0
 amulet-compiler-version==3.0.0
 amulet-io~=1.0
-amulet-nbt~=4.0.1.0a2
+amulet-nbt~=5.0.0.0a1
 
 [dev]
 setuptools>=42
 versioneer
 packaging
 wheel
-pybind11[global]==2.13.6
+pybind11==2.13.6
 amulet_pybind11_extensions~=1.0
 pybind11_stubgen>=2.5.4
 black>=22.3