Rebase patches, add pyprimecount dependency

5 files changed, 65 insertions, 171 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 544ada010087..1d724db71265 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.5.beta8.r0.gd6d0edce10
+	pkgver = 9.5.beta9.r0.gc5af19568c
 	pkgrel = 1
 	url = http://www.sagemath.org
 	arch = x86_64
@@ -63,7 +63,7 @@ pkgbase = sagemath-git
 	depends = libbraiding
 	depends = symmetrica
 	depends = threejs-sage
-	depends = primecount
+	depends = python-primecountpy
 	optdepends = cython: to compile cython code
 	optdepends = python-pkgconfig: to compile cython code
 	optdepends = jmol: alternative 3D plot engine
@@ -106,13 +106,12 @@ pkgbase = sagemath-git
 	source = sagemath-linbox-1.7.patch
 	source = sagemath-python3.10.patch
 	sha256sums = SKIP
-	sha256sums = b2308f25c5e6ad330342fc365056d7aebfbba09b833e3be6fb6283061709b6a0
+	sha256sums = eee5fa15d8c7be7e009166dbde3ea24bb10d7793dc12880516f278f86b1a6694
 	sha256sums = 2f310081357996b7d3bf813e63d07c0fc04d6724adbfbd1beeb554e9476e2e4c
 	sha256sums = d1310321bf07491658e83087a6ddb0011738fa17a1dc3275d6d5c6907eaf3df8
-	sha256sums = ede5e054c73eab9aa71285bb3a16c1f2f0e4fdc0d4645fe13912ff9489865bee
+	sha256sums = 8534700f78690a9f1b07df25b281138ed870fdfb70ab4df3818df79d5468ec9f
 	sha256sums = 1f0c44a4998ed239a3d77e3028b98b6f2c28a95e9bb4b8557523cc8f12ffba34
 	sha256sums = eacea27b214d32cb886a75695153dfc36b5bad2fd2517e8e4eee18e74220e9e3
-	sha256sums = 602bf5ff69b81cb72123e9f0b1ce7df1cec0c15b97273e93691c1f11b20cd545
-	sha256sums = 93e563a167431357dde9b8948d3bfa2b7c17873013f80eed83d3c800f38bdcc2
+	sha256sums = b9ca4fb0e3083e73560df5f0aca7e87d7aa8c05eca3eea49c704bcee102919c7
 
 pkgname = sagemath-git
diff --git a/PKGBUILD b/PKGBUILD
index 418d771d74e5..efcd1cddb54a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 # Contributor: Stefan Husmann <stefan-husmann at t-online dot de>
 
 pkgname=sagemath-git
-pkgver=9.5.beta8.r0.gd6d0edce10
+pkgver=9.5.beta9.r0.gc5af19568c
 pkgrel=1
 pkgdesc='Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab'
 arch=(x86_64)
