mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-17 22:28:55 +00:00
sage: work around ipython and scipy regressions (#542633)
This commit is contained in:
24
pkgs/by-name/sa/sage/patches/ipython-9_15-workaround.patch
Normal file
24
pkgs/by-name/sa/sage/patches/ipython-9_15-workaround.patch
Normal file
@@ -0,0 +1,24 @@
|
||||
diff --git a/src/sage/doctest/test.py b/src/sage/doctest/test.py
|
||||
index 812f8167c12..38e553ad5bd 100644
|
||||
--- a/src/sage/doctest/test.py
|
||||
+++ b/src/sage/doctest/test.py
|
||||
@@ -468,6 +468,7 @@ Test the ``--debug`` option::
|
||||
s...: b = 5
|
||||
s...: a + b
|
||||
8
|
||||
+ ...
|
||||
sage:
|
||||
<BLANKLINE>
|
||||
Returning to doctests...
|
||||
diff --git a/src/sage/tests/cmdline.py b/src/sage/tests/cmdline.py
|
||||
index 56fc16a205c..be2ae2a1b3d 100644
|
||||
--- a/src/sage/tests/cmdline.py
|
||||
+++ b/src/sage/tests/cmdline.py
|
||||
@@ -327,6 +327,7 @@ be ignored. In Pdb, we run the ``help`` command::
|
||||
**********************************************************************
|
||||
Previously executed commands:
|
||||
s...: assert True is False
|
||||
+ ...
|
||||
sage:
|
||||
<BLANKLINE>
|
||||
Returning to doctests...
|
||||
13
pkgs/by-name/sa/sage/patches/scipy-1_18-workaround.patch
Normal file
13
pkgs/by-name/sa/sage/patches/scipy-1_18-workaround.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/sage/plot/plot3d/plot3d.py b/src/sage/plot/plot3d/plot3d.py
|
||||
index bdf15a85e9d..36580eeab6b 100644
|
||||
--- a/src/sage/plot/plot3d/plot3d.py
|
||||
+++ b/src/sage/plot/plot3d/plot3d.py
|
||||
@@ -316,7 +316,7 @@ class _Coordinates:
|
||||
....: [ 0.16763356, 0.19993708, 0.31403568, 0.47359696, 0.55282422],
|
||||
....: [ 0.16763356, 0.25683223, 0.16649297, 0.10594339, 0.55282422]])
|
||||
sage: import scipy.interpolate
|
||||
- sage: f=scipy.interpolate.RectBivariateSpline(v_phi,v_theta,m_r).ev
|
||||
+ sage: f=lambda *x: scipy.interpolate.RectBivariateSpline(v_phi,v_theta,m_r).ev(*x).item()
|
||||
sage: spherical_plot3d(f,(0,2*pi),(0,pi))
|
||||
Graphics3d Object
|
||||
"""
|
||||
@@ -130,6 +130,14 @@ stdenv.mkDerivation rec {
|
||||
url = "https://github.com/sagemath/sage/commit/926f32aab22f81ddb9fda874a20fee84c7bfacc3.patch?full_index=1";
|
||||
hash = "sha256-EMn/fr5WlRQtFj5GHo02kczasmKaiqFfRSVZo2uvOPI=";
|
||||
})
|
||||
|
||||
# work around https://github.com/ipython/ipython/issues/15207, which
|
||||
# will likely be properly fixed in IPython 9.16.
|
||||
./patches/ipython-9_15-workaround.patch
|
||||
|
||||
# work around https://github.com/scipy/scipy/issues/25471, which is
|
||||
# fixed as part of SciPy 1.18.1.
|
||||
./patches/scipy-1_18-workaround.patch
|
||||
];
|
||||
|
||||
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
|
||||
|
||||
Reference in New Issue
Block a user