Merge tag '9.7.beta6' into t/33817/gh_actions__add_test_of_the_modula…

…rized_distributions

SageMath version 9.7.beta6, Release Date: 2022-07-24

.github/workflows/build.yml

@@ -4,6 +4,15 @@ on:
  push:
  workflow_dispatch:
  # Allow to run manually
+ inputs:
+ platform:
+ description: 'Platform'
+ required: true
+ default: 'ubuntu-focal-standard'
+ docker_tag:
+ description: 'Docker tag'
+ required: true
+ default: 'dev'
 
 concurrency:
  # Cancel previous runs of this workflow for the same branch
@@ -13,7 +22,7 @@ concurrency:
 jobs:
  build:
  runs-on: ubuntu-latest
- container: ghcr.io/sagemath/sage/sage-docker-ubuntu-focal-standard-with-targets:dev
+ container: ghcr.io/sagemath/sage/sage-docker-${{ github.event.inputs.platform || 'ubuntu-focal-standard' }}-with-targets:${{ github.event.inputs.docker_tag || 'dev'}}
  steps:
  - name: Checkout
  id: checkout
@@ -23,10 +32,16 @@ jobs:
  id: prepare
  run: |
  # Install test tools.
- # Installation of python3-venv can be removed as soon as a
- # base image with a release including #33822 is available
- apt-get update
- apt-get install -y git python3-venv
+ if apt-get update && apt-get install -y git python3-venv; then
+ # Debian-specific temporary code:
+ # Installation of python3-venv can be removed as soon as a
+ # base image with a release including #33822 is available
+ :
+ else
+ export PATH="build/bin:$PATH"
+ eval $(sage-print-system-package-command auto update)
+ eval $(sage-print-system-package-command auto --spkg --yes --no-install-recommends install git)
+ fi
  # Reuse built SAGE_LOCAL contained in the Docker image 
  ./bootstrap
  ./configure --enable-build-as-root --prefix=/sage/local --with-sage-venv --enable-editable --enable-download-from-upstream-url

.github/workflows/lint.yml

@@ -36,3 +36,19 @@ jobs:
  run: pip install tox relint
  - name: Lint using relint
  run: tox -e relint src/sage/
+ lint-rst:
+ name: Validate docstring markup as RST
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v2
+ - name: Set up Python
+ uses: actions/setup-python@v2
+ with:
+ python-version: 3.8
+ - name: Install tox
+ run: pip install tox
+ - name: Lint using tox -e rst
+ run: tox -e rst
+ # Until all errors are fixed:
+ continue-on-error: true

.zenodo.json

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

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.7.beta5, Release Date: 2022-07-10
+SageMath version 9.7.beta6, Release Date: 2022-07-24

bootstrap-conda

@@ -45,7 +45,7 @@ for PKG_BASE in $(sage-package list --has-file distros/conda.txt); do
  fi
  fi
 done
-echo >&2 $0:$LINENO: generate conda enviroment files
+echo >&2 $0:$LINENO: generate conda environment files
 echo "name: sage-build" > environment.yml
 echo "channels:" >> environment.yml
 echo " - conda-forge" >> environment.yml

build/bin/sage-logger

@@ -79,7 +79,7 @@ if [ -n "$SAGE_SILENT_BUILD" -a ${use_prefix} = true ]; then
  status=$?
  if [[ $status != 0 ]]; then
  echo " [$logname] error installing, exit status $status. End of log file:"
- tail -n 40 "$logfile" | sed "/Please email sage-devel/,$ d;s;^; [$logname] ;" >&2
+ tail -n 72 "$logfile" | sed "/Please email sage-devel/,$ d;s;^; [$logname] ;" >&2
  echo " [$logname] Full log file: $logfile"
  else
  echo " [$logname] successfully installed."

build/bin/sage-sdist

