Skip to content

Commit 6d8b58b

Browse files
cosminbascatimfel
authored andcommitted
Revert "GR-45676: update sipy patches with missing PEP517 hook"
This reverts commit 3471582.
1 parent 9df387a commit 6d8b58b

File tree

2 files changed

+4
-16
lines changed

2 files changed

+4
-16
lines changed

graalpython/lib-graalpython/patches/scipy/scipy-1.10.1.patch

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ index ad18b245..b18f3b89 100644
1313
],
1414
diff --git a/mesonpy_wrapper.py b/mesonpy_wrapper.py
1515
new file mode 100644
16-
index 00000000..3f5beb79
16+
index 00000000..21cceae0
1717
--- /dev/null
1818
+++ b/mesonpy_wrapper.py
19-
@@ -0,0 +1,88 @@
19+
@@ -0,0 +1,82 @@
2020
+import mesonpy
2121
+import os
2222
+import sys
@@ -99,12 +99,6 @@ index 00000000..3f5beb79
9999
+ scipy_build_env = get_build_env()
100100
+ with env_vars(scipy_build_env):
101101
+ return mesonpy.build_sdist(sdist_directory, config_settings=config_settings)
102-
+
103-
+def prepare_metadata_for_build_wheel(metadata_directory, config_settings=None):
104-
+ if config_settings is None:
105-
+ config_settings = {}
106-
+ config_settings['compile-args'] = '-j4'
107-
+
108102
diff --git a/pyproject.toml b/pyproject.toml
109103
index 454a3c2e..370f0e8e 100644
110104
--- a/pyproject.toml

graalpython/lib-graalpython/patches/scipy/scipy-1.9.3.patch

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ index 5b4a1d52..c29ec297 100644
1313
],
1414
diff --git a/mesonpy_wrapper.py b/mesonpy_wrapper.py
1515
new file mode 100644
16-
index 00000000..3f5beb79
16+
index 00000000..21cceae0
1717
--- /dev/null
1818
+++ b/mesonpy_wrapper.py
19-
@@ -0,0 +1,88 @@
19+
@@ -0,0 +1,82 @@
2020
+import mesonpy
2121
+import os
2222
+import sys
@@ -99,12 +99,6 @@ index 00000000..3f5beb79
9999
+ scipy_build_env = get_build_env()
100100
+ with env_vars(scipy_build_env):
101101
+ return mesonpy.build_sdist(sdist_directory, config_settings=config_settings)
102-
+
103-
+def prepare_metadata_for_build_wheel(metadata_directory, config_settings=None):
104-
+ if config_settings is None:
105-
+ config_settings = {}
106-
+ config_settings['compile-args'] = '-j4'
107-
+
108102
diff --git a/pyproject.toml b/pyproject.toml
109103
index 6dc1d407..da3e4e6d 100644
110104
--- a/pyproject.toml

0 commit comments

Comments
 (0)