Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sage: staging-next 2023-01-05 upgrade fixes #211390

Merged
merged 3 commits into from
Jan 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/sage/interacts/library.py b/src/sage/interacts/library.py
index 06d680109a..139b00bfd1 100644
--- a/src/sage/interacts/library.py
+++ b/src/sage/interacts/library.py
@@ -1434,6 +1434,8 @@ def riemann_sum(
creates the mathlet::

sage: interacts.calculus.riemann_sum()
+ ...
+ DeprecationWarning: on_submit is deprecated. Instead, set the .continuous_update attribute to False and observe the value changing with: mywidget.observe(callback, 'value').
Manual interactive function <function riemann_sum at ...> with 9 widgets
title: HTMLText(value='<h2>Riemann integral with random sampling</h2>')
f: EvalText(value='x^2+1', description='$f(x)=$', layout=Layout(max_width='41em'))

This file was deleted.

31 changes: 27 additions & 4 deletions pkgs/applications/science/math/sage/sage-src.nix
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,6 @@ stdenv.mkDerivation rec {
# Parallelize docubuild using subprocesses, fixing an isolation issue. See
# https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE
./patches/sphinx-docbuild-subprocesses.patch

# Docbuilding copies files from the Nix store and expects them to be writable.
# Remove when https://github.com/matplotlib/matplotlib/pull/23805 lands.
./patches/sphinx-fix-matplotlib-css-perms.patch
];

# Since sage unfortunately does not release bugfix releases, packagers must
Expand Down Expand Up @@ -163,6 +159,33 @@ stdenv.mkDerivation rec {
# conflicts. The patch below contains rebased versions.
./patches/pari-2.15.1-upgrade-rebased.patch

# https://trac.sagemath.org/ticket/34668
(fetchSageDiff {
name = "matplotlib-3.6-upgrade.patch";
base = "9.8.beta2";
rev = "5501e0de0dca1cff0355326dd42bd8c7e5749568";
sha256 = "sha256-ceJkVaecIsZewN8v/3gPQXFbFjv5Akz6zEFg/ToXdek=";
})

# https://trac.sagemath.org/ticket/34693
(fetchSageDiff {
name = "matplotlib-3.6-docbuilding.patch";
base = "9.8.beta4";
rev = "64589686c261d33e6b5aff2589bcae8af004bcc6";
sha256 = "sha256-j5AMY1TmhP+HBBBYaFZSkABJ5vtwe6iP2LRfGEgSm8Q=";
})

# https://trac.sagemath.org/ticket/34615
(fetchSageDiff {
name = "sphinx-5.2-upgrade.patch";
base = "9.8.beta1";
rev = "8f8af65e54d3a9962cfab40f15dc23f4e955b43f";
sha256 = "sha256-yhDdyxnXSSkqLcuOPBWSEBc26rk1Od3gLcWW8S2p8bY=";
})

# temporarily paper over https://github.com/jupyter-widgets/ipywidgets/issues/3669
./patches/ipywidgets-on_submit-deprecationwarning.patch

# Sage uses mixed integer programs (MIPs) to find edge disjoint
# spanning trees. For some reason, aarch64 glpk takes much longer
# than x86_64 glpk to solve such MIPs. Since the MIP formulation
Expand Down