amulet-core 1.9.24__tar.gz → 2.0a3__tar.gz

amulet_core-2.0a3/MANIFEST.in

@@ -0,0 +1 @@
+recursive-include src *.pyi py.typed *.py *.png *.cpp *.hpp

{amulet_core-1.9.24 → amulet_core-2.0a3}/PKG-INFO

@@ -1,98 +1,103 @@
-Metadata-Version: 2.1
-Name: amulet-core
-Version: 1.9.24
-Summary: A Python library for reading/writing Minecraft's various save formats.
-Home-page: https://www.amuletmc.com
-Author: James Clare, Ben Gothard et al.
-Author-email: amuleteditor@gmail.com
-Platform: any
-Classifier: Programming Language :: Python :: 3
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.9
-Description-Content-Type: text/markdown
-Requires-Dist: numpy~=1.17
-Requires-Dist: amulet-nbt~=2.0
-Requires-Dist: pymctranslate~=1.2
-Requires-Dist: portalocker~=2.4
-Requires-Dist: amulet-leveldb~=1.0b0
-Requires-Dist: platformdirs~=3.1
-Requires-Dist: lz4~=4.3
-Provides-Extra: docs
-Requires-Dist: Sphinx>=1.7.4; extra == "docs"
-Requires-Dist: sphinx-autodoc-typehints>=1.3.0; extra == "docs"
-Requires-Dist: sphinx_rtd_theme>=0.3.1; extra == "docs"
-Provides-Extra: dev
-Requires-Dist: black>=22.3; extra == "dev"
-Requires-Dist: pre_commit>=1.11.1; extra == "dev"
-
-# Amulet Core
-
-![Build](../../workflows/Build/badge.svg)
-![Unittests](../../workflows/Unittests/badge.svg?event=push)
-![Stylecheck](../../workflows/Stylecheck/badge.svg?event=push)
-[![Documentation](https://readthedocs.org/projects/amulet-core/badge)](https://amulet-core.readthedocs.io)
-
-A Python 3 library to read and write data from Minecraft's various save formats.
-
-This library provides the main world editing functionality for Amulet Map Editor
-
-#### If you are looking for the actual editor it can be found at [Amulet Map Editor](https://github.com/Amulet-Team/Amulet-Map-Editor)
-
-
-## Documentation
-
-Our online documentation can be found here: https://amulet-core.readthedocs.io
-
-## Installing
-1) Install Python 3.7
-2) We recommend setting up a [python virtual environment](https://docs.python.org/3/tutorial/venv.html) so you don't run into issues with dependency conflicts.
-3) run `pip install amulet-core` to install the library and all its dependencies.
-
-## Dependencies
-
-This library uses a number of other libraries. These will be automatically installed when running the command above.
-- Numpy
-- [Amulet_NBT](https://github.com/Amulet-Team/Amulet-NBT)
-- [PyMCTranslate](https://github.com/gentlegiantJGC/PyMCTranslate)
-
-## Contributing
-
-### For Development
-Download the code to your computer, install python and run the following command from the root directory.
-run `pip install -e .[dev]`
-This command will install the library in development mode with the libraries required for development.
-- [Black](https://github.com/ambv/black) (Required for formatting)
-  - Must be run before pushing a Pull Request
-
-For information about contributing to this project, please see the contribution section [below](#contributing)
-
-### Code Formatting
-For code formatting, we use the formatting utility [black](https://github.com/psf/black). 
-To run it, run the following command from your favorite terminal after installing: `black amulet tests`
-
-In order for your pull request to be accepted, this command must be run to format every file.
-
-### Building the Documentation
-To build the documentation locally, run the following command: `make html` and then navigate to the
-generated directory `docs_build/html` in your favorite web browser
-
-### Branch Naming
-Branches should be created when a certain bug or feature may take multiple attempts to fix. Naming
-them should follow the following convention (even for forked repositories when a pull request is being made):
-
-* For features, use: `impl-<feature name>`
-* For bug fixes, use: `bug-<bug tracker ID>`
-* For improvements/rewrites, use: `improv-<feature name>`
-* For prototyping, use: `proto-<feature name>`
-
-### Pull Requests
-We ask that submitted Pull Requests give moderately detailed notes about the changes and explain 
-any changes that were made to the program outside of those directly related to the feature/bug-fix.
-Make sure to run all tests and formatting otherwise we cannot accept your pull request.
-
-_Note: We will also re-run all tests before reviewing, this is to mitigate additional changes/commits
-needed to pass all tests._
-
-Once a Pull Request is submitted, we will mark the request for review, once that is done, we will
-review the changes and provide any notes/things to change. Once all additional changes have been made,
-we will merge the request.
+Metadata-Version: 2.1
+Name: amulet-core
+Version: 2.0a3
+Summary: A Python library for reading/writing Minecraft's various save formats.
+Home-page: https://www.amuletmc.com
+Author: James Clare, Ben Gothard et al.
+Author-email: amuleteditor@gmail.com
+Platform: any
+Classifier: Programming Language :: Python :: 3
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.11
+Description-Content-Type: text/markdown
+Requires-Dist: numpy~=1.21
+Requires-Dist: amulet-nbt~=4.0a2
+Requires-Dist: portalocker~=2.4
+Requires-Dist: amulet-leveldb~=1.0b0
+Requires-Dist: platformdirs~=3.1
+Requires-Dist: amulet-runtime-final~=1.1
+Requires-Dist: pillow~=10.0
+Requires-Dist: lz4~=4.3
+Provides-Extra: docs
+Requires-Dist: Sphinx>=1.7.4; extra == "docs"
+Requires-Dist: sphinx-autodoc-typehints>=1.3.0; extra == "docs"
+Requires-Dist: sphinx_rtd_theme>=0.3.1; extra == "docs"
+Provides-Extra: dev
+Requires-Dist: black>=22.3; extra == "dev"
+Requires-Dist: pre_commit>=1.11.1; extra == "dev"
+Requires-Dist: mypy; extra == "dev"
+Requires-Dist: types-pyinstaller; extra == "dev"
+Requires-Dist: isort; extra == "dev"
+Requires-Dist: autoflake; extra == "dev"
+
+# Amulet Core
+
+![Build](../../workflows/Build/badge.svg)
+![Unittests](../../workflows/Unittests/badge.svg?event=push)
+![Stylecheck](../../workflows/Stylecheck/badge.svg?event=push)
+[![Documentation](https://readthedocs.org/projects/amulet-core/badge)](https://amulet-core.readthedocs.io)
+
+A Python 3 library to read and write data from Minecraft's various save formats.
+
+This library provides the main world editing functionality for Amulet Map Editor
+
+#### If you are looking for the actual editor it can be found at [Amulet Map Editor](https://github.com/Amulet-Team/Amulet-Map-Editor)
+
+
+## Documentation
+
+Our online documentation can be found here: https://amulet-core.readthedocs.io
+
+## Installing
+1) Install Python 3.7
+2) We recommend setting up a [python virtual environment](https://docs.python.org/3/tutorial/venv.html) so you don't run into issues with dependency conflicts.
+3) run `pip install amulet-core` to install the library and all its dependencies.
+
+## Dependencies
+
+This library uses a number of other libraries. These will be automatically installed when running the command above.
+- Numpy
+- [Amulet_NBT](https://github.com/Amulet-Team/Amulet-NBT)
+- [PyMCTranslate](https://github.com/gentlegiantJGC/PyMCTranslate)
+
+## Contributing
+
+### For Development
+Download the code to your computer, install python and run the following command from the root directory.
+run `pip install -e .[dev]`
+This command will install the library in development mode with the libraries required for development.
+- [Black](https://github.com/ambv/black) (Required for formatting)
+  - Must be run before pushing a Pull Request
+
+For information about contributing to this project, please see the contribution section [below](#contributing)
+
+### Code Formatting
+For code formatting, we use the formatting utility [black](https://github.com/psf/black). 
+To run it, run the following command from your favorite terminal after installing: `black amulet tests`
+
+In order for your pull request to be accepted, this command must be run to format every file.
+
+### Building the Documentation
+To build the documentation locally, run the following command: `make html` and then navigate to the
+generated directory `docs_build/html` in your favorite web browser
+
+### Branch Naming
+Branches should be created when a certain bug or feature may take multiple attempts to fix. Naming
+them should follow the following convention (even for forked repositories when a pull request is being made):
+
+* For features, use: `impl-<feature name>`
+* For bug fixes, use: `bug-<bug tracker ID>`
+* For improvements/rewrites, use: `improv-<feature name>`
+* For prototyping, use: `proto-<feature name>`
+
+### Pull Requests
+We ask that submitted Pull Requests give moderately detailed notes about the changes and explain 
+any changes that were made to the program outside of those directly related to the feature/bug-fix.
+Make sure to run all tests and formatting otherwise we cannot accept your pull request.
+
+_Note: We will also re-run all tests before reviewing, this is to mitigate additional changes/commits
+needed to pass all tests._
+
+Once a Pull Request is submitted, we will mark the request for review, once that is done, we will
+review the changes and provide any notes/things to change. Once all additional changes have been made,
+we will merge the request.

{amulet_core-1.9.24 → amulet_core-2.0a3}/README.md

@@ -1,71 +1,71 @@
-# Amulet Core
-
-![Build](../../workflows/Build/badge.svg)
-![Unittests](../../workflows/Unittests/badge.svg?event=push)
-![Stylecheck](../../workflows/Stylecheck/badge.svg?event=push)
-[![Documentation](https://readthedocs.org/projects/amulet-core/badge)](https://amulet-core.readthedocs.io)
-
-A Python 3 library to read and write data from Minecraft's various save formats.
-
-This library provides the main world editing functionality for Amulet Map Editor
-
-#### If you are looking for the actual editor it can be found at [Amulet Map Editor](https://github.com/Amulet-Team/Amulet-Map-Editor)
-
-
-## Documentation
-
-Our online documentation can be found here: https://amulet-core.readthedocs.io
-
-## Installing
-1) Install Python 3.7
-2) We recommend setting up a [python virtual environment](https://docs.python.org/3/tutorial/venv.html) so you don't run into issues with dependency conflicts.
-3) run `pip install amulet-core` to install the library and all its dependencies.
-
-## Dependencies
-
-This library uses a number of other libraries. These will be automatically installed when running the command above.
-- Numpy
-- [Amulet_NBT](https://github.com/Amulet-Team/Amulet-NBT)
-- [PyMCTranslate](https://github.com/gentlegiantJGC/PyMCTranslate)
-
-## Contributing
-
-### For Development
-Download the code to your computer, install python and run the following command from the root directory.
-run `pip install -e .[dev]`
-This command will install the library in development mode with the libraries required for development.
-- [Black](https://github.com/ambv/black) (Required for formatting)
-  - Must be run before pushing a Pull Request
-
-For information about contributing to this project, please see the contribution section [below](#contributing)
-
-### Code Formatting
-For code formatting, we use the formatting utility [black](https://github.com/psf/black). 
-To run it, run the following command from your favorite terminal after installing: `black amulet tests`
-
-In order for your pull request to be accepted, this command must be run to format every file.
-
-### Building the Documentation
-To build the documentation locally, run the following command: `make html` and then navigate to the
-generated directory `docs_build/html` in your favorite web browser
-
-### Branch Naming
-Branches should be created when a certain bug or feature may take multiple attempts to fix. Naming
-them should follow the following convention (even for forked repositories when a pull request is being made):
-
-* For features, use: `impl-<feature name>`
-* For bug fixes, use: `bug-<bug tracker ID>`
-* For improvements/rewrites, use: `improv-<feature name>`
-* For prototyping, use: `proto-<feature name>`
-
-### Pull Requests
-We ask that submitted Pull Requests give moderately detailed notes about the changes and explain 
-any changes that were made to the program outside of those directly related to the feature/bug-fix.
-Make sure to run all tests and formatting otherwise we cannot accept your pull request.
-
-_Note: We will also re-run all tests before reviewing, this is to mitigate additional changes/commits
-needed to pass all tests._
-
-Once a Pull Request is submitted, we will mark the request for review, once that is done, we will
-review the changes and provide any notes/things to change. Once all additional changes have been made,
-we will merge the request.
+# Amulet Core
+
+![Build](../../workflows/Build/badge.svg)
+![Unittests](../../workflows/Unittests/badge.svg?event=push)
+![Stylecheck](../../workflows/Stylecheck/badge.svg?event=push)
+[![Documentation](https://readthedocs.org/projects/amulet-core/badge)](https://amulet-core.readthedocs.io)
+
+A Python 3 library to read and write data from Minecraft's various save formats.
+
+This library provides the main world editing functionality for Amulet Map Editor
+
+#### If you are looking for the actual editor it can be found at [Amulet Map Editor](https://github.com/Amulet-Team/Amulet-Map-Editor)
+
+
+## Documentation
+
+Our online documentation can be found here: https://amulet-core.readthedocs.io
+
+## Installing
+1) Install Python 3.7
+2) We recommend setting up a [python virtual environment](https://docs.python.org/3/tutorial/venv.html) so you don't run into issues with dependency conflicts.
+3) run `pip install amulet-core` to install the library and all its dependencies.
+
+## Dependencies
+
+This library uses a number of other libraries. These will be automatically installed when running the command above.
+- Numpy
+- [Amulet_NBT](https://github.com/Amulet-Team/Amulet-NBT)
+- [PyMCTranslate](https://github.com/gentlegiantJGC/PyMCTranslate)
+
+## Contributing
+
+### For Development
+Download the code to your computer, install python and run the following command from the root directory.
+run `pip install -e .[dev]`
+This command will install the library in development mode with the libraries required for development.
+- [Black](https://github.com/ambv/black) (Required for formatting)
+  - Must be run before pushing a Pull Request
+
+For information about contributing to this project, please see the contribution section [below](#contributing)
+
+### Code Formatting
+For code formatting, we use the formatting utility [black](https://github.com/psf/black). 
+To run it, run the following command from your favorite terminal after installing: `black amulet tests`
+
+In order for your pull request to be accepted, this command must be run to format every file.
+
+### Building the Documentation
+To build the documentation locally, run the following command: `make html` and then navigate to the
+generated directory `docs_build/html` in your favorite web browser
+
+### Branch Naming
+Branches should be created when a certain bug or feature may take multiple attempts to fix. Naming
+them should follow the following convention (even for forked repositories when a pull request is being made):
+
+* For features, use: `impl-<feature name>`
+* For bug fixes, use: `bug-<bug tracker ID>`
+* For improvements/rewrites, use: `improv-<feature name>`
+* For prototyping, use: `proto-<feature name>`
+
+### Pull Requests
+We ask that submitted Pull Requests give moderately detailed notes about the changes and explain 
+any changes that were made to the program outside of those directly related to the feature/bug-fix.
+Make sure to run all tests and formatting otherwise we cannot accept your pull request.
+
+_Note: We will also re-run all tests before reviewing, this is to mitigate additional changes/commits
+needed to pass all tests._
+
+Once a Pull Request is submitted, we will mark the request for review, once that is done, we will
+review the changes and provide any notes/things to change. Once all additional changes have been made,
+we will merge the request.

{amulet_core-1.9.24 → amulet_core-2.0a3}/pyproject.toml

@@ -1,9 +1,9 @@
-[build-system]
-requires = [
-    "setuptools >= 42",
-    "wheel",
-    "cython >= 3.0.0a9",
-    "versioneer-518",
-    "numpy ~= 1.17"
-]
-build-backend = "setuptools.build_meta"
+[build-system]
+requires = [
+    "setuptools >= 42",
+    "wheel",
+    "versioneer",
+    "pybind11 ~= 2.12",
+    "amulet_nbt ~= 4.0a2"
+]
+build-backend = "setuptools.build_meta"

{amulet_core-1.9.24 → amulet_core-2.0a3}/setup.cfg

@@ -1,54 +1,75 @@
-[metadata]
-name = amulet-core
-url = https://www.amuletmc.com
-author = James Clare, Ben Gothard et al.
-author_email = amuleteditor@gmail.com
-classifiers = 
-	Programming Language :: Python :: 3
-	Operating System :: OS Independent
-description = A Python library for reading/writing Minecraft's various save formats.
-long_description = file: README.md
-long_description_content_type = text/markdown
-platforms = any
-
-[options]
-include_package_data = True
-python_requires = >=3.9
-install_requires = 
-	numpy~=1.17
-	amulet-nbt~=2.0
-	pymctranslate~=1.2
-	portalocker~=2.4
-	amulet-leveldb~=1.0b0
-	platformdirs~=3.1
-	lz4~=4.3
-packages = find:
-
-[options.packages.find]
-include = amulet*
-
-[options.extras_require]
-docs = 
-	Sphinx>=1.7.4
-	sphinx-autodoc-typehints>=1.3.0
-	sphinx_rtd_theme>=0.3.1
-dev = 
-	black>=22.3
-	pre_commit>=1.11.1
-
-[options.entry_points]
-pyinstaller40 = 
-	hook-dirs = amulet.__pyinstaller:get_hook_dirs
-
-[versioneer]
-VCS = git
-style = pep440
-versionfile_source = amulet/_version.py
-versionfile_build = amulet/_version.py
-tag_prefix = 
-parentdir_prefix = amulet-
-
-[egg_info]
-tag_build = 
-tag_date = 0
-
+[metadata]
+name = amulet-core
+url = https://www.amuletmc.com
+author = James Clare, Ben Gothard et al.
+author_email = amuleteditor@gmail.com
+classifiers = 
+	Programming Language :: Python :: 3
+	Operating System :: OS Independent
+description = A Python library for reading/writing Minecraft's various save formats.
+long_description = file: README.md
+long_description_content_type = text/markdown
+platforms = any
+
+[options]
+package_dir = 
+	=src
+packages = find_namespace:
+python_requires = >=3.11
+install_requires = 
+	numpy~=1.21
+	amulet-nbt~=4.0a2
+	portalocker~=2.4
+	amulet-leveldb~=1.0b0
+	platformdirs~=3.1
+	amulet-runtime-final~=1.1
+	pillow~=10.0
+	lz4~=4.3
+
+[options.packages.find]
+where = src
+
+[options.package_data]
+amulet = 
+	*.pyi
+	py.typed
+	*.png
+	*.pyd
+	*.so
+	*.dylib
+	*.hpp
+	*.cpp
+
+[options.exclude_package_data]
+amulet = 
+	*.py.cpp
+
+[options.extras_require]
+docs = 
+	Sphinx>=1.7.4
+	sphinx-autodoc-typehints>=1.3.0
+	sphinx_rtd_theme>=0.3.1
+dev = 
+	black>=22.3
+	pre_commit>=1.11.1
+	mypy
+	types-pyinstaller
+	isort
+	autoflake
+
+[options.entry_points]
+pyinstaller40 = 
+	hook-dirs = amulet.__pyinstaller:get_hook_dirs
+
+[versioneer]
+VCS = git
+style = pep440
+versionfile_source = src/amulet/_version.py
+versionfile_build = amulet/_version.py
+tag_prefix = 
+parentdir_prefix = amulet-
+
+[egg_info]
+tag_build = 
+tag_date = 0
+

amulet_core-2.0a3/setup.py

@@ -0,0 +1,55 @@
+from setuptools import setup, Extension
+import versioneer
+import sysconfig
+from distutils import ccompiler
+import sys
+import pybind11
+import glob
+import os
+import amulet_nbt
+
+if (sysconfig.get_config_var("CXX") or ccompiler.get_default_compiler()).split()[
+    0
+] == "msvc":
+    CompileArgs = ["/std:c++20"]
+else:
+    CompileArgs = ["-std=c++20"]
+
+if sys.platform == "darwin":
+    CompileArgs.append("-mmacosx-version-min=10.13")
+
+
+# TODO: Would it be better to compile a shared library and link against that?
+
+
+AmuletNBTLib = (
+    "amulet_nbt",
+    dict(
+        sources=glob.glob(
+            os.path.join(glob.escape(amulet_nbt.get_source()), "**", "*.cpp"),
+            recursive=True,
+        ),
+        include_dirs=[amulet_nbt.get_include()],
+        cflags=CompileArgs,
+    ),
+)
+
+setup(
+    version=versioneer.get_version(),
+    cmdclass=versioneer.get_cmdclass(),
+    libraries=[AmuletNBTLib],
+    ext_modules=[
+        Extension(
+            name="amulet.__init__",
+            sources=glob.glob("src/**/*.cpp", recursive=True),
+            include_dirs=[
+                pybind11.get_include(),
+                amulet_nbt.get_include(),
+                "src",
+            ],
+            libraries=["amulet_nbt"],
+            define_macros=[("PYBIND11_DETAILED_ERROR_MESSAGES", None)],
+            extra_compile_args=CompileArgs,
+        ),
+    ],
+)

amulet_core-2.0a3/src/amulet/__init__.py.cpp

@@ -0,0 +1,39 @@
+#include <pybind11/pybind11.h>
+namespace py = pybind11;
+
+void init_collections(py::module);
+void init_utils(py::module);
+void init_version(py::module);
+void init_block(py::module);
+void init_block_entity(py::module);
+void init_biome(py::module);
+void init_palette(py::module);
+void init_chunk(py::module);
+void init_chunk_components(py::module);
+void init_level(py::module);
+
+static bool init_run = false;
+
+void init_amulet(py::module m){
+    if (init_run){ return; }
+    init_run = true;
+
+    py::module::import("amulet_nbt");
+
+    py::module::import("amulet._init").attr("init")(m);
+
+    // Submodules
+    init_collections(m);
+    init_utils(m);
+    init_version(m);
+    init_block(m);
+    init_block_entity(m);
+    init_biome(m);
+    init_palette(m);
+    init_chunk(m);
+    init_chunk_components(m);
+    init_level(m);
+}
+
+PYBIND11_MODULE(__init__, m) { init_amulet(m); }
+PYBIND11_MODULE(amulet, m) { init_amulet(m); }

amulet_core-2.0a3/src/amulet/__init__.pyi

@@ -0,0 +1,30 @@
+from __future__ import annotations
+
+from . import (
+    biome,
+    block,
+    block_entity,
+    chunk,
+    chunk_components,
+    collections,
+    level,
+    palette,
+    utils,
+    version,
+)
+
+__all__ = [
+    "IMG_DIRECTORY",
+    "biome",
+    "block",
+    "block_entity",
+    "chunk",
+    "chunk_components",
+    "collections",
+    "level",
+    "palette",
+    "utils",
+    "version",
+]
+IMG_DIRECTORY: str
+__version__: str

amulet_core-2.0a3/src/amulet/__pyinstaller/__init__.py

@@ -0,0 +1,2 @@
+def get_hook_dirs() -> list[str]:
+    return __path__

{amulet_core-1.9.24 → amulet_core-2.0a3/src}/amulet/__pyinstaller/hook-amulet.py

@@ -1,4 +1,4 @@
-from PyInstaller.utils.hooks import collect_data_files, collect_submodules
-
-hiddenimports = collect_submodules("amulet")
-datas = collect_data_files("amulet")
+from PyInstaller.utils.hooks import collect_data_files, collect_submodules
+
+hiddenimports = collect_submodules("amulet")
+datas = collect_data_files("amulet")