Drop merged patches

5 files changed, 39 insertions, 149 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 26a08120cf00..a76f1d441e61 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = sagemath-git
 	pkgdesc = Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab
-	pkgver = 9.2.beta0.r0.g860e4dc988
+	pkgver = 9.2.beta1.r0.ge2dcdeeabb
 	pkgrel = 1
 	url = http://www.sagemath.org
 	arch = x86_64
@@ -105,9 +105,7 @@ pkgbase = sagemath-git
 	source = sagemath-python-3.8.patch
 	source = sagemath-pexpect-4.8.patch
 	source = sagemath-gap-4.11.patch
-	source = sagemath-matplotlib-3.2.patch
 	source = sagemath-pari-2.11.3.patch
-	source = sagemath-jedi-0.16.patch
 	source = sagemath-sphinx-3.patch
 	source = sagemath-sympy-1.6.patch
 	source = sagemath-flint-2.6.patch
@@ -116,16 +114,14 @@ pkgbase = sagemath-git
 	sha256sums = d6d8dd7d75e29a9ddbbb0da6fe18f86ee3ff49aad4af71104da38a8fa0d4c3db
 	sha256sums = 77aa8e99aae5da74a9486f01b603a0b5d224c3d13e9d9fab681fb71a6af149f1
 	sha256sums = 937074fa7a8a4e2aba9ea77ec622fe937985a1a9176c48460d51325ee877a4f5
-	sha256sums = 3bbb83cfcd022b3a0c0efdac76c26feb7d94ce94c519e753dfc835e6c4ee6178
+	sha256sums = 6f98488d0eb3a12b958cd1a34f85b7bee950ac756430371c1e134e564cbbf7d3
 	sha256sums = e44bbde87f3312548faad75b7383ef21fade55be251ab5804de41cd3842ca8a0
 	sha256sums = f9721c66d1a0267bb19923f5084d40f8121fcada6db1d1c37484dab70b655544
 	sha256sums = b2a7055bc380c1d86a9514540d985fc4bce3cea1ea865e13642f11b1bf0f6e50
 	sha256sums = e55bb5df7d6ce65fc9d124b6b59407071f0c55d88f730e9467398f10cc87e66d
 	sha256sums = 5e6d1aa34959bd4369bd08a80648a5c7bc2d38e72c97e9a5f986e91f8a7aca07
 	sha256sums = f6b3f52748d0f692f109c29724b402149b74960d8954e244ab770c85af832b6c
-	sha256sums = fea8674782a398ead1b065e0d4b551be4e268c15fa336b91b9bb7e738163eaed
 	sha256sums = 688345dd88174cc82a196a9ecace86f3b4f28bb2fae2d7196a40a76ff724f92e
-	sha256sums = b59dacad45959a5dafa0075a2175206afc1780511566807a2277de0b804548f4
 	sha256sums = c9fa4f136a8e4fa9832524bb0ee4a7fbb3c6e992595a3b10c7c627ba9161b4ce
 	sha256sums = ade7f86abc8b04b6a01c1a495b644a034d27bacdfdfa62813f4f8945bb96a8fe
 	sha256sums = b881d4a6867a6f5360fd204e6a86fd27c6177c539b06f521402e2bcb5a6209cd
diff --git a/PKGBUILD b/PKGBUILD
index 13cffe11ca50..309773be7bb5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgbase=sagemath-git
 pkgname=(sagemath-git sagemath-jupyter-git)
-pkgver=9.2.beta0.r0.g860e4dc988
+pkgver=9.2.beta1.r0.ge2dcdeeabb
 pkgrel=1
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"
 arch=(x86_64)
@@ -46,9 +46,7 @@ source=(git://git.sagemath.org/sage.git#branch=develop
         sagemath-python-3.8.patch
         sagemath-pexpect-4.8.patch
         sagemath-gap-4.11.patch
-        sagemath-matplotlib-3.2.patch
         sagemath-pari-2.11.3.patch
-        sagemath-jedi-0.16.patch
         sagemath-sphinx-3.patch
         sagemath-sympy-1.6.patch
         sagemath-flint-2.6.patch)
