Rebase patches, add numerical backends optdepends

1 files changed, 14 insertions, 14 deletions

diff --git a/sagemath-python-3.8.patch b/sagemath-python-3.8.patch
index a12fc3f21284..2bf7e9b1f036 100644
--- a/sagemath-python-3.8.patch
+++ b/sagemath-python-3.8.patch
@@ -378,7 +378,7 @@ diff --git a/src/sage/dynamics/arithmetic_dynamics/projective_ds.py b/src/sage/d
 index 99ad85b695..4d2642366a 100644
 --- a/src/sage/dynamics/arithmetic_dynamics/projective_ds.py
 +++ b/src/sage/dynamics/arithmetic_dynamics/projective_ds.py
-@@ -3147,8 +3147,8 @@ class DynamicalSystem_projective(SchemeMorphism_polynomial_projective_space,
+@@ -3145,8 +3145,8 @@ class DynamicalSystem_projective(SchemeMorphism_polynomial_projective_space,
              sage: D6 = DynamicalSystem_projective([y^2,x^2])
              sage: D6.automorphism_group()
              [
@@ -389,7 +389,7 @@ index 99ad85b695..4d2642366a 100644
              ]
          """
          alg = kwds.get('algorithm', None)
-@@ -3672,13 +3672,13 @@ class DynamicalSystem_projective(SchemeMorphism_polynomial_projective_space,
+@@ -3670,13 +3670,13 @@ class DynamicalSystem_projective(SchemeMorphism_polynomial_projective_space,
              sage: P.<x,y,z> = ProjectiveSpace(K,2)
              sage: f = DynamicalSystem_projective([x^2+z^2, y^2+x^2, z^2+y^2])
              sage: f.preperiodic_points(0,1)
@@ -410,7 +410,7 @@ index 99ad85b695..4d2642366a 100644
  
          ::
  
-@@ -3894,13 +3894,13 @@ class DynamicalSystem_projective(SchemeMorphism_polynomial_projective_space,
+@@ -3891,13 +3891,13 @@ class DynamicalSystem_projective(SchemeMorphism_polynomial_projective_space,
              sage: P.<x,y,z> = ProjectiveSpace(K,2)
              sage: f = DynamicalSystem_projective([x^2+z^2, y^2+x^2, z^2+y^2])
              sage: f.periodic_points(1)
@@ -429,7 +429,7 @@ index 99ad85b695..4d2642366a 100644
  
          ::
  
-@@ -5497,7 +5497,7 @@ class DynamicalSystem_projective_field(DynamicalSystem_projective,
+@@ -5494,7 +5494,7 @@ class DynamicalSystem_projective_field(DynamicalSystem_projective,
              sage: f.rational_periodic_points()
              doctest:warning
              ...
@@ -438,7 +438,7 @@ index 99ad85b695..4d2642366a 100644
          """
          from sage.misc.superseded import deprecation
          deprecation(28109, "use sage.dynamics.arithmetic_dynamics.projective_ds.all_periodic_points instead")
-@@ -5941,8 +5941,8 @@ class DynamicalSystem_projective_field(DynamicalSystem_projective,
+@@ -5938,8 +5938,8 @@ class DynamicalSystem_projective_field(DynamicalSystem_projective,
               (w^2 + w - 25/16 : 1),
               (-w : 1),
               (-w^2 + 29/16 : 1),
@@ -448,7 +448,7 @@ index 99ad85b695..4d2642366a 100644
               (-w^2 + 21/16 : 1),
               (w^2 - 21/16 : 1),
               (w^2 + w - 33/16 : 1),
-@@ -6070,8 +6070,8 @@ class DynamicalSystem_projective_field(DynamicalSystem_projective,
+@@ -6067,8 +6067,8 @@ class DynamicalSystem_projective_field(DynamicalSystem_projective,
              sage: g = f.conjugate(m)
              sage: f.conjugating_set(g) # long time
              [
@@ -715,7 +715,7 @@ diff --git a/src/sage/graphs/generic_graph.py b/src/sage/graphs/generic_graph.py
 index 9f7e1f418e..0ec459e7d3 100644
 --- a/src/sage/graphs/generic_graph.py
 +++ b/src/sage/graphs/generic_graph.py
-@@ -5155,7 +5155,7 @@ class GenericGraph(GenericGraph_pyx):
+@@ -5212,7 +5212,7 @@ class GenericGraph(GenericGraph_pyx):
          This method is deprecated since Sage-4.4.1.alpha2. Please use instead:
  
              sage: g.layout(layout = "planar", save_pos = True)
@@ -724,7 +724,7 @@ index 9f7e1f418e..0ec459e7d3 100644
          """
          deprecation(24494, 'This method is replaced by the method layout. '
                             'Please use layout(layout="planar", save_pos=True) '
-@@ -5209,25 +5209,25 @@ class GenericGraph(GenericGraph_pyx):
+@@ -5266,25 +5266,25 @@ class GenericGraph(GenericGraph_pyx):
  
              sage: g = graphs.PathGraph(10)
              sage: g.layout(layout='planar', save_pos=True, test=True)
@@ -763,7 +763,7 @@ index 9f7e1f418e..0ec459e7d3 100644
              sage: g = graphs.CompleteGraph(5)
              sage: g.layout(layout='planar', save_pos=True, test=True, set_embedding=True)
              Traceback (most recent call last):
-@@ -5753,17 +5753,17 @@ class GenericGraph(GenericGraph_pyx):
+@@ -5810,17 +5810,17 @@ class GenericGraph(GenericGraph_pyx):
              sage: T = graphs.TetrahedralGraph()
              sage: T.faces({0: [1, 3, 2], 1: [0, 2, 3], 2: [0, 3, 1], 3: [0, 1, 2]})
              [[(0, 1), (1, 2), (2, 0)],
@@ -791,7 +791,7 @@ diff --git a/src/sage/graphs/graph.py b/src/sage/graphs/graph.py
 index cab8faa833..9f00d87eb4 100644
 --- a/src/sage/graphs/graph.py
 +++ b/src/sage/graphs/graph.py
-@@ -6764,7 +6764,7 @@ class Graph(GenericGraph):
+@@ -6767,7 +6767,7 @@ class Graph(GenericGraph):
              sage: all(F.degree(u) == len(cliques) for u,cliques in d.items())
              True
              sage: F.cliques_containing_vertex(vertices=[(0, 1)])
@@ -800,7 +800,7 @@ index cab8faa833..9f00d87eb4 100644
  
          """
          import networkx
-@@ -7101,7 +7101,7 @@ class Graph(GenericGraph):
+@@ -7104,7 +7104,7 @@ class Graph(GenericGraph):
          Vertices may be arbitrary --- check that :trac:`24898` is fixed::
  
              sage: Graph({(1,2):[(2,3)],(2,3):[(1,2)]}).modular_decomposition()
@@ -1235,7 +1235,7 @@ index 080509beb7..2385f1eae3 100644
              1300952125                      # 32-bit
 -            3713081631935493181             # 64-bit
 +            8389048192121911274             # 64-bit
-         
+ 
          ::
  
 @@ -258,7 +258,7 @@ class SchemeMorphism_point_affine_field(SchemeMorphism_point_affine):
@@ -1244,14 +1244,14 @@ index 080509beb7..2385f1eae3 100644
             1300952125                      # 32-bit
 -           3713081631935493181             # 64-bit
 +           8389048192121911274             # 64-bit
-        
+ 
         ::
  
 diff --git a/src/sage/schemes/curves/curve.py b/src/sage/schemes/curves/curve.py
 index fcd9b2e6f1..0d026b7055 100644
 --- a/src/sage/schemes/curves/curve.py
 +++ b/src/sage/schemes/curves/curve.py
-@@ -265,12 +265,12 @@ class Curve_generic(AlgebraicScheme_subscheme):
+@@ -301,12 +301,12 @@ class Curve_generic(AlgebraicScheme_subscheme):
              + 67/3*x^2*y*z^2 + 117/4*y^5 + 9*x^5 + 6*x^3*z^2 + 393/4*x*y^4\
              + 145*x^2*y^3 + 115*x^3*y^2 + 49*x^4*y], P)
              sage: C.singular_points(K)