@@ -16,7 +16,7 @@ depends=(palp brial cliquer maxima-ecl gfan sympow nauty python-rpy2 python-fpyl
   python-matplotlib python-scipy python-sympy python-networkx python-pplpy python-sphinx python-ipywidgets python-memory-allocator
   gap flintqs lcalc lrcalc arb eclib zn_poly gd python-cvxopt singular linbox m4rie pari-galdata pari-seadata-small planarity rankwidth tachyon
   sage-data-combinatorial_designs sage-data-elliptic_curves sage-data-graphs sage-data-polytopes_db sage-data-conway_polynomials
-  iml giac libhomfly libbraiding symmetrica threejs-sage primecount)
+  iml giac libhomfly libbraiding symmetrica threejs-sage python-primecountpy)
 optdepends=('cython: to compile cython code'
   'python-pkgconfig: to compile cython code'
   'jmol: alternative 3D plot engine'
@@ -58,14 +58,13 @@ source=(git://git.sagemath.org/sage.git#branch=develop
         sagemath-linbox-1.7.patch
         sagemath-python3.10.patch)
 sha256sums=('SKIP'
-            'b2308f25c5e6ad330342fc365056d7aebfbba09b833e3be6fb6283061709b6a0'
+            'eee5fa15d8c7be7e009166dbde3ea24bb10d7793dc12880516f278f86b1a6694'
             '2f310081357996b7d3bf813e63d07c0fc04d6724adbfbd1beeb554e9476e2e4c'
             'd1310321bf07491658e83087a6ddb0011738fa17a1dc3275d6d5c6907eaf3df8'
-            'ede5e054c73eab9aa71285bb3a16c1f2f0e4fdc0d4645fe13912ff9489865bee'
+            '8534700f78690a9f1b07df25b281138ed870fdfb70ab4df3818df79d5468ec9f'
             '1f0c44a4998ed239a3d77e3028b98b6f2c28a95e9bb4b8557523cc8f12ffba34'
             'eacea27b214d32cb886a75695153dfc36b5bad2fd2517e8e4eee18e74220e9e3'
-            '602bf5ff69b81cb72123e9f0b1ce7df1cec0c15b97273e93691c1f11b20cd545'
-            '93e563a167431357dde9b8948d3bfa2b7c17873013f80eed83d3c800f38bdcc2')
+            'b9ca4fb0e3083e73560df5f0aca7e87d7aa8c05eca3eea49c704bcee102919c7')
 options=(debug !strip)
 
 pkgver() {
diff --git a/sagemath-lrcalc2.patch b/sagemath-lrcalc2.patch
index 8057508f4d07..48fb8fc44a8b 100644
--- a/sagemath-lrcalc2.patch
+++ b/sagemath-lrcalc2.patch
@@ -1,5 +1,5 @@
 diff --git a/build/pkgs/lrcalc/checksums.ini b/build/pkgs/lrcalc/checksums.ini
-index 7a0e6a1..8b8620b 100644
+index 7a0e6a1b96..8b8620ba52 100644
 --- a/build/pkgs/lrcalc/checksums.ini
 +++ b/build/pkgs/lrcalc/checksums.ini
 @@ -1,4 +1,5 @@
@@ -13,7 +13,7 @@ index 7a0e6a1..8b8620b 100644
 +cksum=2250996027
 +upstream_url=https://sites.math.rutgers.edu/~asbuch/lrcalc/lrcalc-VERSION.tar.gz
 diff --git a/build/pkgs/lrcalc/package-version.txt b/build/pkgs/lrcalc/package-version.txt
-index 92ab342..879b416 100644
+index 92ab3427e8..879b416e60 100644
 --- a/build/pkgs/lrcalc/package-version.txt
 +++ b/build/pkgs/lrcalc/package-version.txt
 @@ -1 +1 @@
@@ -21,7 +21,7 @@ index 92ab342..879b416 100644
 +2.1
 diff --git a/build/pkgs/lrcalc/patches/includes.patch b/build/pkgs/lrcalc/patches/includes.patch
 deleted file mode 100644
-index 707da17..00000000
+index 707da176a6..0000000000
 --- a/build/pkgs/lrcalc/patches/includes.patch
 +++ /dev/null
 @@ -1,90 +0,0 @@
@@ -116,11 +116,14 @@ index 707da17..00000000
 -2.1.1.1.g1fb337f
 -
 diff --git a/build/pkgs/lrcalc/spkg-configure.m4 b/build/pkgs/lrcalc/spkg-configure.m4
-index f2f8b74..da66e31 100644
+index f2f8b74f8f..b8171ce23f 100644
 --- a/build/pkgs/lrcalc/spkg-configure.m4
 +++ b/build/pkgs/lrcalc/spkg-configure.m4
-@@ -2,8 +2,7 @@ SAGE_SPKG_CONFIGURE([lrcalc], [
-     AC_CHECK_HEADERS([lrcalc/schublib.h], [
+@@ -1,9 +1,10 @@
+ SAGE_SPKG_CONFIGURE([lrcalc], [
+-    AC_CHECK_HEADERS([lrcalc/schublib.h], [
++    AC_LANG_PUSH([C])
++    AC_CHECK_HEADERS([lrcalc/schublib.h] [lrcalc/lrcoef.h], [
            AC_SEARCH_LIBS([mult_poly_schubert], [lrcalc], [], [sage_spkg_install_lrcalc=yes])
      ], [sage_spkg_install_lrcalc=yes],
 -    [[#ifndef _HASHTAB_H
@@ -129,9 +132,10 @@ index f2f8b74..da66e31 100644
 +    [[#ifndef _IVECTOR_H
 +      #include <lrcalc/ivector.h>
        #endif]])
++    AC_LANG_POP
  ])
 diff --git a/build/pkgs/lrcalc/spkg-install.in b/build/pkgs/lrcalc/spkg-install.in
-index d6665bf..a863950 100644
+index d6665bfb42..a863950189 100644
 --- a/build/pkgs/lrcalc/spkg-install.in
 +++ b/build/pkgs/lrcalc/spkg-install.in
 @@ -1,9 +1,5 @@
@@ -146,7 +150,7 @@ index d6665bf..a863950 100644
  sdh_make_install
 diff --git a/build/pkgs/lrcalc_python/SPKG.rst b/build/pkgs/lrcalc_python/SPKG.rst
 new file mode 100644
-index 00000000..cff9d7d
+index 0000000000..3a98d556ca
 --- /dev/null
 +++ b/build/pkgs/lrcalc_python/SPKG.rst
 @@ -0,0 +1,22 @@
@@ -163,7 +167,7 @@ index 00000000..cff9d7d
 +License
 +-------
 +
-+GNU General Public License V2+
++GNU General Public License V3
 +
 +
 +Upstream Contact
@@ -174,7 +178,7 @@ index 00000000..cff9d7d
 +https://bitbucket.org/asbuch/lrcalc
 diff --git a/build/pkgs/lrcalc_python/checksums.ini b/build/pkgs/lrcalc_python/checksums.ini
 new file mode 100644
-index 00000000..bdfef87
+index 0000000000..bdfef8711e
 --- /dev/null
 +++ b/build/pkgs/lrcalc_python/checksums.ini
 @@ -0,0 +1,5 @@
@@ -185,7 +189,7 @@ index 00000000..bdfef87
 +upstream_url=https://pypi.io/packages/source/l/lrcalc/lrcalc-VERSION.tar.gz
 diff --git a/build/pkgs/lrcalc_python/dependencies b/build/pkgs/lrcalc_python/dependencies
 new file mode 100644
-index 00000000..63e5177
+index 0000000000..63e5177ae0
 --- /dev/null
 +++ b/build/pkgs/lrcalc_python/dependencies
 @@ -0,0 +1,5 @@
@@ -196,45 +200,45 @@ index 00000000..63e5177
 +It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.
 diff --git a/build/pkgs/lrcalc_python/install-requires.txt b/build/pkgs/lrcalc_python/install-requires.txt
 new file mode 100644
-index 00000000..8b44d97
+index 0000000000..8b44d97f4b
 --- /dev/null
 +++ b/build/pkgs/lrcalc_python/install-requires.txt
 @@ -0,0 +1 @@
 +lrcalc ~=2.1
 diff --git a/build/pkgs/lrcalc_python/package-version.txt b/build/pkgs/lrcalc_python/package-version.txt
 new file mode 100644
-index 00000000..879b416
+index 0000000000..879b416e60
 --- /dev/null
 +++ b/build/pkgs/lrcalc_python/package-version.txt
 @@ -0,0 +1 @@
 +2.1
 diff --git a/build/pkgs/lrcalc_python/spkg-install.in b/build/pkgs/lrcalc_python/spkg-install.in
 new file mode 100644
-index 00000000..deba1bb
+index 0000000000..deba1bb42b
 --- /dev/null
 +++ b/build/pkgs/lrcalc_python/spkg-install.in
 @@ -0,0 +1 @@
 +cd src && sdh_pip_install .
 diff --git a/build/pkgs/lrcalc_python/type b/build/pkgs/lrcalc_python/type
 new file mode 100644
-index 00000000..a6a7b9c
+index 0000000000..a6a7b9cd72
 --- /dev/null
 +++ b/build/pkgs/lrcalc_python/type
 @@ -0,0 +1 @@
 +standard
 diff --git a/build/pkgs/sagelib/dependencies b/build/pkgs/sagelib/dependencies
-index 53b78ff..e2bfab0 100644
+index 1ba845c8f2..cb57fe3859 100644
 --- a/build/pkgs/sagelib/dependencies
 +++ b/build/pkgs/sagelib/dependencies
 @@ -1,4 +1,4 @@
--FORCE $(SCRIPTS) arb boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml jinja2 jupyter_core lcalc lrcalc libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount pycygwin $(PYTHON) ratpoints rw sage_conf singular symmetrica zn_poly $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup
-+FORCE $(SCRIPTS) arb boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml jinja2 jupyter_core lcalc lrcalc_python libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount pycygwin $(PYTHON) ratpoints rw sage_conf singular symmetrica zn_poly $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup
+-FORCE $(SCRIPTS) arb boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml jinja2 jupyter_core lcalc lrcalc libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount primecountpy pycygwin $(PYTHON) ratpoints rw sage_conf singular symmetrica zn_poly $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup
++FORCE $(SCRIPTS) arb boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml jinja2 jupyter_core lcalc lrcalc_python libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount primecountpy pycygwin $(PYTHON) ratpoints rw sage_conf singular symmetrica zn_poly $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup
  
  ----------
  All lines of this file are ignored except the first.
 diff --git a/src/sage/libs/lrcalc/lrcalc.pxd b/src/sage/libs/lrcalc/lrcalc.pxd
 deleted file mode 100644
-index 10b88db..00000000
+index 10b88db93f..0000000000
 --- a/src/sage/libs/lrcalc/lrcalc.pxd
 +++ /dev/null
 @@ -1,77 +0,0 @@
@@ -316,7 +320,10 @@ index 10b88db..00000000
 -cdef extern from "lrcalc/schublib.h":
 -    hashtab* mult_schubert_c "mult_schubert"(vector *sh1, vector *sh2, int rank)
 diff --git a/src/sage/libs/lrcalc/lrcalc.pyx b/src/sage/libs/lrcalc/lrcalc.py
-index b591081..65db959 100644
+similarity index 65%
+rename from src/sage/libs/lrcalc/lrcalc.pyx
+rename to src/sage/libs/lrcalc/lrcalc.py
+index b591081ec4..65db959944 100644
 --- a/src/sage/libs/lrcalc/lrcalc.pyx
 +++ b/src/sage/libs/lrcalc/lrcalc.py
 @@ -187,180 +187,24 @@ AUTHORS:
diff --git a/sagemath-optional-packages.patch b/sagemath-optional-packages.patch
index 4130e8850da6..fa5dd945dccc 100644
--- a/sagemath-optional-packages.patch
+++ b/sagemath-optional-packages.patch
@@ -1,11 +1,11 @@
 diff --git a/pkgs/sagemath-standard/setup.py b/pkgs/sagemath-standard/setup.py
-index 0d7c29d746..fb34cbfd5e 100755
+index 6744236593..a038006449 100755
 --- a/pkgs/sagemath-standard/setup.py
 +++ b/pkgs/sagemath-standard/setup.py
-@@ -75,10 +75,9 @@ if sdist:
- else:
+@@ -81,10 +81,9 @@ else:
+     from sage_setup.optional_extension import is_package_installed_and_updated
      distributions = ['']
-     optional_packages_with_extensions = ['mcqd', 'bliss', 'tdlib', 'primecount',
+     optional_packages_with_extensions = ['mcqd', 'bliss', 'tdlib',
 -                                         'coxeter3', 'fes', 'sirocco', 'meataxe']
 +                                         'coxeter3', 'sirocco', 'meataxe']
      distributions += ['sagemath-{}'.format(pkg)
@@ -13,5 +13,5 @@ index 0d7c29d746..fb34cbfd5e 100755
 -                      if is_package_installed_and_updated(pkg)]
 +                      for pkg in optional_packages_with_extensions]
      log.warn('distributions = {0}'.format(distributions))
- 
- from sage_setup.find import find_python_sources
+     from sage_setup.find import find_python_sources
+     python_packages, python_modules, cython_modules = find_python_sources(
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 =