Date: Tuesday, April 14, 2020 @ 10:45:38 Author: arojas Revision: 614060
Fix errors with matplotlib 3.2 Added: sagemath/trunk/sagemath-matplotlib-3.2.patch Modified: sagemath/trunk/PKGBUILD -------------------------------+ PKGBUILD | 6 +++ sagemath-matplotlib-3.2.patch | 62 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-04-14 09:07:05 UTC (rev 614059) +++ PKGBUILD 2020-04-14 10:45:38 UTC (rev 614060) @@ -8,7 +8,7 @@ pkgbase=sagemath pkgname=(sagemath sagemath-jupyter) pkgver=9.0 -pkgrel=14 +pkgrel=15 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab" arch=(x86_64) url="http://www.sagemath.org"; @@ -44,6 +44,7 @@ sagemath-rpy-3.patch sagemath-python-3.8.patch sagemath-gap-4.11.patch + sagemath-matplotlib-3.2.patch sagemath-jedi-0.16.patch) sha256sums=('6f5d42b306a2c03073dd95086f80602bd1a0b929b8ad19c6d219c8ca8e96da26' '496da0fa42cdfc92b43f5d85610bb462ca9bdc2f4d80fd316e8e9d068dba3b0b' @@ -56,6 +57,7 @@ '9062b412595e81a5ca560a5ae789f8b7318981689cb8d076b30d8c54a4fc4495' 'd430e76c5cdebed9bd1cde0f05e74fba620c736c68c018d70d84dc7b3e3c9049' '7123af05c79f76b94c89aa97da13dd1c1a796cdf10a9486e0974c88054eb3037' + '979777363001cca87f73128dd4db5f372fc9e4f1079805a20af01df47797468f' '63914b14d8369cb37e88500c73029bea83025d437029af65ba523f5f4396af91') prepare(){ @@ -78,6 +80,8 @@ sed -e 's|mathjax|mathjax2|g' -i src/sage/env.py # Fix gap.version() with GAP 4.11 patch -p1 -i ../sagemath-gap-4.11.patch +# Fix warnings with matplotlib 3.2 + patch -p1 -i ../sagemath-matplotlib-3.2.patch # Fix deprecation warnings on autocompletion with jedi 0.16 patch -p1 -i ../sagemath-jedi-0.16.patch Added: sagemath-matplotlib-3.2.patch =================================================================== --- sagemath-matplotlib-3.2.patch (rev 0) +++ sagemath-matplotlib-3.2.patch 2020-04-14 10:45:38 UTC (rev 614060) @@ -0,0 +1,62 @@ +diff --git a/src/sage/plot/contour_plot.py b/src/sage/plot/contour_plot.py +index a7533fa3d9..12a2b1f670 100644 +--- a/src/sage/plot/contour_plot.py ++++ b/src/sage/plot/contour_plot.py +@@ -223,7 +223,7 @@ class ContourPlot(GraphicPrimitive): + cb.add_lines(CS) + + +-@suboptions('colorbar', orientation='vertical', format=None, spacing=None) ++@suboptions('colorbar', orientation='vertical', format=None, spacing='uniform') + @suboptions('label', fontsize=9, colors='blue', inline=None, inline_spacing=3, + fmt="%1.2f") + @options(plot_points=100, fill=True, contours=None, linewidths=None, +diff --git a/src/sage/plot/colors.py b/src/sage/plot/colors.py +index 1860b6c948..af6fc7ec64 100644 +--- a/src/sage/plot/colors.py ++++ b/src/sage/plot/colors.py +@@ -20,7 +20,7 @@ comprises the "official" W3C CSS3_ / SVG_ colors. + For a list of color maps in Sage, evaluate:: + + sage: sorted(colormaps) +- [u'Accent', u'Accent_r', u'Blues', u'Blues_r', u'BrBG', u'BrBG_r', ...] ++ [u'Accent', u'Blues', u'BrBG', ...] + + These are imported from matplotlib's cm_ module. + +@@ -1374,7 +1374,7 @@ def get_cmap(cmap): + and color names. For a list of map names, evaluate:: + + sage: sorted(colormaps) +- [u'Accent', u'Accent_r', u'Blues', u'Blues_r', ...] ++ [u'Accent', u'Blues', ...] + + See :func:`rgbcolor` for valid list/tuple element formats. + +@@ -1468,7 +1468,7 @@ class Colormaps(collections.MutableMapping): + For a list of map names, evaluate:: + + sage: sorted(colormaps) +- [u'Accent', u'Accent_r', u'Blues', u'Blues_r', ...] ++ [u'Accent', u'Blues', ...] + """ + def __init__(self): + """ +@@ -1495,7 +1495,7 @@ class Colormaps(collections.MutableMapping): + sage: len(maps.maps) + 0 + sage: maps.load_maps() +- sage: len(maps.maps)>130 ++ sage: len(maps.maps)>65 + True + """ + global cm +@@ -1539,7 +1539,7 @@ class Colormaps(collections.MutableMapping): + + sage: from sage.plot.colors import Colormaps + sage: maps = Colormaps() +- sage: len(maps)>130 ++ sage: len(maps)>65 + True + """ + self.load_maps()