@@ -57,16 +55,14 @@ sha256sums=('SKIP'
             'd6d8dd7d75e29a9ddbbb0da6fe18f86ee3ff49aad4af71104da38a8fa0d4c3db'
             '77aa8e99aae5da74a9486f01b603a0b5d224c3d13e9d9fab681fb71a6af149f1'
             '937074fa7a8a4e2aba9ea77ec622fe937985a1a9176c48460d51325ee877a4f5'
-            '3bbb83cfcd022b3a0c0efdac76c26feb7d94ce94c519e753dfc835e6c4ee6178'
+            '6f98488d0eb3a12b958cd1a34f85b7bee950ac756430371c1e134e564cbbf7d3'
             'e44bbde87f3312548faad75b7383ef21fade55be251ab5804de41cd3842ca8a0'
             'f9721c66d1a0267bb19923f5084d40f8121fcada6db1d1c37484dab70b655544'
             'b2a7055bc380c1d86a9514540d985fc4bce3cea1ea865e13642f11b1bf0f6e50'
             'e55bb5df7d6ce65fc9d124b6b59407071f0c55d88f730e9467398f10cc87e66d'
             '5e6d1aa34959bd4369bd08a80648a5c7bc2d38e72c97e9a5f986e91f8a7aca07'
             'f6b3f52748d0f692f109c29724b402149b74960d8954e244ab770c85af832b6c'
-            'fea8674782a398ead1b065e0d4b551be4e268c15fa336b91b9bb7e738163eaed'
             '688345dd88174cc82a196a9ecace86f3b4f28bb2fae2d7196a40a76ff724f92e'
-            'b59dacad45959a5dafa0075a2175206afc1780511566807a2277de0b804548f4'
             'c9fa4f136a8e4fa9832524bb0ee4a7fbb3c6e992595a3b10c7c627ba9161b4ce'
             'ade7f86abc8b04b6a01c1a495b644a034d27bacdfdfa62813f4f8945bb96a8fe'
             'b881d4a6867a6f5360fd204e6a86fd27c6177c539b06f521402e2bcb5a6209cd')
