Rebase patches, add pyprimecount dependency

1 files changed, 22 insertions, 133 deletions

diff --git a/sagemath-python3.10.patch b/sagemath-python3.10.patch
index 6589cf62253d..d05c8c56fbe7 100644
--- a/sagemath-python3.10.patch
+++ b/sagemath-python3.10.patch
@@ -99,141 +99,30 @@ index 5b0c6d1..3ba391b 100644
      """Clear the atexit module of all registered exit handlers."""
 +
      atexit._clear()
-diff --git a/src/sage/misc/sageinspect.py b/src/sage/misc/sageinspect.py
-index fb2073f..bd89233 100644
---- a/src/sage/misc/sageinspect.py
-+++ b/src/sage/misc/sageinspect.py
-@@ -1585,6 +1585,8 @@ def sage_getargspec(obj):
-         ....:     'class Foo:\n'
-         ....:     '    def __call__(self):\n'
-         ....:     '        return None\n'
-+        ....:     '    def __module__(self):\n'
-+        ....:     '        return "sage.misc.sageinspect"\n'
-         ....:     '    def _sage_src_(self):\n'
-         ....:     '        return "the source code string"')
-         sage: shell.run_cell('f = Foo()')
-diff --git a/src/sage/plot/colors.py b/src/sage/plot/colors.py
-index 6fdba0f..f46b736 100644
---- a/src/sage/plot/colors.py
-+++ b/src/sage/plot/colors.py
-@@ -918,12 +918,12 @@ class Color(object):
+diff --git a/src/sage_docbuild/utils.py b/src/sage_docbuild/utils.py
+index 956d703f..3e4793e 100644
+--- a/src/sage_docbuild/utils.py
++++ b/src/sage_docbuild/utils.py
+@@ -79,7 +79,7 @@ def build_many(target, args, processes=None):
+         ....:         # Task 4 is a poison pill
+         ....:         1 / 0
+         ....:     else:
+-        ....:         time.sleep(0.5)
++        ....:         time.sleep(float(0.5))
+         ....:         print('Processed task %s' % N)
+         ....:
  
