Merge pull request #15 from Amulet-Team/cpp

Replace cython with pybind11

.github/workflows/python-build.yml

@@ -13,14 +13,6 @@ jobs:
       fail-fast: false
       matrix:
         cfg:
-          - { os: windows-latest, architecture: x64, python-version: "3.8" }
-          - { os: windows-latest, architecture: x86, python-version: "3.8" }
-          - { os: macos-13, architecture: x64, python-version: "3.8" }
-          - { os: macos-latest, architecture: arm64, python-version: "3.8" }
-          - { os: windows-latest, architecture: x64, python-version: "3.9" }
-          - { os: windows-latest, architecture: x86, python-version: "3.9" }
-          - { os: macos-13, architecture: x64, python-version: "3.9" }
-          - { os: macos-latest, architecture: arm64, python-version: "3.9" }
           - { os: windows-latest, architecture: x64, python-version: "3.10" }
           - { os: windows-latest, architecture: x86, python-version: "3.10" }
           - { os: macos-13, architecture: x64, python-version: "3.10" }

.github/workflows/python-unittests.yml

@@ -18,16 +18,6 @@ jobs:
     strategy:
       matrix:
         cfg:
-          - { os: windows-latest, architecture: x64, python-version: "3.8" }
-          - { os: windows-latest, architecture: x86, python-version: "3.8" }
-          - { os: macos-13, architecture: x64, python-version: "3.8" }
-          - { os: macos-latest, architecture: arm64, python-version: "3.8" }
-          - { os: ubuntu-latest, architecture: x64, python-version: "3.8" }
-          - { os: windows-latest, architecture: x64, python-version: "3.9" }
-          - { os: windows-latest, architecture: x86, python-version: "3.9" }
-          - { os: macos-13, architecture: x64, python-version: "3.9" }
-          - { os: macos-latest, architecture: arm64, python-version: "3.9" }
-          - { os: ubuntu-latest, architecture: x64, python-version: "3.9" }
           - { os: windows-latest, architecture: x64, python-version: "3.10" }
           - { os: windows-latest, architecture: x86, python-version: "3.10" }
           - { os: macos-13, architecture: x64, python-version: "3.10" }

.gitignore

@@ -138,10 +138,12 @@ dmypy.json
 # pytype static type analyzer
 .pytype/
 
-# Cython debug symbols
-cython_debug/
-
 # PyCharm
 .idea/
 
-/src/leveldb/*.cpp
+# Visual Studio
+*.ilk
+*.exp
+*.lib
+*.pdb
+sln/

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "zlib"]
-	path = zlib
+	path = submodules/zlib
 	url = https://github.com/madler/zlib
 [submodule "leveldb-mcpe"]
-	path = leveldb-mcpe
+	path = submodules/leveldb-mcpe
 	url = https://github.com/Amulet-Team/leveldb-mcpe

MANIFEST.in

@@ -1,6 +1,4 @@
-recursive-include src/leveldb *.py *.pyi *.pyx *.pxd
+recursive-include src/leveldb *.py *.pyi *.hpp *.cpp
 recursive-include bin *.lib
 recursive-include zlib *.h
 recursive-include leveldb-mcpe *.h *.cc
-include leveldb_mcpe.pxd
-include versioneer.py

README.md

@@ -1,6 +1,6 @@
 # Amulet LevelDB
 
-A Cython wrapper for Mojang's modified LevelDB library.
+A pybind11 wrapper for Mojang's modified LevelDB library.
 
 
 ## Install
@@ -17,4 +17,4 @@ print(db.get(b"key"))
 # b"value"
 ```
 
-See the [source code](src/leveldb/_leveldb.pyx) for full documentation.
+See the [source code](src/leveldb/__init__leveldb.py.cpp) for full documentation.

mypy.ini

@@ -2,5 +2,5 @@
 disallow_untyped_defs = True
 check_untyped_defs = True
 warn_return_any = True
-python_version = 3.8
+python_version = 3.9
 mypy_path = $MYPY_CONFIG_FILE_DIR/src

pyproject.toml

@@ -2,7 +2,8 @@
 requires = [
     "setuptools >= 42",
     "wheel",
-    "cython >= 3.0.0a11",
-    "versioneer",
+    "pybind11 ~= 2.12",
+    "Amulet-pybind11-extensions @ git+https://github.com/Amulet-Team/Amulet-pybind11-extensions.git@6d272873c277f1aeda94740d1897ee3464803bce",
+    "versioneer"
 ]
 build-backend = "setuptools.build_meta"

setup.cfg

@@ -6,7 +6,7 @@ author_email = [email protected]
 classifiers=
     Programming Language :: Python :: 3
     Operating System :: OS Independent
-description = A Cython wrapper for Mojang's custom LevelDB.
+description = A pybind11 wrapper for Mojang's custom LevelDB.
 long_description = file: README.md
 long_description_content_type = text/markdown
 platforms = any
@@ -16,8 +16,7 @@ platforms = any
 packages = find_namespace:
 package_dir =
     = src
-zip_safe = False
-python_requires = ~=3.8
+python_requires = ~=3.10
 
 [options.packages.find]
 where = src
@@ -37,8 +36,10 @@ docs =
 dev =
     black>=22.3
     pre_commit>=1.11.1
-    cython ~= 3.0
     mypy
+    pybind11_stubgen @ git+https://github.com/Amulet-Team/pybind11-stubgen.git@c3a6ef67ec23d5a39e8cdc73b2c3cd8c1794d6f2
+    isort
+    autoflake
 
 
 # See the docstring in versioneer.py for instructions. Note that you must