@@ -88,16 +84,12 @@ prepare(){
   patch -p1 -i ../sagemath-ecl-sigfpe.patch
 # Fix doc build with sphinx 3 https://trac.sagemath.org/ticket/28856
   patch -p1 -i ../sagemath-sphinx-3.patch
-# Fix warnings with matplotlib 3.2 https://trac.sagemath.org/ticket/29547
-  patch -p1 -i ../sagemath-matplotlib-3.2.patch
 # Port to sympy 1.6 changes https://trac.sagemath.org/ticket/29730
   patch -p1 -i ../sagemath-sympy-1.6.patch
 # Sort dicts in doctests https://trac.sagemath.org/ticket/29042
   patch -p1 -i ../sagemath-no-dict-sorting.patch
 # Fix segfault and tests with flint 2.6 https://trac.sagemath.org/ticket/29719
   patch -p1 -i ../sagemath-flint-2.6.patch
-# Fix deprecation warnings on autocompletion with jedi 0.16
-  patch -p1 -i ../sagemath-jedi-0.16.patch
 
 # Arch-specific patches
 # assume all optional packages are installed
diff --git a/sagemath-jedi-0.16.patch b/sagemath-jedi-0.16.patch
deleted file mode 100644
index f62e96affc17..000000000000
--- a/sagemath-jedi-0.16.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/sage/all.py b/src/sage/all.py
-index 94337b4..88682c1 100644
---- a/src/sage/all.py
-+++ b/src/sage/all.py
-@@ -91,7 +91,7 @@ warnings.filterwarnings('ignore', category=RuntimeWarning,
- 
- # Ignore all deprecations from IPython etc.
- warnings.filterwarnings('ignore', category=DeprecationWarning,
--    module='.*(IPython|ipykernel|jupyter_client|jupyter_core|nbformat|notebook|ipywidgets|storemagic)')
-+    module='.*(IPython|ipykernel|jupyter_client|jupyter_core|nbformat|notebook|ipywidgets|storemagic|jedi)')
- # Ignore collections.abc warnings, there are a lot of them but they are
- # harmless.
- warnings.filterwarnings('ignore', category=DeprecationWarning,
diff --git a/sagemath-matplotlib-3.2.patch b/sagemath-matplotlib-3.2.patch
deleted file mode 100644
index ad32e52aef0a..000000000000
--- a/sagemath-matplotlib-3.2.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff --git a/src/sage/combinat/root_system/root_lattice_realizations.py b/src/sage/combinat/root_system/root_lattice_realizations.py
-index f55c24f..16d3ca5 100644
---- a/src/sage/combinat/root_system/root_lattice_realizations.py
-+++ b/src/sage/combinat/root_system/root_lattice_realizations.py
-@@ -3130,8 +3130,8 @@ class RootLatticeRealizations(Category_over_base_ring):
- 
-                 sage: L = RootSystem(['A',2]).ambient_space()
-                 sage: C = crystals.Tableaux(['A',2], shape=[2,1])
--                sage: L.plot_crystal(C)
--                Graphics object consisting of 16 graphics primitives
-+                sage: L.plot_crystal(C, plot_labels='multiplicities')
-+                Graphics object consisting of 15 graphics primitives
-                 sage: C = crystals.Tableaux(['A',2], shape=[8,4])
-                 sage: p = L.plot_crystal(C, plot_labels='circles')
-                 sage: p.show(figsize=15)
-diff --git a/src/sage/interacts/test_jupyter.rst b/src/sage/interacts/test_jupyter.rst
-index ed2bcb5..3f307d2 100644
---- a/src/sage/interacts/test_jupyter.rst
-+++ b/src/sage/interacts/test_jupyter.rst
-@@ -281,9 +281,7 @@ Test all interacts from the Sage interact library::
-     Interactive function <function coin at ...> with 2 widgets
-       n: IntSlider(value=1000, description=u'Number of Tosses', max=10000, min=2, step=100)
-       interval: IntRangeSlider(value=(0, 0), description=u'Plotting range (y)', max=1)
--    doctest:...: UserWarning: Attempting to set identical bottom==top results
--    in singular transformations; automatically expanding.
--    bottom=0.0, top=0.0
-+    doctest:...: UserWarning: Attempting to set identical bottom == top == 0.0 results in singular transformations; automatically expanding.
- 
- Test matrix control (see :trac:`27735`)::
- 
-diff --git a/src/sage/plot/colors.py b/src/sage/plot/colors.py
-index 1860b6c..da3c9c3 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.
- 
-@@ -1373,7 +1373,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.
- 
-@@ -1467,7 +1467,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):
-         """
-@@ -1494,7 +1494,7 @@ class Colormaps(collections.MutableMapping):
-             sage: len(maps.maps)
-             0
-             sage: maps.load_maps()
--            sage: len(maps.maps)>130
-+            sage: len(maps.maps)>60
-             True
-         """
-         global cm
-@@ -1538,7 +1538,7 @@ class Colormaps(collections.MutableMapping):
- 
-             sage: from sage.plot.colors import Colormaps
-             sage: maps = Colormaps()
--            sage: len(maps)>130
-+            sage: len(maps)>60
-             True
-         """
-         self.load_maps()
-diff --git a/src/sage/plot/contour_plot.py b/src/sage/plot/contour_plot.py
-index a7533fa..12a2b1f 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/multigraphics.py b/src/sage/plot/multigraphics.py
-index 3135ceb..184a97c 100644
---- a/src/sage/plot/multigraphics.py
-+++ b/src/sage/plot/multigraphics.py
-@@ -1295,15 +1295,15 @@ class GraphicsArray(MultiGraphics):
-             sage: g2 = circle((0,1), 1.)
-             sage: G = graphics_array([g1, g2])
-             sage: G.position(0)  # tol 1.0e-13
--            (0.028906249999999998,
--             0.038541666666666696,
--             0.45390624999999996,
--             0.9229166666666667)
-+            (0.023437500000000003,
-+             0.03415488992713045,
-+             0.4627803348994754,
-+             0.9345951100728696)
-             sage: G.position(1)  # tol 1.0e-13
--            (0.5171874999999999,
--             0.038541666666666696,
--             0.45390624999999996,
--             0.9229166666666667)
-+            (0.5136230468749999,
-+             0.19293222169724827,
-+             0.46278033489947534,
-+             0.617040446532634)
- 
-         """
-         if not self._positions:
diff --git a/sagemath-singular-4.1.2.patch b/sagemath-singular-4.1.2.patch
index 1784c80bd803..d9ff96cde883 100644
--- a/sagemath-singular-4.1.2.patch
+++ b/sagemath-singular-4.1.2.patch
@@ -626,6 +626,15 @@ index 962205f..1c9a81d 100644
  
          The ideals must share the same ring::
  
+@@ -4002,7 +4002,7 @@ class MPolynomialIdeal( MPolynomialIdeal_singular_repr, \
+ 
+             sage: J.groebner_basis.set_cache(gb)  # optional - giacpy_sage
+             sage: ideal(J.transformed_basis()).change_ring(P).interreduced_basis()  # testing trac 21884
+-            [a - 60*c^3 + 158/7*c^2 + 8/7*c - 1, b + 30*c^3 - 79/7*c^2 + 3/7*c, c^4 - 10/21*c^3 + 1/84*c^2 + 1/84*c]
++            ...[a - 60*c^3 + 158/7*c^2 + 8/7*c - 1, b + 30*c^3 - 79/7*c^2 + 3/7*c, c^4 - 10/21*c^3 + 1/84*c^2 + 1/84*c]
+ 
+         Giac's gbasis over `\QQ` can benefit from a probabilistic lifting and
+         multi threaded operations::
 @@ -4104,9 +4104,9 @@ class MPolynomialIdeal( MPolynomialIdeal_singular_repr, \
              sage: P.<a,b,c> = PolynomialRing(ZZ,3)
              sage: I = P * (a + 2*b + 2*c - 1, a^2 - a + 2*b^2 + 2*c^2, 2*a*b + 2*b*c - b)
@@ -670,6 +679,19 @@ index ab18796..868ca8c 100644
      def degree(self, MPolynomial_libsingular x=None, int std_grading=False):
          """
          Return the degree of this polynomial.
+diff --git a/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx b/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx
+index ab18796..2eb8f24 100644
+--- a/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx
++++ b/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx
+@@ -1348,7 +1348,7 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base):
+             sage: R = IntegerModRing(15)['x,y']
+             sage: singular(R)
+             polynomial ring, over a ring (with zero-divisors), global ordering
+-            //   coefficients: ZZ/bigint(15)
++            //   coefficients: ZZ/...(15)
+             //   number of vars : 2
+             //        block   1 : ordering dp
+             //                  : names    x y
 diff --git a/src/sage/rings/polynomial/plural.pyx b/src/sage/rings/polynomial/plural.pyx
 index 42001d4..8e4eea9 100644
 --- a/src/sage/rings/polynomial/plural.pyx
@@ -684,6 +706,19 @@ index 42001d4..8e4eea9 100644
  #    self._populate_coercion_lists_()  # ???
  
      #MPolynomialRing_generic.__init__(self, base_ring, n, names, order)
+diff --git a/src/sage/rings/polynomial/polynomial_singular_interface.py b/src/sage/rings/polynomial/polynomial_singular_interface.py
+index 74b8b82..beee5ad 100644
+--- a/src/sage/rings/polynomial/polynomial_singular_interface.py
++++ b/src/sage/rings/polynomial/polynomial_singular_interface.py
+@@ -165,7 +165,7 @@ class PolynomialRing_singular_repr:
+             sage: R = IntegerModRing(15)['x,y']
+             sage: singular(R)
+             polynomial ring, over a ring (with zero-divisors), global ordering
+-            //   coefficients: ZZ/bigint(15)
++            //   coefficients: ZZ/...(15)
+             //   number of vars : 2
+             //        block   1 : ordering dp
+             //                  : names    x y
 diff --git a/src/sage/schemes/curves/projective_curve.py b/src/sage/schemes/curves/projective_curve.py
 index 592bb68..962821c 100644
 --- a/src/sage/schemes/curves/projective_curve.py