Merge branch 'develop' into ruff_misc_UP

Author: fchapoton

.github/workflows/ci-conda.yml

@@ -21,8 +21,6 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     strategy:
-      fail-fast: ${{ github.event_name == 'pull_request' }}
-      max-parallel: ${{ github.event_name == 'pull_request' && 2 || 6 }}
       matrix:
         os: [ubuntu-latest, macos-latest]
         python: ['3.9', '3.10', '3.11']

.github/workflows/cygwin.yml

@@ -8,7 +8,6 @@ fi
 # Show all tar files
 ls -l $*
 
-# Cygwin note: We specifically use the cygwin tar so that symlinks are saved/restored correctly on Windows.
 for a in $*; do
     echo Extracting $a
     (cd / && tar xf -) < $a
@@ -33,10 +32,3 @@ fi
 
 # Show how we are doing on free space.
 df -h
-
-# Rebase!
-case "$(uname)" in
-    CYGWIN*)
-        exec src/bin/sage-rebase.sh --all "$SAGE_LOCAL"
-        ;;
-esac

.github/workflows/extract-sage-local.sh

@@ -4,8 +4,8 @@ title: SageMath
 abstract: SageMath is a free open-source mathematics software system.
 authors:
 - name: "The SageMath Developers"
-version: 10.3.beta1
+version: 10.3.beta2
 doi: 10.5281/zenodo.593563
-date-released: 2023-12-10
+date-released: 2023-12-13
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"

CITATION.cff

@@ -1,35 +1,28 @@
+<div>
 <a href="https://sagemath.org">
   <picture>
     <source media="(prefers-color-scheme: dark)" srcset="src/doc/common/static/logo_sagemath_white.svg">
     <img src="src/doc/common/static/logo_sagemath_black.svg" height="60" align="left">
   </picture>
 </a>
+   <em>"Creating a Viable Open Source Alternative to
+   Magma, Maple, Mathematica, and MATLAB"</em>
+</div>
 
-# Sage: Open Source Mathematical Software
+#
 
