Merge pull request #57 from Amulet-Team/impl-cpp2

C++ data
Amulet-Team · Feb 20, 2024 · 7ffed3c · 7ffed3c
2 parents 68eb5ef + ec2085b
commit 7ffed3c
Show file tree

Hide file tree

Showing 215 changed files with 14,166 additions and 6,875 deletions.
diff --git a/.github/workflows/python-build.yml b/.github/workflows/python-build.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ['3.9', '3.10', '3.11']
+        python-version: ['3.11', '3.12']
         os: [macos-latest, windows-latest]
     steps:
     - uses: actions/checkout@v4

diff --git a/.github/workflows/python-stylecheck.yml b/.github/workflows/python-stylecheck.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.9']
+        python-version: ['3.12']
 
     steps:
     - uses: actions/checkout@v4

diff --git a/.github/workflows/python-unittests.yml b/.github/workflows/python-unittests.yml
@@ -16,7 +16,7 @@ jobs:
     continue-on-error: true
     strategy:
       matrix:
-        python-version: ['3.9', '3.10', '3.11']
+        python-version: ['3.11', '3.12']
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
     - uses: actions/checkout@v4

diff --git a/.gitignore b/.gitignore
@@ -111,8 +111,17 @@ venv*
 .mypy_cache/
 
 # Cython Files
-src/amulet_nbt/*.c
-src/amulet_nbt/*.cpp
 *.html
 
-temp
+temp
+
+# visual studio files
+*.vs/
+*.vcxproj*
+*.sln
+
+# C++ files
+*.c
+!**/_cpp/**/*.c
+*.cpp
+!**/_cpp/**/*.cpp
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -3,7 +3,7 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: 3.9
+    python: 3.12
 
 python:
   install:

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1 +1 @@
-recursive-include src *.py *.pyi *.pyx *.pxd
+recursive-include src *.pyi py.typed *.py *.pyx *.pxd *.cpp *.hpp
diff --git a/README.md b/README.md
@@ -4,15 +4,15 @@
 ![Unittests](../../workflows/Unittests/badge.svg?event=push)
 ![Stylecheck](../../workflows/Stylecheck/badge.svg?event=push)
 
-Amulet-NBT is a Python 3 library, written in Cython, for reading and writing both binary NBT and SNBT.
+Amulet-NBT is a Python 3 library, written in Cython and C++, for reading and writing both binary NBT and SNBT.
 
 SNBT (or Stringified-NBT) is the JSON like format used in Java commands.
 
 ## Installing
 
 Run this command to install from PyPi.
 
-`pip install amulet-nbt~=2.0`
+`pip install amulet-nbt~=3.0`
 
 ## Documentation
 
@@ -25,7 +25,7 @@ To develop the library you will need to download the source and run this command
 `pip install -e .[dev]`
 
 This will build the library in-place and expose it to python.
-Since this code is compiled you will need to run it again each time you change cython code.
+Since this code is compiled you will need to run it again each time you change cython or C++ code.
 
 ## Links
 - Documentation - https://amulet-nbt.readthedocs.io

diff --git a/docs_source/api_reference/ByteArrayTag.rst b/docs_source/api_reference/ByteArrayTag.rst
diff --git a/docs_source/api_reference/ByteTag.rst b/docs_source/api_reference/ByteTag.rst
diff --git a/docs_source/api_reference/CompoundTag.rst b/docs_source/api_reference/CompoundTag.rst
diff --git a/docs_source/api_reference/DoubleTag.rst b/docs_source/api_reference/DoubleTag.rst
diff --git a/docs_source/api_reference/FloatTag.rst b/docs_source/api_reference/FloatTag.rst
diff --git a/docs_source/api_reference/IntArrayTag.rst b/docs_source/api_reference/IntArrayTag.rst
diff --git a/docs_source/api_reference/IntTag.rst b/docs_source/api_reference/IntTag.rst
diff --git a/docs_source/api_reference/ListTag.rst b/docs_source/api_reference/ListTag.rst
diff --git a/docs_source/api_reference/LongArrayTag.rst b/docs_source/api_reference/LongArrayTag.rst
diff --git a/docs_source/api_reference/LongTag.rst b/docs_source/api_reference/LongTag.rst
diff --git a/docs_source/api_reference/NamedTag.rst b/docs_source/api_reference/NamedTag.rst
diff --git a/docs_source/api_reference/ShortTag.rst b/docs_source/api_reference/ShortTag.rst
diff --git a/docs_source/api_reference/StringTag.rst b/docs_source/api_reference/StringTag.rst
diff --git a/docs_source/api_reference/abc.rst b/docs_source/api_reference/abc.rst
diff --git a/docs_source/api_reference/errors.rst b/docs_source/api_reference/errors.rst
diff --git a/docs_source/api_reference/index.rst b/docs_source/api_reference/index.rst
diff --git a/docs_source/api_reference/load.rst b/docs_source/api_reference/load.rst
diff --git a/docs_source/api_reference/string_encoding.rst b/docs_source/api_reference/string_encoding.rst
diff --git a/docs_source/conf.py b/docs_source/conf.py
@@ -188,6 +188,15 @@
 def skip(app, what, name, obj, would_skip, options):
     if name == "__init__":
         return False
+    if name in {
+        "__pyx_vtable__",
+        "__reduce_cython__",
+        "__setstate_cython__",
+        "__new__",
+        "__reduce__",
+        "__setstate__",
+    }:
+        return True
     return would_skip