chore: moving python package to a subdirectory

It is needed to prevent import errors as the repo root sometimes gets into the PYTHONPATH, e.g. when python interactive is used. In that case the native extension may not be loadable. See also PyO3/maturin#490
onekey-sec · May 14, 2023 · 07ff360 · 07ff360
1 parent 5df7e64
commit 07ff360
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 2 deletions.
diff --git a/flake.nix b/flake.nix
@@ -91,7 +91,7 @@
                 "Cargo.toml"
                 "Cargo.lock"
                 "pyproject.toml"
-                "unblob_native"
+                "python"
                 "benches"
                 "src"
                 "README.md"

diff --git a/pyproject.toml b/pyproject.toml
@@ -41,6 +41,7 @@ build-backend = "maturin"
 
 [tool.maturin]
 module-name = "unblob_native._native"
+python-source = "python"
 
 features = [
   "pyo3/extension-module",  # This is an extension module
@@ -92,7 +93,7 @@ ignore = [
 ]
 
 [tool.ruff.per-file-ignores]
-"unblob_native/__init__.py" = [
+"python/unblob_native/__init__.py" = [
   "F403",
   "A001",
   "F405",
@@ -103,6 +104,9 @@ ignore = [
   "S101",    # assert:                         Enable usage of asserts
 ]
 
+[tool.ruff.isort]
+known-first-party = ["unblob_native"]
+
 [tool.ruff.flake8-pytest-style]
 fixture-parentheses = false
 mark-parentheses = false

diff --git a/unblob_native/__init__.py → python/unblob_native/__init__.py b/unblob_native/__init__.py → python/unblob_native/__init__.py
diff --git a/unblob_native/_native/__init__.pyi → python/unblob_native/_native/__init__.pyi b/unblob_native/_native/__init__.pyi → python/unblob_native/_native/__init__.pyi
diff --git a/unblob_native/_native/math_tools.pyi → python/unblob_native/_native/math_tools.pyi b/unblob_native/_native/math_tools.pyi → python/unblob_native/_native/math_tools.pyi
diff --git a/unblob_native/py.typed → python/unblob_native/py.typed b/unblob_native/py.typed → python/unblob_native/py.typed