Merge #33855

Author: Matthias Koeppe

.github/workflows/tox.yml

@@ -169,12 +169,12 @@ jobs:
             2-optional*)     export TARGETS_PRE="build/make/Makefile" TARGETS="build/make/Makefile"
                              targets_pattern="${{ matrix.stage }}"
                              targets_pattern="${targets_pattern#2-optional-}"
-                             export TARGETS_OPTIONAL=$( echo $(export PATH=build/bin:$PATH && (for a in spkg-install.in spkg-install requirements.txt; do sage-package list :optional: --has-file $a --no-file huge --no-file has_nonfree_dependencies; done) | grep -v ^_ | grep -v sagemath_doc | grep '^[${{ matrix.targets_pattern }}]' ) )
+                             export TARGETS_OPTIONAL=$( echo $(export PATH=build/bin:$PATH && (for a in spkg-install.in spkg-install requirements.txt; do sage-package list :optional: --has-file $a --no-file huge --no-file has_nonfree_dependencies; done) | grep -v ^_ | grep -v sagemath_doc | grep "^[$targets_pattern]" ) )
                              ;;
             2-experimental*) export TARGETS_PRE="build/make/Makefile" TARGETS="build/make/Makefile"
                              targets_pattern="${{ matrix.stage }}"
                              targets_pattern="${targets_pattern#2-experimental-}"
-                             export TARGETS_OPTIONAL=$( echo $(export PATH=build/bin:$PATH && (for a in spkg-install.in spkg-install requirements.txt; do sage-package list :experimental: --has-file $a --no-file huge --no-file has_nonfree_dependencies; done) | grep -v ^_ | grep -v sagemath_doc | grep '^[${{ matrix.targets_pattern }}]' ) )
+                             export TARGETS_OPTIONAL=$( echo $(export PATH=build/bin:$PATH && (for a in spkg-install.in spkg-install requirements.txt; do sage-package list :experimental: --has-file $a --no-file huge --no-file has_nonfree_dependencies; done) | grep -v ^_ | grep -v sagemath_doc | grep "^[$targets_pattern]" ) )
                              ;;
           esac
           MAKE="make -j12" tox -e $TOX_ENV -- SAGE_NUM_THREADS=4 $TARGETS

.vscode/launch.json

@@ -8,6 +8,18 @@
             "program": "${file}",
             "console": "integratedTerminal",
             "justMyCode": false
+        },
+        {
+            "name": "Sage: Test",
+            "type": "python",
+            "request": "launch",
+            "program": "${workspaceFolder}/src/bin/sage-runtests",
+            "args": [
+                "--verbose",
+                "${file}"
+            ],
+            "console": "integratedTerminal",
+            "justMyCode": false
         }
     ],
 }

.zenodo.json

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

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.6.rc2, Release Date: 2022-04-25
+SageMath version 9.6, Release Date: 2022-05-15

build/make/Makefile.in

@@ -505,7 +505,7 @@ $(1)-$(4)-no-deps:
 	    echo "$$($(4)_DISABLED_MESSAGE)" 2>&1; \
 	    exit 1; \
 	else \
-	    $(AM_V_at)sage-logger -p 'SAGE_CHECK=$$(SAGE_CHECK_$(1)) PATH=$$($(4))/bin:$$$$PATH $$(SAGE_SPKG) $$(SAGE_SPKG_OPTIONS) \
+	    sage-logger -p 'SAGE_CHECK=$$(SAGE_CHECK_$(1)) PATH=$$($(4))/bin:$$$$PATH $$(SAGE_SPKG) $$(SAGE_SPKG_OPTIONS) \
 		$(if $(filter $(1),$(TOOLCHAIN_DEPS)),--keep-existing) \
 		$(1)-$(2) $$($(4))' '$$(SAGE_LOGS)/$(1)-$(2).log'; \
 	fi
@@ -615,7 +615,7 @@ $(1)-$(4)-no-deps:
 	    echo "$$($(4)_DISABLED_MESSAGE)" 2>&1; \
 	    exit 1; \
 	elif [ -x '$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-install' ]; then \
-	    $(AM_V_at)cd '$$(SAGE_ROOT)/build/pkgs/$(1)' && \
+	    cd '$$(SAGE_ROOT)/build/pkgs/$(1)' && \
 		. '$$(SAGE_ROOT)/src/bin/sage-src-env-config' && \
 		. '$$(SAGE_ROOT)/src/bin/sage-env-config' && \
 		. '$$(SAGE_ROOT)/src/bin/sage-env' && \

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=586eb612f05d0bc8e37e63d6740d7e7104ae10e9
-md5=44f1f222057ebe2bdbb8c9dbf41fc034
-cksum=1590172438
+sha1=f0ab7c18b3a169fdf7238fe8d70f8bce29373ef4
+md5=37b7220d90d9ec624e126ebb12cc8547
+cksum=3498005086

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-9b2069cf00a00d955fc13cf7e3fbf8ea541aec5c
+888d18eb851f892097a0a683c01e3a95db863495

