configure maturin

cleaned project

.github/workflows/lint.yml

@@ -0,0 +1,41 @@
+name: Lint
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  lint-python:
+    name: Lint Python
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+        name: Checkout repository
+
+      - uses: chartboost/ruff-action@v1
+        name: Run Ruff
+
+  lint-rust:
+    name: Lint Rust
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    defaults:
+      run:
+        shell: bash
+        working-directory: lib/tools_2048
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Update Rust
+        run: rustup update
+
+      - name: Build
+        run: cargo build
+
+      - name: Clippy
+        run: cargo clippy -- -D warnings

build.py

@@ -7,31 +7,6 @@
 import PyInstaller.__main__
 
 
-def build_rust():
-	if os.path.isfile(".\\lib\\rust_2048.pyd"):
-		os.remove(".\\lib\\rust_2048.pyd")
-
-	subprocess.run(["cargo", "clean"], cwd=".\\rust_2048", stdin=None, stdout=None, stderr=None, input=None, capture_output=False,
-	               timeout=None, check=True, shell=False, env=None, universal_newlines=False, errors=None,
-	               text=None)
-
-	subprocess.run(["cargo", "build", "--release"], cwd=".\\rust_2048", stdin=None, stdout=None, stderr=None, input=None, capture_output=False,
-	               timeout=None, check=True, shell=True, env=None, universal_newlines=False, errors=None,
-	               text=None)
-
-	# rename file
-	os.rename("lib/tools_2048/rust_2048\\target\\release\\rust_2048.dll",
-	          "lib/tools_2048/rust_2048\\target\\release\\rust_2048.pyd")
-
-	# copy file
-	shutil.copyfile("lib/tools_2048/rust_2048\\target\\release\\rust_2048.pyd", ".\\lib\\rust_2048.pyd")
-
-	subprocess.run(["cargo", "clean"], cwd=".\\rust_2048", stdin=None, stdout=None, stderr=None, input=None,
-	               capture_output=False,
-	               timeout=None, check=True, shell=False, env=None, universal_newlines=False, errors=None,
-	               text=None)
-
-
 def build(name, console, onefile, uac_admin, icon, files, folders):
 	work_path = "build"
 	while os.path.isdir(work_path):
@@ -88,6 +63,12 @@ def build(name, console, onefile, uac_admin, icon, files, folders):
 		else:
 			raise Exception("Invalid folder!")
 
+	# build rust code
+	subprocess.run(["maturin", "develop", "--release"], cwd=".\\lib\\tools_2048",
+	               stdin=None, stdout=None, stderr=None, input=None, capture_output=False,
+	               timeout=None, check=True, shell=False, env=None, universal_newlines=False,
+	               errors=None, text=None)
+
 	PyInstaller.__main__.run(run_list)
 	shutil.rmtree(path=work_path, ignore_errors=True)
 

lib/tools_2048/Cargo.toml

@@ -8,5 +8,5 @@ name = "tools_2048"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = "0.20.2"
+pyo3 = { version = "0.20.2", features = ["extension-module"] }
 tools-2048-cratesio = { version = "0.3.2", package = "tools-2048" }

lib/tools_2048/pyproject.toml

@@ -0,0 +1,7 @@
+[build-system]
+requires = ["maturin>=1.0,<2.0"]
+build-backend = "maturin"
+
+[tool.maturin]
+# "extension-module" tells pyo3 we want to build an extension module (skips linking against libpython.so)
+features = ["pyo3/extension-module"]

main.py

@@ -1,9 +1,11 @@
 import os
 import sys
 from tkinter import *
+import tools_2048
 
-import lib.rust_2048 as rust_2048
-
+new_game = tools_2048.Game2048(4)
+new_game.make_move(0)
+print(new_game.board())
 
 def resource_path(relative_path):
 	""" Get absolute path to resource, works for dev and for PyInstaller """

requirements.txt

@@ -1 +1,2 @@
-pyinstaller>=6.3.0
+pyinstaller==6.3.0
+maturin==1.4.0