diff options
author | Timo Kaufmann <timokau@zoho.com> | 2022-02-03 18:03:39 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-03 18:03:39 +0100 |
commit | 0371c7ba56c9bd07cea56eae6e75cfa3ce30c7d8 (patch) | |
tree | ee9e9c10e155bbd50fce2cf4ae9fc51c0f557dba | |
parent | a751e798041053c226c734c707c2e6dc0fc76c66 (diff) | |
parent | 778b1f8b4f7ac8011e15a1dafb6d90c753ef4750 (diff) |
Merge pull request #157981 from collares/sage-fonttools-revert
sage: no longer assume fonttools emits deprecation warnings
-rw-r--r-- | pkgs/applications/science/math/sage/patches/fonttools-deprecation-warnings.patch | 39 | ||||
-rw-r--r-- | pkgs/applications/science/math/sage/sage-src.nix | 8 |
2 files changed, 0 insertions, 47 deletions
diff --git a/pkgs/applications/science/math/sage/patches/fonttools-deprecation-warnings.patch b/pkgs/applications/science/math/sage/patches/fonttools-deprecation-warnings.patch deleted file mode 100644 index 93c03a04ddb16..0000000000000 --- a/pkgs/applications/science/math/sage/patches/fonttools-deprecation-warnings.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/src/doc/en/prep/Advanced-2DPlotting.rst b/src/doc/en/prep/Advanced-2DPlotting.rst -index 337457afef..f7c76f4b56 100644 ---- a/src/doc/en/prep/Advanced-2DPlotting.rst -+++ b/src/doc/en/prep/Advanced-2DPlotting.rst -@@ -695,6 +695,8 @@ by the cells. - - sage: pdf_savename = name+'.pdf' - sage: p.save(pdf_savename) -+ ... -+ DeprecationWarning: The py23 module has been deprecated and will be removed in a future release. Please update your code. - - Notably, we can export in formats ready for inclusion in web pages. - -diff --git a/src/sage/plot/disk.py b/src/sage/plot/disk.py -index 8680a1c9b1..e83763b678 100644 ---- a/src/sage/plot/disk.py -+++ b/src/sage/plot/disk.py -@@ -156,6 +156,8 @@ class Disk(GraphicPrimitive): - sage: f = tmp_filename(ext='.pdf') - sage: p = disk((0,0), 5, (0, pi/4), alpha=0.5) - sage: p.save(f) -+ ... -+ DeprecationWarning: The py23 module has been deprecated and will be removed in a future release. Please update your code. - - """ - import matplotlib.patches as patches -diff --git a/src/sage/plot/text.py b/src/sage/plot/text.py -index 04cbdedf76..a970f97b79 100644 ---- a/src/sage/plot/text.py -+++ b/src/sage/plot/text.py -@@ -325,6 +325,8 @@ def text(string, xy, **options): - You can save text as part of PDF output:: - - sage: text("sage", (0,0), rgbcolor=(0,0,0)).save(os.path.join(SAGE_TMP, 'a.pdf')) -+ ... -+ DeprecationWarning: The py23 module has been deprecated and will be removed in a future release. Please update your code. - - Some examples of bounding box:: - diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index a51e92cde52eb..95b01d9f3f583 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -114,14 +114,6 @@ stdenv.mkDerivation rec { # strictly necessary, but keeps us from littering in the user's HOME. ./patches/sympow-cache.patch - # fonttools 4.26.2, used by matplotlib, uses deprecated methods internally. - # This is fixed in fonttools 4.27.0, but since fonttools is a dependency of - # 2000+ packages and DeprecationWarnings are hidden almost everywhere by - # default (not on Sage's doctest harness, though), it doesn't make sense to - # backport the fix (see https://github.com/NixOS/nixpkgs/pull/151415). - # Let's just assume warnings are expected until we update to 4.27.0. - ./patches/fonttools-deprecation-warnings.patch - # https://trac.sagemath.org/ticket/32968 (fetchSageDiff { base = "9.5.beta8"; |