build/pkgs/gcc/checksums.ini

@@ -1,5 +1,5 @@
 tarball=gcc-VERSION.tar.xz
-sha1=fb51ed1660c065898c75951fb38e1ebad7d49feb
-md5=443c15b92614a3ce8f22e3b24ca2226a
-cksum=990531701
+sha1=cf86a48278f9a6f4b03d4390550577b20353b4e9
+md5=4ee3e8c4c99e7b3444eb79f00f5f7a7e
+cksum=215110545
 upstream_url=https://mirrors.kernel.org/gnu/gcc/gcc-VERSION/gcc-VERSION.tar.xz

build/pkgs/gcc/package-version.txt

@@ -1 +1 @@
-10.3.0
+11.3.0

build/pkgs/sage_setup/dependencies

@@ -1,4 +1,4 @@
-$(PYTHON) cython pkgconfig $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/autogen/interpreters/specs/*.py | $(PYTHON_TOOLCHAIN)
+$(PYTHON) cython pkgconfig $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/autogen/interpreters/specs/*.py $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/command/*.py | $(PYTHON_TOOLCHAIN)
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/sagelib/package-version.txt

@@ -1 +1 @@
-9.6.rc2
+9.6

pkgs/sagemath-standard/setup.py

@@ -47,11 +47,12 @@
     from sage_setup.command.sage_build import sage_build
     from sage_setup.command.sage_build_cython import sage_build_cython
     from sage_setup.command.sage_build_ext import sage_build_ext
-    from sage_setup.command.sage_install import sage_install_and_clean
+    from sage_setup.command.sage_install import sage_develop, sage_install_and_clean
 
     cmdclass = dict(build=sage_build,
                     build_cython=sage_build_cython,
                     build_ext=sage_build_ext,
+                    develop=sage_develop,
                     install=sage_install_and_clean)
 
 #########################################################

src/VERSION.txt

@@ -1 +1 @@
-9.6.rc2
+9.6

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.6.rc2'
-SAGE_RELEASE_DATE='2022-04-25'
-SAGE_VERSION_BANNER='SageMath version 9.6.rc2, Release Date: 2022-04-25'
+SAGE_VERSION='9.6'
+SAGE_RELEASE_DATE='2022-05-15'
+SAGE_VERSION_BANNER='SageMath version 9.6, Release Date: 2022-05-15'

src/doc/en/installation/binary.rst

@@ -9,6 +9,7 @@ Linux
 SageMath used to provide pre-built binaries for several Linux flavors.
 This has been discontinued, as most major Linux distributions have
 up-to-date distribution packages providing SageMath.
+See :ref:`sec-GNU-Linux` for information.
 
 
 macOS

src/doc/en/installation/conda.rst

@@ -3,28 +3,37 @@
 Install from conda-forge
 ========================
 
-SageMath can be installed via Conda from the
+SageMath can be installed on Linux and macOS via Conda from the
 `conda-forge <https://conda-forge.org>`_ conda channel.
 
-This works on Linux and macOS on ``x86_64`` processors,
-and on Linux on ``aarch64`` processors (using Miniforge).
+Both the ``x86_64`` (Intel) architecture and the ``arm64``/``aarch64``
+architectures (including Apple Silicon, M1) are supported.
 
-This requires a working Conda installation: either Miniforge, Miniconda
-or Anaconda. If you don't have one yet, we recommend installing
-`Miniforge <https://github.com/conda-forge/miniforge#miniforge3>`_.
+You will need a working Conda installation: either Mambaforge/Miniforge,
+Miniconda or Anaconda. If you don't have one yet, we recommend installing
+`Mambaforge <https://github.com/conda-forge/miniforge#mambaforge>`_ as
+follows. In a terminal,
 
-Miniforge uses conda-forge as the default channel. If you are
-using Miniconda or Anaconda, set it up to use conda-forge:
+.. code-block:: shell
+
+   $ curl -L -O https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-$(uname)-$(uname -m).sh
+   $ sh Mambaforge-$(uname)-$(uname -m).sh
+
+* Mambaforge and Miniforge use conda-forge as the default channel.
+
+* If you are using Miniconda or Anaconda, set it up to use conda-forge:
+
+  * Add the conda-forge channel: ``conda config --add channels conda-forge``
 
-* Add the conda-forge channel: ``conda config --add channels conda-forge``
-* Change channel priority to strict: ``conda config --set channel_priority strict``
+  * Change channel priority to strict: ``conda config --set channel_priority strict``
 
-Optionally, use `mamba <https://github.com/mamba-org/mamba>`_
-which uses a faster dependency solver than `conda`.
+Optionally, use `mamba <https://github.com/mamba-org/mamba>`_,
+which uses a faster dependency solver than ``conda``.
+If you installed Mambaforge, it is already provided. Otherwise, use
 
 .. code-block:: shell
 
-    conda install mamba
+   $ conda install mamba
 
 
 .. _sec-installation-conda-binary:
@@ -36,8 +45,8 @@ Create a new conda environment containing SageMath, either with ``mamba`` or ``c
 
 .. code-block:: shell
 
-    mamba create -n sage sage python=X
-    conda create -n sage sage python=X
+    $ mamba create -n sage sage python=X        # either
+    $ conda create -n sage sage python=X        # or
 
 where ``X`` is version of Python, e.g. ``3.9``.
 

src/doc/en/installation/index.rst

@@ -14,9 +14,10 @@ may have become available afterwards and can be found in the section
 `release tour <https://wiki.sagemath.org/ReleaseTours>`_ for each
 SageMath release.
 
-**Where would you like to run SageMath?**
+**Where would you like to run SageMath?** Pick one of the following sections.
 
-**On Linux:**
+macOS
+=====
 
 - **Do you want to do SageMath development?**
 
@@ -34,27 +35,57 @@ SageMath release.
       these describe an experimental method that gets all required
       packages, including Python packages, from conda-forge.
 
-  - No development: **Do you have root access (sudo)?**
-
-    - **Yes, root access:** Then the easiest way to install SageMath is
-      through a Linux distribution that provides it as a package.  Most
-      major Linux distributions have up-to-date versions of SageMath,
-      see `repology.org: sagemath
-      <https://repology.org/project/sagemath/versions>`_ for an
-      overview.  See :ref:`sec-GNU-Linux` for additional information.
+  - **No development:**
 
-      If you are on an older version of your distribution and a recent
-      version of SageMath is only available on a newer version of the
-      distribution, consider upgrading your distribution.
+    - Install the `binary build of SageMath <https://github.com/3-manifolds/Sage_macOS/releases>`_
+      from the 3-manifolds project.  It is a signed and notarized app, which
+      works for macOS 10.12 and newer. It is completely self-contained and
+      provides the standard Sage distribution together with many optional
+      packages. Additional optional Python packages can be installed with the
+      ``%pip`` magic command and will go into your ``~/.sage`` directory.
 
-    - **No root access:** Install SageMath from the `conda-forge
+    - Alternatively, install SageMath from the `conda-forge
       <https://conda-forge.org/>`_ project, as described in section
       :ref:`sec-installation-conda`.
 
     - Alternatively, build SageMath from source as described in section
       :ref:`sec-installation-from-sources`.
 
-**On macOS:**
+Windows
+=======
+
+- **Do you want to do SageMath development?**
+
+  - **Yes, development:**
+
+    Enable Windows Subsystem for Linux (WSL) by following the
+    `official WSL setup guide
+    <https://docs.microsoft.com/en-us/windows/wsl/install-win10>`_. Be
+    sure to do the steps to install WSL2 and set it as default.
+    Then go to the Microsoft Store and install Ubuntu (or another
+    Linux distribution). Start Ubuntu from the start menu.
+
+    Then follow the instructions for development on Linux below.
+
+  - **No development:**
+
+    - Enable Windows Subsystem for Linux (WSL) by following the
+      `official WSL setup guide
+      <https://docs.microsoft.com/en-us/windows/wsl/install-win10>`_. Be
+      sure to do the steps to install WSL2 and set it as default.
+      Then go to the Microsoft Store and install Ubuntu (or another
+      Linux distribution). Start Ubuntu from the start menu.
+
+      On the Linux running on WSL, you always have root access, so you
+      can use any of the installation methods described below for
+      Linux.
+
+    - Alternatively, in particular if you cannot use WSL, install
+      `Cygwin <https://cygwin.com/>`_ and then build SageMath from source
+      as described in section :ref:`sec-installation-from-sources`.
+
+Linux
+=====
 
 - **Do you want to do SageMath development?**
 
@@ -72,47 +103,34 @@ SageMath release.
       these describe an experimental method that gets all required
       packages, including Python packages, from conda-forge.
 
-  - **No development:**
+  - No development: **Do you have root access (sudo)?**
 
-    - Install the `binary build of SageMath <https://github.com/3-manifolds/Sage_macOS/releases>`_
-      from the 3-manifolds project.  It is a signed and notarized app.
-      You can choose between two options: A 800 MB disk image with the standard Sage distribution,
-      and a 1 GB disk image that adds many optional packages.
+    - **Yes, root access:** Then the easiest way to install SageMath is
+      through a Linux distribution that provides it as a package.  Most
+      major Linux distributions have up-to-date versions of SageMath,
+      see `repology.org: sagemath
+      <https://repology.org/project/sagemath/versions>`_ for an
+      overview.  See :ref:`sec-GNU-Linux` for additional information.
 
-    - Alternatively, install SageMath from the `conda-forge
-      <https://conda-forge.org/>`_ project, as described in section
+      If you are on an older version of your distribution and a recent
+      version of SageMath is only available on a newer version of the
+      distribution, consider upgrading your distribution.
+      In particular, do not install a version of Sage older than 9.2.
+
+    - **No root access, or on an older distribution** Install SageMath from
+      the `conda-forge <https://conda-forge.org/>`_ project, as described in section
       :ref:`sec-installation-conda`.
 
     - Alternatively, build SageMath from source as described in section
       :ref:`sec-installation-from-sources`.
 
-**On Windows:**
-
-- **Do you want to do SageMath development?**
-
-  - **Yes, development:**
-
-    Enable Windows Subsystem for Linux (WSL), selecting any Linux
-    distribution, for example Ubuntu. Then follow the instructions for
-    development on Linux.
-
-  - **No development:**
-
-    - Enable Windows Subsystem for Linux (WSL), selecting any Linux
-      distribution, for example Ubuntu. On the Linux running on WSL,
-      you always have root access, so you can use any of the
-      installation methods described above for Linux.
-
-    - Alternatively, in particular if you cannot use WSL, install
-      `Cygwin <https://cygwin.com/>`_ and then build SageMath from source
-      as described in section :ref:`sec-installation-from-sources`.
-
-**In the cloud:**
+In the cloud
+============
 
 - `CoCalc <https://cocalc.com/>`_: an online service that provides SageMath and
   many other tools.
 
-- On any system that can allows you to bring your own Docker images to run in
+- On any system that allows you to bring your own Docker images to run in
   a container:  Use the `Docker image sagemath/sagemath <https://hub.docker.com/r/sagemath/sagemath/>`_.
 
 - `Sage Cell Server <https://sagecell.sagemath.org/>`_: an online service for

src/doc/en/installation/linux.rst

@@ -3,7 +3,7 @@
 Linux package managers
 ======================
 
-On Debian GNU/Linux version >= 9, Ubuntu version >= 18.04,
+On Debian GNU/Linux version >= 11, Ubuntu version >= 21.04, and
 Arch Linux there are three packages to install
 
 - ``sagemath`` (for the binaries)
@@ -16,11 +16,13 @@ Arch Linux there are three packages to install
 See `repology.org: sagemath
 <https://repology.org/project/sagemath/versions>`_ for information
 about SageMath packages in other distributions, and their available
-versions.
+versions. Do not install a version of Sage older than 9.2.
+If you are on an older version of your distribution and a recent
+version of SageMath is only available on a newer version of the
+distribution, consider upgrading your distribution.
 
 Gentoo users might want to give a try to
 `sage-on-gentoo <https://github.com/cschwan/sage-on-gentoo>`_.
 
-The SageMath wiki page `Distribution
-<https://wiki.sagemath.org/Distribution>`_ collects information
+The  :trac:`Trac wiki page Distribution <wiki/Distribution>` collects information
 regarding packaging and distribution of SageMath.

src/doc/en/installation/source.rst

@@ -349,7 +349,7 @@ include:
 Ubuntu on Windows Subsystem for Linux (WSL) prerequisite installation
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Sage can be installed onto Linux running on Windows Subsystem for Linux (WSL). These instructions describe a fresh install of Ubuntu 20.10, but other distibutions or installation methods should work too, though have not been tested.
+Sage can be installed onto Linux running on Windows Subsystem for Linux (WSL). These instructions describe a fresh install of Ubuntu 20.10, but other distributions or installation methods should work too, though have not been tested.
 
 - Enable hardware-assisted virtualization in the EFI or BIOS of your system. Refer to your system (or motherboard) maker's documentation for instructions on how to do this.