From 6046b2d3b93173a86064c23b6b5154b688e54da4 Mon Sep 17 00:00:00 2001 From: Camillo Schenone Date: Sat, 16 Mar 2024 14:59:26 +0100 Subject: [PATCH] fix: get sysconfig from the python that builds, remove old maturin stuff Former-commit-id: 3ce2271721d3e498cfb5a382efe699be9003ed0a --- build.sh | 9 +++------ pyproject.toml | 16 ---------------- 2 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 pyproject.toml diff --git a/build.sh b/build.sh index d23b953..fba48b9 100755 --- a/build.sh +++ b/build.sh @@ -6,17 +6,14 @@ FILENAME="libcodemp_client" TARGET_DIR="$ROOT_DIR/bindings" TARGET_NAME="codemp_client" -TARGET_EXT="$(python -c 'import sysconfig; print(sysconfig.get_config_var("EXT_SUFFIX"))')" - -FULL_TARGET="${TARGET_NAME}${TARGET_EXT}" PYO3_PYTHON="$(pyenv which python)" PYTHON_SYS_EXECUTABLE="$PYO3_PYTHON" -CARGO_FEATURES="pyo3/extension-module" +TARGET_EXT="$($PYO3_PYTHON -c 'import sysconfig; print(sysconfig.get_config_var("EXT_SUFFIX"))')" +FULL_TARGET="${TARGET_NAME}${TARGET_EXT}" echo "Building with python: $PYO3_PYTHON" -env PYO3_PYTHON="${PYO3_PYTHON}" PYTHON_SYS_EXECUTABLE="$PYO3_PYTHON" cargo build --features "$CARGO_FEATURES" -# env PYO3_PYTHON="${PYO3_PYTHON}" PYTHON_SYS_EXECUTABLE="$PYO3_PYTHON" cargo build +env PYO3_PYTHON="${PYO3_PYTHON}" PYTHON_SYS_EXECUTABLE="$PYO3_PYTHON" cargo build echo "Copying into: $TARGET_DIR/$FULL_TARGET" [[ -f "$TARGET_DIR/$FUll_TARGET" ]] && echo "$FILE exists." diff --git a/pyproject.toml b/pyproject.toml deleted file mode 100644 index 6ffb3c6..0000000 --- a/pyproject.toml +++ /dev/null @@ -1,16 +0,0 @@ -[build-system] -requires = ["maturin>=1.1,<2.0"] -build-backend = "maturin" - -[project] -name = "Codemp Client" -requires-python = ">=3.7" -classifiers = [ - "Programming Language :: Rust", - "Programming Language :: Python :: Implementation :: CPython", - "Programming Language :: Python :: Implementation :: PyPy", -] - - -[tool.maturin] -features = ["pyo3/extension-module"]