pyrox.dev
Merge pull request #246980 from collares/sage-next-20230728
[staging-next] sage: numpy/scipy upgrade patches
authored by
Mauricio Collares
and committed by
GitHub
91c8b652
3af97fc9
+18
pkgs/applications/science/math/sage/patches/numpy-1.25-deprecation.patch
+18
pkgs/applications/science/math/sage/patches/numpy-1.25-deprecation.patch
···
1
+
diff --git a/src/sage/tests/books/computational-mathematics-with-sagemath/graphique_doctest.py b/src/sage/tests/books/computational-mathematics-with-sagemath/graphique_doctest.py
2
+
index aa153fd4cd..eebbe87aff 100644
3
+
--- a/src/sage/tests/books/computational-mathematics-with-sagemath/graphique_doctest.py
4
+
+++ b/src/sage/tests/books/computational-mathematics-with-sagemath/graphique_doctest.py
5
+
@@ -134,11 +134,11 @@ Sage example in ./graphique.tex, line 1120::
6
+
sage: t = srange(0, 5, 0.1); p = Graphics()
7
+
sage: for k in srange(0, 10, 0.15):
8
+
....: y = integrate.odeint(f, k, t)
9
+
- ....: p += line(zip(t, flatten(y)))
10
+
+ ....: p += line(zip(t, y.flatten()))
11
+
sage: t = srange(0, -5, -0.1); q = Graphics()
12
+
sage: for k in srange(0, 10, 0.15):
13
+
....: y = integrate.odeint(f, k, t)
14
+
- ....: q += line(zip(t, flatten(y)))
15
+
+ ....: q += line(zip(t, y.flatten()))
16
+
sage: y = var('y')
17
+
sage: v = plot_vector_field((1, -cos(x*y)), (x,-5,5), (y,-2,11))
18
+
sage: g = p + q + v; g.show()
+17
pkgs/applications/science/math/sage/sage-src.nix
+17
pkgs/applications/science/math/sage/sage-src.nix
···
80
80
sha256 = "sha256-k8Oam+EiRcfXC7qCdLacCx+7vpUAw2K1wsjKcQbeGb4=";
81
81
})
82
82
83
+
# https://github.com/sagemath/sage/pull/35826, landed in 10.1.beta5
84
+
(fetchpatch {
85
+
name = "numpy-1.25.0-upgrade.patch";
86
+
url = "https://github.com/sagemath/sage/commit/ecfe06b8f1fe729b07e885f0de55244467e5c137.diff";
87
+
sha256 = "sha256-G0xhl+LyNdDYPzRqSHK3fHaepcIzpuwmqRiussraDf0=";
88
+
})
89
+
90
+
# https://github.com/sagemath/sage/pull/35826#issuecomment-1658569891
91
+
./patches/numpy-1.25-deprecation.patch
92
+
93
+
# https://github.com/sagemath/sage/pull/35842, landed in 10.1.beta5
94
+
(fetchpatch {
95
+
name = "scipy-1.11-upgrade.patch";
96
+
url = "https://github.com/sagemath/sage/commit/90ece168c3c61508baa36659b0027b7dd8b43add.diff";
97
+
sha256 = "sha256-Y5TmuJcUJR+veb2AuSVODGs+xkVV+pTM8fWTm4q+NDs=";
98
+
})
99
+
83
100
# https://github.com/sagemath/sage/pull/35825, landed in 10.1.beta6
84
101
(fetchpatch {
85
102
name = "singular-4.3.2p2-upgrade.patch";