->   "Creating a Viable Open Source Alternative to
->   Magma, Maple, Mathematica, and MATLAB"
-
->   Copyright (C) 2005-2023 The Sage Development Team
-
-https://www.sagemath.org
-
-[Sage Documentation](https://doc.sagemath.org/html/en/index.html)
-
-The Sage Library is free software released under the
-GNU General Public Licence GPLv2+, and included packages
-have [compatible software licenses](./COPYING.txt).
-[Over 800 people](https://www.sagemath.org/development-map.html)
-have contributed code to Sage. In many cases, documentation
-for modules and functions list the authors.
+Sage is open source mathematical software released under the GNU General Public
+Licence GPLv2+, and includes packages that have [compatible software licenses](./COPYING.txt).
+[People all around the globe](https://www.sagemath.org/development-map.html) have contributed to the
+development of Sage. [Full documentation](https://doc.sagemath.org/html/en/index.html) is available online.
 
 Table of Contents
 -----------------
 
 * [Getting Started](#getting-started)
 * [Supported Platforms](#supported-platforms)
-* [\[Windows\] Preparing the Platform Libraries](#windows-preparing-the-platform)
-* [\[macOS\] Preparing the Platform Libraries](#macos-preparing-the-platform)
+* [\[Windows\] Preparing the Platform](#windows-preparing-the-platform)
+* [\[macOS\] Preparing the Platform](#macos-preparing-the-platform)
 * [Instructions to Build from Source](#instructions-to-build-from-source)
 * [SageMath Docker Images](#sagemath-docker-images)
 * [Troubleshooting](#troubleshooting)
@@ -44,6 +37,14 @@ Table of Contents
 Getting Started
 ---------------
 
+Those who are impatient may use prebuilt Sage available online from any of
+
+[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/sagemath/sage-binder-env/master
+) &nbsp; [![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/sagemath/sage/tree/master
+) &nbsp; [![Open in GitHub Codespaces](https://img.shields.io/badge/Open_in_GitHub_Codespaces-black?logo=github)](https://codespaces.new/sagemath/sage/tree/master)
+
+without local installation. Otherwise read on.
+
 The [Sage Installation Guide](https://doc.sagemath.org/html/en/installation/index.html)
 provides a decision tree that guides you to the type of installation
 that will work best for you. This includes building from source,
@@ -81,7 +82,7 @@ The preferred way to run Sage on Windows is using the [Windows Subsystem for
 Linux](https://docs.microsoft.com/en-us/windows/wsl/faq), a.k.a. WSL, which allows
 you to install a standard Linux distribution such as Ubuntu within
 your Windows. Make sure you allocate WSL sufficient RAM; 5GB is known to work, while
-2GB might be not enough for building Sage from source. 
+2GB might be not enough for building Sage from source.
 Then all instructions for installation in Linux apply.
 
 As an alternative, you can also run Linux on Windows using Docker ([see
@@ -90,26 +91,13 @@ below](#sagemath-docker-images)) or other virtualization solutions.
 [macOS] Preparing the Platform
 ------------------------------
 
-If your Mac uses the Apple Silicon (M1, M2, arm64) architecture:
-
-- If you set up your Mac by transferring files from an older Mac, make sure
+- If your Mac uses the Apple Silicon (M1, M2, M3; arm64) architecture and
+  you set up your Mac by transferring files from an older Mac, make sure
   that the directory ``/usr/local`` does not contain an old copy of Homebrew
   (or other software) for the x86_64 architecture that you may have copied
   over.  Note that Homebrew for the M1 is installed in ``/opt/homebrew``, not
   ``/usr/local``.
 
-- If you wish to use conda, please see the [section on
-  conda](https://doc.sagemath.org/html/en/installation/conda.html) in the Sage
-  Installation Manual for guidance.
-
-- Otherwise, using Homebrew ("the missing package manager for macOS") from
-  https://brew.sh/ required because it provides a version of ``gfortran`` with
-  necessary changes for this platform that are not in a released upstream
-  version of GCC. (The ``gfortran`` package that comes with the Sage
-  distribution is not suitable for the M1/M2.)
-
-If your Mac uses the Intel (x86_64) architecture:
-
 - If you wish to use conda, please see the [section on
   conda](https://doc.sagemath.org/html/en/installation/conda.html) in the Sage
   Installation Manual for guidance.
@@ -428,18 +416,18 @@ in the Installation Guide.
     or JupyterLab installation, as described in [section
     "Launching SageMath"](https://doc.sagemath.org/html/en/installation/launching.html)
     in the installation manual.
-    
+
 Alternative Installation using PyPI
 ---------------
 
 For installation of `sage` in python using `pip` you need to install `sagemath-standard`. First, activate your python virtual environment and follow these steps:
 
             $ python3 -m pip install sage_conf
             $ ls $(sage-config SAGE_SPKG_WHEELS)
-            $ python3 -m pip install $(sage-config SAGE_SPKG_WHEELS)/*.whl 
+            $ python3 -m pip install $(sage-config SAGE_SPKG_WHEELS)/*.whl
             $ python3 -m pip install sagemath-standard
 
-You need to install `sage_conf`, a wheelhouse of various python packages. You can list the wheels using `ls $(sage-config SAGE_SPKG_WHEELS)`. After manual installation of these wheels, you can install the sage library, `sagemath-standard`. 
+You need to install `sage_conf`, a wheelhouse of various python packages. You can list the wheels using `ls $(sage-config SAGE_SPKG_WHEELS)`. After manual installation of these wheels, you can install the sage library, `sagemath-standard`.
 
 **NOTE:** You can find `sage` and `sagemath` pip packages but with these packages, you will encounter `ModuleNotFoundError`.
 
@@ -647,3 +635,11 @@ Sources are in unmodified (as far as possible) tarballs in the
 information, patches, and build scripts are in the accompanying
 `build/pkgs/<packagename>` directory. This directory is
 part of the Sage git repository.
+
+<p align="center">
+   Copyright (C) 2005-2023 The Sage Development Team
+</p>
+<p align="center">
+   https://www.sagemath.org
+</p>
+

README.md

@@ -1 +1 @@
-SageMath version 10.3.beta1, Release Date: 2023-12-10
+SageMath version 10.3.beta2, Release Date: 2023-12-13

VERSION.txt

@@ -92,7 +92,7 @@ EOF
         if test -f "$DIR/requirements.txt"; then
             SPKG_SOURCE=pip
         elif test ! -f "$DIR/checksums.ini"; then
-            if test -f "$DIR/spkg-install"; then
+            if test -f "$DIR/spkg-install" -o -f "$DIR/spkg-install.in"; then
                 SPKG_SOURCE=script
             else
                 # a dummy package

bootstrap

@@ -10,8 +10,8 @@
 # the root of the package source.
 #
 # An optional patch subdirectory may be specified with the -d flag.
-# For example `sage-apply-patches -d cygwin` applies only those
-# patches under <patch-dir>/cygwin.
+# For example `sage-apply-patches -d macos` applies only those
+# patches under <patch-dir>/macos.
 #
 # The -p<num> arg is the argument accepted by the `patch` command,
 # and overrides the default -p1

build/bin/sage-apply-patches

@@ -37,7 +37,7 @@ SAGE_ORIG_PATH=${NEW_PATH%%':'}
 
 # Trac #30177: Also check for hashlib.sha1 to guard against broken python2
 # from old homebrew installations.  Also check whether the current directory
-# is accessible by this python; this is to guard on Cygwin against Pythons
+# is accessible by this python; this is to guard on WSL against Pythons
 # installed somewhere else in Windows.
 
 # Trac #29285: Do not accept pythons that manipulate PATH, such as

build/bin/sage-bootstrap-python

@@ -170,16 +170,9 @@ sdh_configure() {
     if [ -z "$CONFIG_SHELL" ]; then
         export CONFIG_SHELL=`command -v bash`
     fi
-    if [ "$UNAME" = "CYGWIN" ]; then
-        # TODO: To use --disable-static for all packages on Cygwin, need
-        # #30814: Cygwin: Fix remaining packages to build shared libraries, using AM_LDFLAGS=-no-undefined
-        DISABLE_STATIC=
-    else
-        DISABLE_STATIC=--disable-static
-    fi
-    ./configure --prefix="$SAGE_INST_LOCAL" --libdir="$SAGE_INST_LOCAL/lib" $DISABLE_STATIC --disable-maintainer-mode --disable-dependency-tracking "$@"
+    ./configure --prefix="$SAGE_INST_LOCAL" --libdir="$SAGE_INST_LOCAL/lib" --disable-static --disable-maintainer-mode --disable-dependency-tracking "$@"
     if [ $? -ne 0 ]; then # perhaps it is a non-autoconf'd project
-      ./configure --prefix="$SAGE_INST_LOCAL" --libdir="$SAGE_INST_LOCAL/lib" $DISABLE_STATIC "$@"
+      ./configure --prefix="$SAGE_INST_LOCAL" --libdir="$SAGE_INST_LOCAL/lib" --disable-static "$@"
       if [ $? -ne 0 ]; then
         if [ -f "$(pwd)/config.log" ]; then
             sdh_die <<_EOF_