From d82d7c2befd1e830287e8c1c125fdab8462836c2 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 11 Apr 2023 06:17:28 -0700 Subject: [PATCH] fix: update build system with CMAKE_ARGS from scikit-build --- pyproject.toml | 8 +++++--- setup.py | 9 +-------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 4190956f..00176366 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,6 @@ [build-system] requires = [ - "setuptools==59.2.0", "wheel==0.37.0", "cmake>=3.1", "pip", - "scikit-build>=0.13.2", + "cmake>=3.1", "numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64' and platform_machine != 'arm64'", "numpy==1.17.0; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'", "numpy==1.17.5; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'", @@ -10,5 +9,8 @@ requires = [ "numpy==1.19.3; python_version=='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'", "numpy==1.21.2; python_version=='3.10' and platform_system!='Darwin'", "numpy==1.21.4; python_version=='3.10' and platform_system=='Darwin'", - "numpy==1.23.2; python_version>='3.11'" + "numpy==1.22.2; python_version>='3.11'", + "pip", + "scikit-build>=0.14.0", + "setuptools==59.2.0", ] diff --git a/setup.py b/setup.py index 5107e8ea..b17c11e6 100644 --- a/setup.py +++ b/setup.py @@ -256,13 +256,6 @@ def main(): cmake_args.append("-DWITH_LAPACK=ON") cmake_args.append("-DENABLE_PRECOMPILED_HEADERS=OFF") - # https://github.com/scikit-build/scikit-build/issues/479 - if "CMAKE_ARGS" in os.environ: - import shlex - - cmake_args.extend(shlex.split(os.environ["CMAKE_ARGS"])) - del shlex - # works via side effect RearrangeCMakeOutput( rearrange_cmake_output_data, files_outside_package_dir, package_data.keys() @@ -314,7 +307,7 @@ def main(): ) -class RearrangeCMakeOutput(object): +class RearrangeCMakeOutput: """ Patch SKBuild logic to only take files related to the Python package and construct a file hierarchy that SKBuild expects (see below)