-             sage: Color(0.3, 0.5, 0.7, space='hls').hls()
-             (0.30000000000000004, 0.5, 0.7)
--            sage: Color(0.3, 0.5, 0.7, space='hsl').hls()
-+            sage: Color(0.3, 0.5, 0.7, space='hsl').hls() # abs tol 1e-15
-             (0.30000000000000004, 0.7, 0.5000000000000001)
--            sage: Color('#aabbcc').hls()
-+            sage: Color('#aabbcc').hls() # abs tol 1e-15
-             (0.5833333333333334, 0.7333333333333334, 0.25000000000000017)
-             sage: from sage.plot.colors import orchid
--            sage: orchid.hls()
-+            sage: orchid.hls() # abs tol 1e-15
-             (0.8396226415094339, 0.6470588235294117, 0.5888888888888889)
-         """
-         return tuple(map(float, rgb_to_hls(*self._rgb)))
-@@ -942,9 +942,9 @@ class Color(object):
-             sage: Color(1,0,0).hsl()
-             (0.0, 1.0, 0.5)
-             sage: from sage.plot.colors import orchid
--            sage: orchid.hsl()
-+            sage: orchid.hsl() # abs tol 1e-15
-             (0.8396226415094339, 0.5888888888888889, 0.6470588235294117)
--            sage: Color('#aabbcc').hsl()
-+            sage: Color('#aabbcc').hsl() # abs tol 1e-15
-             (0.5833333333333334, 0.25000000000000017, 0.7333333333333334)
-         """
-         h, l, s = tuple(map(float, rgb_to_hls(*self._rgb)))
-diff --git a/src/sage/rings/asymptotic/growth_group.py b/src/sage/rings/asymptotic/growth_group.py
-index ba7e684..a91ec31 100644
---- a/src/sage/rings/asymptotic/growth_group.py
-+++ b/src/sage/rings/asymptotic/growth_group.py
-@@ -5434,7 +5434,7 @@ class GrowthGroupFactory(UniqueFactory):
-             describing a growth group.
-             > *previous* ValueError: Cannot create a parent out of 'as'.
-             >> *previous* ValueError: unknown specification as
--            >> *and* SyntaxError: unexpected EOF while parsing (<string>, line 1)
-+            >> *and* SyntaxError: ... (<string>, line 1)
-             > *and* ValueError: Cannot create a parent out of 'df'.
-             >> *previous* ValueError: unknown specification df
-             >> *and* NameError: name 'df' is not defined
-diff --git a/src/sage/schemes/riemann_surfaces/riemann_surface.py b/src/sage/schemes/riemann_surfaces/riemann_surface.py
-index 3c3d387..f9d1e2b 100644
---- a/src/sage/schemes/riemann_surfaces/riemann_surface.py
-+++ b/src/sage/schemes/riemann_surfaces/riemann_surface.py
-@@ -1390,7 +1390,7 @@ class RiemannSurface(object):
-             sage: S = RiemannSurface(f)
-             sage: _ = S.homology_basis()
-             sage: g,d = S.make_zw_interpolator([(0,0),(1,0)]);
--            sage: all(f(*g(i*0.1)).abs() < 1e-13for i in range(10))
-+            sage: all(f(*g(i*0.1)).abs() < 1e-13 for i in range(10))
-             True
-             sage: abs((g(1)[0]-g(0)[0]) - d) < 1e-13
-             True
-diff --git a/src/sage/structure/unique_representation.py b/src/sage/structure/unique_representation.py
-index 9ead7a4..5d8d4ad 100644
---- a/src/sage/structure/unique_representation.py
-+++ b/src/sage/structure/unique_representation.py
-@@ -1221,7 +1221,7 @@ class UniqueRepresentation(CachedRepresentation, WithEqualityById):
-         sage: isinstance(GF(7), GF)
-         Traceback (most recent call last):
-         ...
--        TypeError: isinstance() arg 2 must be a type or tuple of types
-+        TypeError: isinstance() arg 2 must be a type...
- 
-         sage: isinstance(GF, sage.structure.factory.UniqueFactory)
-         True
-diff --git a/src/sage/symbolic/callable.py b/src/sage/symbolic/callable.py
-index 5f3a7be..4b8efda 100644
---- a/src/sage/symbolic/callable.py
-+++ b/src/sage/symbolic/callable.py
-@@ -38,27 +38,27 @@ The arguments in the definition must be symbolic variables (:trac:`10747`)::
-     sage: f(1)=2
-     Traceback (most recent call last):
-     ...
--    SyntaxError: can...t assign to function call
-+    SyntaxError: can...t assign to function call...
- 
-     sage: f(x,1)=2
-     Traceback (most recent call last):
-     ...
--    SyntaxError: can...t assign to function call
-+    SyntaxError: can...t assign to function call...
- 
-     sage: f(1,2)=3
-     Traceback (most recent call last):
-     ...
--    SyntaxError: can...t assign to function call
-+    SyntaxError: can...t assign to function call...
- 
-     sage: f(1,2)=x
-     Traceback (most recent call last):
-     ...
--    SyntaxError: can...t assign to function call
-+    SyntaxError: can...t assign to function call...
- 
-     sage: f(x,2)=x
-     Traceback (most recent call last):
-     ...
--    SyntaxError: can...t assign to function call
-+    SyntaxError: can...t assign to function call...
- """
- 
- import sage.rings.abc
-diff --git a/src/sage/tests/cmdline.py b/src/sage/tests/cmdline.py
-index 4f16b0e..ba5aa14 100644
---- a/src/sage/tests/cmdline.py
-+++ b/src/sage/tests/cmdline.py
-@@ -766,6 +766,7 @@ def test_executable(args, input="", timeout=100.0, pydebug_ignore_warnings=False
-             rfd.append(fderr)
-         if len(rfd) == 0:
-             break
-+        timeout = float(timeout)
-         rlist = select.select(rfd, [], [], timeout)[0]
- 
-         if len(rlist) == 0:
+@@ -104,7 +104,7 @@ def build_many(target, args, processes=None):
+         ....:         # Task 4 is a poison pill
+         ....:         os.kill(os.getpid(), signal.SIGKILL)
+         ....:     else:
+-        ....:         time.sleep(0.5)
++        ....:         time.sleep(float(0.5))
+         ....:         print('Processed task %s' % N)
+         ....:
+         sage: build_many(target, range(8), processes=8)
 diff --git a/src/setup.cfg.m4 b/src/setup.cfg.m4
-index 16f88f2..b8bd0c0 100644
+index 5c866c8..d2012aa 100644
 --- a/src/setup.cfg.m4
 +++ b/src/setup.cfg.m4
 @@ -26,7 +26,7 @@ classifiers =