Skip to content

Commit d82d7c2

Browse files
henryiiiasmorkalov
authored andcommitted
fix: update build system with CMAKE_ARGS from scikit-build
1 parent 0ec125d commit d82d7c2

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

pyproject.toml

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[build-system]
22
requires = [
3-
"setuptools==59.2.0", "wheel==0.37.0", "cmake>=3.1", "pip",
4-
"scikit-build>=0.13.2",
3+
"cmake>=3.1",
54
"numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
65
"numpy==1.17.0; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
76
"numpy==1.17.5; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
@@ -10,5 +9,8 @@ requires = [
109
"numpy==1.19.3; python_version=='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
1110
"numpy==1.21.2; python_version=='3.10' and platform_system!='Darwin'",
1211
"numpy==1.21.4; python_version=='3.10' and platform_system=='Darwin'",
13-
"numpy==1.23.2; python_version>='3.11'"
12+
"numpy==1.22.2; python_version>='3.11'",
13+
"pip",
14+
"scikit-build>=0.14.0",
15+
"setuptools==59.2.0",
1416
]

setup.py

+1-8
Original file line numberDiff line numberDiff line change
@@ -256,13 +256,6 @@ def main():
256256
cmake_args.append("-DWITH_LAPACK=ON")
257257
cmake_args.append("-DENABLE_PRECOMPILED_HEADERS=OFF")
258258

259-
# https://github.com/scikit-build/scikit-build/issues/479
260-
if "CMAKE_ARGS" in os.environ:
261-
import shlex
262-
263-
cmake_args.extend(shlex.split(os.environ["CMAKE_ARGS"]))
264-
del shlex
265-
266259
# works via side effect
267260
RearrangeCMakeOutput(
268261
rearrange_cmake_output_data, files_outside_package_dir, package_data.keys()
@@ -314,7 +307,7 @@ def main():
314307
)
315308

316309

317-
class RearrangeCMakeOutput(object):
310+
class RearrangeCMakeOutput:
318311
"""
319312
Patch SKBuild logic to only take files related to the Python package
320313
and construct a file hierarchy that SKBuild expects (see below)

0 commit comments

Comments
 (0)