Merge branch 'develop' into public/symbolics/more_orthogonal_polys-33393

.zenodo.json

@@ -1,10 +1,10 @@
 {
  "description": "Mirror of the Sage https://sagemath.org/ source tree", 
  "license": "other-open", 
- "title": "sagemath/sage: 9.6.beta4", 
- "version": "9.6.beta4", 
+ "title": "sagemath/sage: 9.6.beta5", 
+ "version": "9.6.beta5", 
  "upload_type": "software", 
- "publication_date": "2022-03-08", 
+ "publication_date": "2022-03-12", 
  "creators": [
  {
  "affiliation": "SageMath.org", 
@@ -15,7 +15,7 @@
  "related_identifiers": [
  {
  "scheme": "url", 
- "identifier": "https://github.com/sagemath/sage/tree/9.6.beta4", 
+ "identifier": "https://github.com/sagemath/sage/tree/9.6.beta5", 
  "relation": "isSupplementTo"
  }, 
  {

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.6.beta4, Release Date: 2022-03-08
+SageMath version 9.6.beta5, Release Date: 2022-03-12

build/bin/sage-site

@@ -11,10 +11,6 @@ usage() {
  echo " --info [packages] -- print the SPKG.txt or SPKG.rst of the given packages,"
  echo " and some additional information."
  echo " -i [packages] -- install the given Sage packages"
- echo " --upgrade [version] -- download, build and install the given version. Here,"
- echo " 'version' is a git branch or tag name. Useful values"
- echo " are 'master' (the current development version, this"
- echo " is the default) or a version number like '5.13'."
 }
 
 usage_advanced() {
@@ -64,13 +60,6 @@ usage_advanced() {
  echo " --optional -- list all optional packages that can be installed"
  echo " --standard -- list all standard packages that can be installed"
  echo " --installed -- list all installed packages"
- echo
- echo "Upgrading:"
- echo
- echo " --upgrade [version] -- download, build and install the given version. Here,"
- echo " 'version' is a git branch or tag name. Useful values"
- echo " are 'master' (the current development version, this"
- echo " is the default) or a version number like '5.13'."
 
  echo
  #### 1.......................26..................................................78

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=0fa6909f982efbd452287651f58854ffdce6a588
-md5=80324f006d5a30d741ec34235c0220e0
-cksum=2324005793
+sha1=77a0ccf3c86269794e27c972ccc06d456d519d0b
+md5=ed8dddf6a1e934b4c6e261d3c1789023
+cksum=2861204287

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-b845564e0439f7178a40c8f28983aa039364209b
+4eea45940133fa4c8b0ec028495db0aa5ae767ba

build/pkgs/cython/checksums.ini

@@ -1,5 +1,5 @@
 tarball=Cython-VERSION.tar.gz
-sha1=bda825a34f18c11889562466264e29a8cb0e8806
-md5=1e1edbb3d41e0e5a0eec98288ce113f2
-cksum=169454778
+sha1=0e85468d2af207c19530648cda271d27d03c6894
+md5=0e98543dca816300a27e7d76146a6280
+cksum=3252194174
 upstream_url=https://pypi.io/packages/source/C/Cython/Cython-VERSION.tar.gz

build/pkgs/cython/package-version.txt

@@ -1 +1 @@
-0.29.25
+0.29.28

build/pkgs/fplll/distros/opensuse.txt

@@ -1 +1,3 @@
 "pkgconfig(fplll)"
+fplll-devel
+fplll

build/pkgs/fplll/spkg-configure.m4

@@ -8,8 +8,35 @@ SAGE_SPKG_CONFIGURE([fplll], [
  dnl Trac #31025: FPLLL/FPyLLL make no guarantee regarding compatibility
  dnl other than "whatever versions were released at the same time should work together"
  PKG_CHECK_MODULES([FPLLL],
- [fplll >= 5.4.0 fplll <= 5.4.1],
- [sage_spkg_install_fplll=no],
- [sage_spkg_install_fplll=yes])
+ [fplll >= 5.4.0 fplll <= 5.4.1],
+ [
+ AC_MSG_CHECKING([whether BKZ default strategy JSON is installed])
+ AC_LANG_PUSH([C++])
+ FPLLL_SAVED_LIBS=$LIBS
+ LIBS="$LIBS -lfplll"
+ AC_RUN_IFELSE([
+ AC_LANG_PROGRAM(
+ [[#include <fstream>
+ #include <fplll/fplll.h>
+ #include <fplll/bkz_param.h>
+ ]], [[
+ std::ifstream fs;
+ fs.open(fplll::default_strategy());
+ if (fs) return 0;
+ return 1;
+ ]])], [
+ AC_MSG_RESULT([yes])
+ ], [
+ AC_MSG_RESULT([no])
+ sage_spkg_install_fplll=yes
+ ], [
+ dnl assume that the person running cross-compiling
+ dnl knows what they are doing
+ AC_MSG_RESULT([yes])
+ ])
+ LIBS=$FPLLL_SAVED_LIBS
+ AC_LANG_POP()
+ ],
+ [sage_spkg_install_fplll=yes])
  ])
 ])

build/pkgs/freetype/spkg-configure.m4

@@ -1,7 +1,7 @@
 SAGE_SPKG_CONFIGURE([freetype], [
  SAGE_SPKG_DEPCHECK([gcc libpng], [
  dnl freetype versions are libtool's ones, cf trac #30014
- PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 16.1], [], [sage_spkg_install_freetype=yes])
+ PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 20.0], [], [sage_spkg_install_freetype=yes])
  ])
 ], [], [], [
  if test x$sage_spkg_install_freetype = xyes; then

build/pkgs/ipympl/requirements.txt

@@ -0,0 +1 @@
+ipympl

build/pkgs/jupyter_packaging/dependencies

@@ -1,4 +1,4 @@
-$(PYTHON) packaging | $(PYTHON_TOOLCHAIN)
+$(PYTHON) | $(PYTHON_TOOLCHAIN)
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/jupyter_packaging/requirements.txt

@@ -0,0 +1 @@
+jupyter-packaging

build/pkgs/jupyterlab/dependencies

@@ -1,4 +1,4 @@
-$(PYTHON) vcversioner jupyter_core jupyter_client | $(PYTHON_TOOLCHAIN)
+$(PYTHON) vcversioner jupyter_core jupyter_client jinja2 tornado ipython packaging terminado traitlets nbconvert send2trash nbformat prometheus_client ipython_genutils argon2_cffi pyzmq idna requests jsonschema babel notebook | $(PYTHON_TOOLCHAIN)
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/jupyterlab/requirements.txt

@@ -1 +1 @@
-jupyterlab ~= 2.2.5
+jupyterlab ~= 3.3

build/pkgs/jupyterlab_widgets/dependencies

@@ -1,5 +1,4 @@
-jupyterlab nodejs tornado
+ipympl jupyterlab nodejs tornado $(PYTHON) | $(PYTHON_TOOLCHAIN) jupyter_packaging
 
 ----------
 All lines of this file are ignored except the first.
-It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.

build/pkgs/jupyterlab_widgets/requirements.txt

@@ -0,0 +1 @@
+jupyterlab-widgets

build/pkgs/maxima/spkg-install.in

@@ -77,8 +77,8 @@ if [[ "$SAGE_SPKG_INSTALL_DOCS" = yes ]] ; then
 
  mkdir -p $MAXIMA_FIGURES
 
- # The HTML documentation only uses the GIF figures, not the PDF
+ # The HTML documentation only uses the PNG figures, not the PDF
  # ones.
  cp doc/info/*.html $MAXIMA_DOCS
- cp doc/info/figures/*.gif $MAXIMA_FIGURES
+ cp doc/info/figures/*.png $MAXIMA_FIGURES
 fi

build/pkgs/pillow/checksums.ini

@@ -1,5 +1,5 @@
 tarball=Pillow-VERSION.tar.gz
-sha1=ca8d057aec64ccd0804044bc71c17921afbe2e4e
-md5=7a1eb5a250c7ccbd549a89e16404f09f
-cksum=555919456
+sha1=64243cccc992e4ab60641045775fba65c1cf032b
+md5=8deffccb4f402df154fd2fd504d8487c
+cksum=2485281093
 upstream_url=https://pypi.io/packages/source/p/pillow/Pillow-VERSION.tar.gz

build/pkgs/pillow/package-version.txt

@@ -1 +1 @@
-8.4.0
+9.0.1

build/pkgs/plantri/checksums.ini

@@ -1,4 +1,5 @@
-tarball=plantri-VERSION.tar.bz2
-sha1=4707e4dc2906d3e0d5ab1da85fc9c2b8a5b213e5
-md5=aa05f11d887d1b8ea79fbcec11a313b1
-cksum=2540998353
+tarball=plantri52.tar.gz
+sha1=91efef7b688977158d65b51879d07e691c5b321f
+md5=a042b3da1db2daa346ba8491ae94062b
+cksum=119008801
+upstream_url=https://users.cecs.anu.edu.au/~bdm/plantri/plantri52.tar.gz

build/pkgs/plantri/package-version.txt

@@ -1 +1 @@
-4.5
+5.2

build/pkgs/polymake/checksums.ini

@@ -1,5 +1,5 @@
 tarball=polymake-VERSION-minimal.tar.bz2
-sha1=d50dff3f2124a22563cc468f104c360b81a2c59d
-md5=8785d6fca67ef7becad6600dad0fefaf
-cksum=1451222436
+sha1=fe54e1e099e7e87a12d771c7ea5dd011d12ec8f8
+md5=732deb4a3cb83363448c59ec72b0e2cf
+cksum=1021474111
 upstream_url=https://polymake.org/lib/exe/fetch.php/download/polymake-VERSION-minimal.tar.bz2

build/pkgs/polymake/package-version.txt

@@ -1 +1 @@
-4.5
+4.6

build/pkgs/python3/checksums.ini

@@ -1,5 +1,5 @@
 tarball=Python-VERSION.tar.xz
-sha1=6274e5631c520d75bf1f0a046640fd3996fe99f0
-md5=11d12076311563252a995201248d17e5
-cksum=2273440860
+sha1=e618946549cca1eb0d6d4cdf516003fec3975003
+md5=14e8c22458ed7779a1957b26cde01db9
+cksum=1118621485
 upstream_url=https://www.python.org/ftp/python/VERSION/Python-VERSION.tar.xz

build/pkgs/python3/package-version.txt

@@ -1 +1 @@
-3.9.9
+3.10.2

build/pkgs/python3/patches/0001-bpo-22699-Allow-compiling-on-debian-ubuntu-with-a-di.patch

@@ -12,20 +12,20 @@ patch than given
  1 file changed, 18 insertions(+), 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index 8fb8ea5c47..783d20bdcd 100644
+index 554699608d..d5bbeb90d5 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -663,9 +663,30 @@ def add_multiarch_paths(self):
+@@ -667,9 +667,30 @@ def check_extension_import(self, ext):
+ def add_multiarch_paths(self):
  # Debian/Ubuntu multiarch support.
  # https://wiki.ubuntu.com/MultiarchSpec
- cc = sysconfig.get_config_var('CC')
 - tmpfile = os.path.join(self.build_temp, 'multiarch')
  if not os.path.exists(self.build_temp):
  os.makedirs(self.build_temp)
 +
 + tmpfile_sysroot = os.path.join(self.build_temp, 'sysroot')
 + ret_sysroot = run_command(
-+ '%s -print-sysroot > %s 2> /dev/null' % (cc, tmpfile_sysroot))
++ '%s -print-sysroot > %s 2> /dev/null' % (CC, tmpfile_sysroot))
 +
 + try:
 + if ret_sysroot == 0:
@@ -35,17 +35,17 @@ index 8fb8ea5c47..783d20bdcd 100644
 + # the compiler from debian/ubuntu
 + if sysroot not in ['', '/']:
 + add_dir_to_list(self.compiler.library_dirs,
-+ sysroot + '/usr/lib')
++ sysroot + '/usr/lib/')
 + add_dir_to_list(self.compiler.include_dirs,
-+ sysroot + '/usr/include')
++ sysroot + '/usr/include/')
 + return
 + finally:
 + os.unlink(tmpfile_sysroot)
 +
 + tmpfile = os.path.join(self.build_temp, 'multiarch')
 +
  ret = run_command(
- '%s -print-multiarch > %s 2> /dev/null' % (cc, tmpfile))
+ '%s -print-multiarch > %s 2> /dev/null' % (CC, tmpfile))
  multiarch_path_component = ''
 --- a/setup.py 2021-09-28 23:49:53.193868987 -0700
 +++ b/setup.py 2021-09-28 23:50:13.554098642 -0700

build/pkgs/python3/spkg-configure.m4

@@ -1,7 +1,7 @@
 SAGE_SPKG_CONFIGURE([python3], [
  m4_pushdef([MIN_VERSION], [3.7.0])
  m4_pushdef([MIN_NONDEPRECATED_VERSION], [3.7.0])
- m4_pushdef([LT_STABLE_VERSION], [3.10.0])
+ m4_pushdef([LT_STABLE_VERSION], [3.11.0])
  m4_pushdef([LT_VERSION], [3.11.0])
  AC_ARG_WITH([python],
  [AS_HELP_STRING([--with-python=PYTHON3],

build/pkgs/retrolab/SPKG.rst

@@ -0,0 +1,16 @@
+retrolab: JupyterLab Distribution with a retro look and feel
+============================================================
+
+Description
+-----------
+
+JupyterLab Distribution with a retro look and feel
+
+License
+-------
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/retrolab/
+

build/pkgs/retrolab/dependencies

@@ -0,0 +1,4 @@
+$(PYTHON) jupyterlab | $(PYTHON_TOOLCHAIN)
+
+----------
+All lines of this file are ignored except the first.

build/pkgs/retrolab/requirements.txt

@@ -0,0 +1 @@
+retrolab ~= 0.3

build/pkgs/retrolab/type

@@ -0,0 +1 @@
+optional

build/pkgs/sagelib/package-version.txt

@@ -1 +1 @@
-9.6.beta4
+9.6.beta5