@@ -25,11 +25,11 @@ if [ $# -gt 1 ]; then
 fi
 
 if [ -z "$SAGE_ROOT" ]; then
- die "must be run from within a Sage enviroment, or with SAGE_ROOT provided"
+ die "must be run from within a Sage environment, or with SAGE_ROOT provided"
 fi
 
 if [ -z "$SAGE_SRC" ]; then
- die "must be run from within a Sage enviroment, or with SAGE_SRC provided"
+ die "must be run from within a Sage environment, or with SAGE_SRC provided"
 fi
 
 if [ "$#" -gt 0 ]; then

build/make/Makefile.in

@@ -625,17 +625,19 @@ $(1)-$(4)-no-deps:
  SAGE_INST_LOCAL=$$($(4)) \
  sage-logger -p '$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-install' '$$(SAGE_LOGS)/$(1)-$(2).log' && \
  touch "$$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2)"; \
- else \
+ else ( \
  echo; \
- echo "Error: $(1) is a dummy script package that the Sage distribution uses"; \
+ echo "Note: $(1) is a dummy script package that the Sage distribution uses"; \
  echo "to provide information about equivalent system packages."; \
  echo "It cannot be installed using the Sage distribution."; \
  echo "Please install it manually, for example using the system packages"; \
  echo "recommended at the end of a run of './configure'"; \
  echo "See below for package-specific information."; \
  echo; \
  $$(SAGE_ROOT)/build/bin/sage-spkg-info $(1); \
- exit 1; \
+ echo; \
+ echo "Error: $(1) is a dummy script package and "; \
+ echo "cannot be installed using the Sage distribution." ) | sage-logger -p 'cat; exit 1' '$$(SAGE_LOGS)/$(1)-$(2).log'; \
  fi
 
 $(1)-no-deps: $(1)-$(4)-no-deps

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=b5a2cfbb85e9d1afd3c151429525944f1e0ca84f
-md5=8cf9a8e717fe11a7c6fb7aa41975a7a1
-cksum=2226307451
+sha1=7df04dc0c2e0d7cdfd767dfb86dd3a60d3af1767
+md5=f8e92133f5447c39196fc45a026ed49d
+cksum=1963708627

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-413ff13c54c4738b14d64eb7e7e6b2d06439d12c
+e3ababd22689e7cc6e89a01b1e8bd6d770e7b1cf

build/pkgs/giac/checksums.ini

@@ -1,5 +1,5 @@
 tarball=giac-VERSION.tar.bz2
-sha1=b0e81969eb2527964efc802bf35c31d140031571
-md5=f8253082e5dcde5724b4d6f2300d8669
-cksum=3973759340
-upstream_url=https://trac.sagemath.org/raw-attachment/ticket/31562/giac-VERSION.tar.bz2
+sha1=78c15badd19b49b7d111ac204b611a4378ce3d15
+md5=8fbd43a5c60848b6813b7fc8698a0199
+cksum=1923149665
+upstream_url=https://trac.sagemath.org/raw-attachment/ticket/31563/giac-VERSION.tar.bz2

build/pkgs/giac/dependencies

@@ -1,4 +1,4 @@
-readline libpng $(MP_LIBRARY) mpfr mpfi ntl gsl pari glpk curl cliquer $(findstring libnauty,$(OPTIONAL_INSTALLED_PACKAGES))
+readline libpng $(MP_LIBRARY) mpfr mpfi ntl gsl pari glpk curl cliquer ecm $(findstring libnauty,$(OPTIONAL_INSTALLED_PACKAGES))
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/giac/package-version.txt

@@ -1 +1 @@
-1.6.0.47p3.p0
+1.9.0.15p0

build/pkgs/giac/patches/0001-src-global.cc-Do-not-send-SIGINT-to-process-1.patch

@@ -11,10 +11,10 @@ diff --git a/src/global.cc b/src/global.cc
 index c343aea..87e4575 100755
 --- a/src/global.cc
 +++ b/src/global.cc
-@@ -1978,7 +1978,7 @@ extern "C" void Sleep(unsigned int miliSecond);
+@@ -3762,7 +3762,7 @@ extern "C" void Sleep(unsigned int miliSecond);
  void ctrl_c_signal_handler(int signum){
  ctrl_c=true;
- #if !defined KHICAS && !defined NSPIRE_NEWLIB && !defined WIN32 && !defined BESTA_OS && !defined NSPIRE && !defined FXCG && !defined POCKETCAS
+ #if !defined KHICAS && !defined NSPIRE_NEWLIB && !defined WIN32 && !defined BESTA_OS && !defined NSPIRE && !defined FXCG && !defined POCKETCAS && !defined __MINGW_H
 - if (child_id)
 + if (child_id && child_id != 1)
  kill(child_id,SIGINT);

build/pkgs/giac/patches/autotools/giac-1.5.0.87-gsl_lapack.patch

@@ -73,10 +73,10 @@ index b5dd325..d45b553 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -14,6 +14,8 @@ libgiac_la_SOURCES = input_lexer.ll sym2poly.cc gausspol.cc threaded.cc \
- help.cc lpsolve.cc optimization.cc signalprocessing.cc \
- graphe.cc graphtheory.cc nautywrapper.c markup.cc kdisplay.cc kadd.cc # Ugh..
+ caseval.c cutils.c graphic.c libbf.c libregexp.c libunicode.c \
+ qjsgiac.c quickjs.c quickjs-libc.c js.c
 
--libgiac_la_LIBADD = $(NTL_LIBS) $(COCOA_LIBS) $(PARI_LIBS) $(GSL_LIBS)
+-libgiac_la_LIBADD = $(NTL_LIBS) $(COCOA_LIBS) $(PARI_LIBS) $(GSL_LIBS) 
 +libgiac_la_LIBADD = $(NTL_LIBS) $(COCOA_LIBS) $(PARI_LIBS) $(GSL_LIBS) $(LAPACK_LIBS) $(BLAS_LIBS)
 +
 +AM_LDFLAGS = -no-undefined

build/pkgs/giac/patches/macos-ifactor.patch

@@ -1,12 +1,11 @@
 --- a/src/ifactor.cc 2014-10-11 16:29:01.000000000 +0200
 +++ b/src/ifactor.cc 2014-10-11 16:29:28.000000000 +0200
-@@ -4007,7 +4007,7 @@
+@@ -4034,7 +4034,4 @@
  #endif
  #ifdef HAVE_LIBPARI
- #ifdef __APPLE__
-- return vecteur(1,gensizeerr(gettext("(Mac OS) Large number, you can try pari(); pari_factor(")+n0.print(contextptr)+")"));
-+ // return vecteur(1,gensizeerr(gettext("(Mac OS) Large number, you can try pari(); pari_factor(")+n0.print(contextptr)+")"));
- #endif
- gen g(pari_ifactor(n0),contextptr); 
- if (g.type==_VECT){
-
+ if (ifactor_pari){
+-#ifdef __APPLE__
+- return vecteur(1,gensizeerr(gettext("(Mac OS) Large number, you can try pari(); pari_factor(")+n0.print(contextptr)+")"));
+-#endif
+ gen g(pari_ifactor(n0),contextptr); 
+ if (g.type==_VECT){

build/pkgs/giac/spkg-install.in

@@ -16,6 +16,9 @@ if [ `uname -m` = "ppc64" ]; then
  CPPFLAGS="-Dx86_64 $CPPFLAGS"
 fi
 
+# #31563: Kick the can down the road
+CPPFLAGS="-DUSE_OBJET_BIDON=1 $CPPFLAGS"
+
 # Using pari in a C++17 file with "using namespace std doesn't
 # work due to a conflict between std::rank and pari's rank
 # -std=c++17 is in the default flags on conda;
@@ -53,7 +56,7 @@ if [ "$UNAME" = "CYGWIN" ]; then
  export ac_cv_header_nauty_naututil_h=no
 fi
 
-sdh_configure --disable-gui --disable-ao "$DISABLENLS" --enable-png=no --disable-samplerate --disable-static --disable-micropy
+sdh_configure --disable-gui --disable-ao "$DISABLENLS" --enable-png=no --disable-samplerate --disable-static --disable-micropy --disable-quickjs
 
 #############################################################
 # Build

build/pkgs/giac/spkg-src

@@ -13,9 +13,9 @@ fi
 # Exit on failure
 set -e
 
-VERSION="1.6.0"
-VERSIONREV="47"
-PATCHSUFFIX="p3"
+VERSION="1.9.0"
+VERSIONREV="15"
+PATCHSUFFIX="p0"
 
 # The upstream tarball name is: giac"$SOURCEORIG".tar.gz
 SOURCEORIG=_"$VERSION"-"$VERSIONREV"
@@ -49,6 +49,9 @@ mv giac-"$VERSION" src
 # remove unnecessary files
 rm -rf src/doc/pari/*.html
 
+rm -f src/doc/*.wasm src/doc/*.js
+sed -E -i.bak '/XCASHTML/s/[^ ]*[.](wasm|js)//g' src/doc/Makefile.am
+
 # removing french html doc, but keep keywords, and working makefiles.
 # NB: the french html doc is huge and not GPL.
 # it is freely redistributable only for non commercial purposes.

m4/ppl.m4

@@ -180,7 +180,7 @@ main() {
  << "\n*** was found! If ppl-config was correct, then it is best"
  "\n*** to remove the old version of PPL."
  " You may also be able to fix the error"
- "\n*** by modifying your LD_LIBRARY_PATH enviroment variable,"
+ "\n*** by modifying your LD_LIBRARY_PATH environment variable,"
  " or by editing"
  "\n*** /etc/ld.so.conf."
  " Make sure you have run ldconfig if that is"
@@ -224,7 +224,7 @@ main() {
  " variable to point"
  "\n*** to the correct copy of ppl-config. (In this case,"
  " you will have to"
- "\n*** modify your LD_LIBRARY_PATH enviroment"
+ "\n*** modify your LD_LIBRARY_PATH environment"
  " variable or edit /etc/ld.so.conf"
  "\n*** so that the correct libraries are found at run-time.)"
  << endl;

pkgs/sage-conf/VERSION.txt

@@ -1 +1 @@
-9.7.beta5
+9.7.beta6

pkgs/sage-conf_pypi/VERSION.txt

@@ -1 +1 @@
-9.7.beta5
+9.7.beta6

pkgs/sage-docbuild/VERSION.txt

@@ -1 +1 @@
-9.7.beta5
+9.7.beta6

pkgs/sage-setup/VERSION.txt

@@ -1 +1 @@
-9.7.beta5
+9.7.beta6

pkgs/sage-sws2rst/VERSION.txt

@@ -1 +1 @@
-9.7.beta5
+9.7.beta6

pkgs/sagemath-categories/VERSION.txt

@@ -1 +1 @@
-9.7.beta5
+9.7.beta6

pkgs/sagemath-environment/VERSION.txt

@@ -1 +1 @@
-9.7.beta5
+9.7.beta6

pkgs/sagemath-objects/VERSION.txt

@@ -1 +1 @@
-9.7.beta5
+9.7.beta6

pkgs/sagemath-repl/VERSION.txt

@@ -1 +1 @@
-9.7.beta5
+9.7.beta6

src/VERSION.txt

@@ -1 +1 @@
-9.7.beta5
+9.7.beta6

src/bin/sage-env

@@ -200,7 +200,7 @@ fi
 
 
 if [ 1 = 2 ]; then
- echo "The following enviroment variables can be set by the user"
+ echo "The following environment variables can be set by the user"
  echo "AR The archiver (e.g. ar, /usr/ccs/bin/ar or /usr/bin/ar)"
  echo "AS The assembler (e.g. as, /usr/ccs/bin/as or /usr/bin/as)"
  echo "CC The C compiler (e.g cc, /opt/SUNWspro/bin/cc or /usr/bin/gcc)"
@@ -217,10 +217,10 @@ if [ 1 = 2 ]; then
  echo "SHAREDFLAGS Flag(s) necessary for building a shared library (e.g. -fPIC or -xcode=pic32)"
  echo "We attempt to set this to sensible values, but check below to"
  echo "ensure they are OK. If you wish to override any then please use:"
- echo "setenv NAME_OF_ENVIROMENT_VARIABLE value_of_enviroment_variable"
+ echo "setenv NAME_OF_ENVIRONMENT_VARIABLE value_of_environment_variable"
  echo "(if you use tcsh, csh or a similar shell) or"
- echo "NAME_OF_ENVIROMENT_VARIABLE value_of_enviroment_variable"
- echo "export NAME_OF_ENVIROMENT_VARIABLE"
+ echo "NAME_OF_ENVIRONMENT_VARIABLE value_of_environment_variable"
+ echo "export NAME_OF_ENVIRONMENT_VARIABLE"
  echo "if you use sh, bash or a similar shell"
 fi
 

src/bin/sage-update-version

@@ -22,11 +22,11 @@ if [ $# -ne 1 ]; then
 fi
 
 if [ -z "$SAGE_ROOT" ]; then
- die "must be run from within a Sage enviroment, or with SAGE_ROOT provided"
+ die "must be run from within a Sage environment, or with SAGE_ROOT provided"
 fi
 
 if [ -z "$SAGE_SRC" ]; then
- die "must be run from within a Sage enviroment, or with SAGE_SRC provided"
+ die "must be run from within a Sage environment, or with SAGE_SRC provided"
 fi
 
 set -e

src/bin/sage-version.sh

@@ -1,5 +1,5 @@
 # Sage version information for shell scripts
 # This file is auto-generated by the sage-update-version script, do not edit!
-SAGE_VERSION='9.7.beta5'
-SAGE_RELEASE_DATE='2022-07-10'
-SAGE_VERSION_BANNER='SageMath version 9.7.beta5, Release Date: 2022-07-10'
+SAGE_VERSION='9.7.beta6'
+SAGE_RELEASE_DATE='2022-07-24'
+SAGE_VERSION_BANNER='SageMath version 9.7.beta6, Release Date: 2022-07-24'