Skip to content

Commit c8a8f44

Browse files
committed
[GR-53373] Update scipy-1.9.3 patch to select a working pythran version
PullRequest: graalpython/3299
2 parents e26fa1e + 8abf2c1 commit c8a8f44

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/interop/JavaInteropTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ diff --git a/pyproject.toml b/pyproject.toml
103103
index 6dc1d407..da3e4e6d 100644
104104
--- a/pyproject.toml
105105
+++ b/pyproject.toml
106-
@@ -8,7 +8,9 @@
106+
@@ -8,54 +8,19 @@
107107
# "pybind11>=2.4.3,<2.5.0",
108108

109109
[build-system]
@@ -114,7 +114,9 @@ index 6dc1d407..da3e4e6d 100644
114114
requires = [
115115
"meson-python>=0.9.0", # we need more fixes in meson-python, so no upper bound now
116116
"Cython>=0.29.32,<3.0",
117-
@@ -17,45 +19,8 @@ requires = [
117+
"pybind11>=2.4.3,<2.11.0",
118+
- "pythran>=0.9.12,<0.13.0",
119+
+ "pythran>=0.13.0",
118120
# `wheel` is needed for non-isolated builds, given that `meson-python`
119121
# doesn't list it as a runtime requirement (at least in 0.5.0)
120122
"wheel<0.38.0",
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[[rules]]
2+
# Pin older versions for now, the new ones require numpy-2rc1 and cython 3
3+
version = '<= 0.14.1'

0 commit comments

Comments
 (0)