Merge branch 'develop' into patch-1

explorest · web-flow · commit f052399b8759 · 2024-03-18T00:50:08.000+05:00
diff --git a/CITATION.cff b/CITATION.cff
@@ -4,8 +4,8 @@ title: SageMath
 abstract: SageMath is a free open-source mathematics software system.
 authors:
 - name: "The SageMath Developers"
-version: 10.3.rc3
+version: 10.3.rc4
 doi: 10.5281/zenodo.593563
-date-released: 2024-03-10
+date-released: 2024-03-17
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-SageMath version 10.3.rc3, Release Date: 2024-03-10
+SageMath version 10.3.rc4, Release Date: 2024-03-17
diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini
@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=facd0b123855a68d836680b22177058ac3333aad
-md5=180414ef1a73c5cc12a657abb5affb63
-cksum=101476296
+sha1=f06e82486ef07850394e6b6d7f226b70c8330d47
+md5=9dd6037651626866f7b6cf790e45b2dd
+cksum=2951679715
diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt
@@ -1 +1 @@
-5c45eed9e45a60223067282bb70cdb805d66eeff
+83d81f55354e4732096fbe0c0cd750eb6334e033
diff --git a/build/pkgs/h11/SPKG.rst b/build/pkgs/h11/SPKG.rst
@@ -0,0 +1,18 @@
+h11: A pure-Python, bring-your-own-I/O implementation of HTTP/1.1
+=================================================================
+
+Description
+-----------
+
+A pure-Python, bring-your-own-I/O implementation of HTTP/1.1
+
+License
+-------
+
+MIT
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/h11/
+
diff --git a/build/pkgs/h11/checksums.ini b/build/pkgs/h11/checksums.ini
@@ -0,0 +1,5 @@
+tarball=h11-VERSION-py3-none-any.whl
+sha1=c502d56dc3288212142a398704a5109749331dd8
+md5=47f19bfed53c8f9278749c532490977e
+cksum=462065947
+upstream_url=https://pypi.io/packages/py3/h/h11/h11-VERSION-py3-none-any.whl
diff --git a/build/pkgs/h11/dependencies b/build/pkgs/h11/dependencies
@@ -0,0 +1,4 @@
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
+
+----------
+All lines of this file are ignored except the first.
diff --git a/build/pkgs/h11/install-requires.txt b/build/pkgs/h11/install-requires.txt
@@ -0,0 +1 @@
+h11
diff --git a/build/pkgs/h11/package-version.txt b/build/pkgs/h11/package-version.txt
@@ -0,0 +1 @@
+0.14.0
diff --git a/build/pkgs/h11/type b/build/pkgs/h11/type
@@ -0,0 +1 @@
+standard
diff --git a/build/pkgs/httpcore/SPKG.rst b/build/pkgs/httpcore/SPKG.rst
@@ -0,0 +1,16 @@
+httpcore: A minimal low-level HTTP client.
+==========================================
+
+Description
+-----------
+
+A minimal low-level HTTP client.
+
+License
+-------
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/httpcore/
+
diff --git a/build/pkgs/httpcore/checksums.ini b/build/pkgs/httpcore/checksums.ini
@@ -0,0 +1,5 @@
+tarball=httpcore-VERSION-py3-none-any.whl
+sha1=e83eb30232906df8ac673d6c49c657957dc00ce1
+md5=9f99e1b4ed8ba940bd698e21af54ef6d
+cksum=2564019022
+upstream_url=https://pypi.io/packages/py3/h/httpcore/httpcore-VERSION-py3-none-any.whl
diff --git a/build/pkgs/httpcore/dependencies b/build/pkgs/httpcore/dependencies
@@ -0,0 +1,4 @@
+h11 | $(PYTHON_TOOLCHAIN) $(PYTHON)
+
+----------
+All lines of this file are ignored except the first.
diff --git a/build/pkgs/httpcore/install-requires.txt b/build/pkgs/httpcore/install-requires.txt
@@ -0,0 +1 @@
+httpcore
diff --git a/build/pkgs/httpcore/package-version.txt b/build/pkgs/httpcore/package-version.txt
@@ -0,0 +1 @@
+1.0.4
diff --git a/build/pkgs/httpcore/type b/build/pkgs/httpcore/type
@@ -0,0 +1 @@
+standard
diff --git a/build/pkgs/httpx/SPKG.rst b/build/pkgs/httpx/SPKG.rst
@@ -0,0 +1,16 @@
+httpx: The next generation HTTP client.
+=======================================
+
+Description
+-----------
+
+The next generation HTTP client.
+
+License
+-------
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/httpx/
+
diff --git a/build/pkgs/httpx/checksums.ini b/build/pkgs/httpx/checksums.ini
@@ -0,0 +1,5 @@
+tarball=httpx-VERSION-py3-none-any.whl
+sha1=01f2a657e43842cb7c8dda30d38860fa741acb7e
+md5=9bab916547b4c85999c568d12e04edc4
+cksum=4048488492
+upstream_url=https://pypi.io/packages/py3/h/httpx/httpx-VERSION-py3-none-any.whl
diff --git a/build/pkgs/httpx/dependencies b/build/pkgs/httpx/dependencies
@@ -0,0 +1,4 @@
+httpcore | $(PYTHON_TOOLCHAIN) $(PYTHON)
+
+----------
+All lines of this file are ignored except the first.
diff --git a/build/pkgs/httpx/install-requires.txt b/build/pkgs/httpx/install-requires.txt
@@ -0,0 +1 @@
+httpx
diff --git a/build/pkgs/httpx/package-version.txt b/build/pkgs/httpx/package-version.txt
@@ -0,0 +1 @@
+0.27.0
diff --git a/build/pkgs/httpx/type b/build/pkgs/httpx/type
@@ -0,0 +1 @@
+standard
diff --git a/build/pkgs/jupyterlab/checksums.ini b/build/pkgs/jupyterlab/checksums.ini
@@ -1,5 +1,5 @@
 tarball=jupyterlab-VERSION-py3-none-any.whl
-sha1=06ca895226e055d4bf92f3971eab23035d9c18c7
-md5=a608fbbd9a4616afcc8b0f2e9e0c76ef
-cksum=1688505838
+sha1=4efdd879660e719fd49be6ec169272f32a16593e
+md5=968a2b0458440a6b018ff2863a66e4af
+cksum=2309499829
 upstream_url=https://pypi.io/packages/py3/j/jupyterlab/jupyterlab-VERSION-py3-none-any.whl
diff --git a/build/pkgs/jupyterlab/dependencies b/build/pkgs/jupyterlab/dependencies
@@ -1,4 +1,4 @@
-async_lru importlib_metadata ipykernel jinja2 jupyter_core jupyter_lsp jupyter_server jupyterlab_server notebook_shim packaging traitlets tornado tomli | $(PYTHON_TOOLCHAIN) $(PYTHON)
+async_lru importlib_metadata ipykernel jinja2 jupyter_core jupyter_lsp jupyter_server jupyterlab_server notebook_shim packaging traitlets tornado tomli httpx | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/jupyterlab/package-version.txt b/build/pkgs/jupyterlab/package-version.txt
@@ -1 +1 @@
-4.0.6
+4.1.3
diff --git a/build/pkgs/notebook/checksums.ini b/build/pkgs/notebook/checksums.ini
@@ -1,5 +1,5 @@
 tarball=notebook-VERSION-py3-none-any.whl
-sha1=cd0c99c8a267ced6a451f712007665df88c60d71
-md5=e61e0d6c55bf3920c013554c6dd071b9
-cksum=2202937268
+sha1=90ec65091058ac541a55cc2417de83c1bcb24985
+md5=bf0fe0b56048113cd8a9e2df7add9fe9
+cksum=1004716816
 upstream_url=https://pypi.io/packages/py3/n/notebook/notebook-VERSION-py3-none-any.whl
diff --git a/build/pkgs/notebook/package-version.txt b/build/pkgs/notebook/package-version.txt
@@ -1 +1 @@
-7.0.6
+7.1.1
diff --git a/build/pkgs/sage_conf/install-requires.txt b/build/pkgs/sage_conf/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-conf ~= 10.3rc3
+sage-conf ~= 10.3rc4
diff --git a/build/pkgs/sage_docbuild/install-requires.txt b/build/pkgs/sage_docbuild/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-docbuild ~= 10.3rc3
+sage-docbuild ~= 10.3rc4
diff --git a/build/pkgs/sage_setup/install-requires.txt b/build/pkgs/sage_setup/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-setup ~= 10.3rc3
+sage-setup ~= 10.3rc4
diff --git a/build/pkgs/sage_sws2rst/install-requires.txt b/build/pkgs/sage_sws2rst/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-sws2rst ~= 10.3rc3
+sage-sws2rst ~= 10.3rc4
diff --git a/build/pkgs/sagelib/install-requires.txt b/build/pkgs/sagelib/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-standard ~= 10.3rc3
+sagemath-standard ~= 10.3rc4
diff --git a/build/pkgs/sagemath_bliss/install-requires.txt b/build/pkgs/sagemath_bliss/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-bliss ~= 10.3rc3
+sagemath-bliss ~= 10.3rc4
diff --git a/build/pkgs/sagemath_categories/install-requires.txt b/build/pkgs/sagemath_categories/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-categories ~= 10.3rc3
+sagemath-categories ~= 10.3rc4
diff --git a/build/pkgs/sagemath_coxeter3/install-requires.txt b/build/pkgs/sagemath_coxeter3/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-coxeter3 ~= 10.3rc3
+sagemath-coxeter3 ~= 10.3rc4
diff --git a/build/pkgs/sagemath_environment/install-requires.txt b/build/pkgs/sagemath_environment/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-environment ~= 10.3rc3
+sagemath-environment ~= 10.3rc4
diff --git a/build/pkgs/sagemath_mcqd/install-requires.txt b/build/pkgs/sagemath_mcqd/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-mcqd ~= 10.3rc3
+sagemath-mcqd ~= 10.3rc4
diff --git a/build/pkgs/sagemath_meataxe/install-requires.txt b/build/pkgs/sagemath_meataxe/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-meataxe ~= 10.3rc3
+sagemath-meataxe ~= 10.3rc4
diff --git a/build/pkgs/sagemath_objects/install-requires.txt b/build/pkgs/sagemath_objects/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-objects ~= 10.3rc3
+sagemath-objects ~= 10.3rc4
diff --git a/build/pkgs/sagemath_repl/install-requires.txt b/build/pkgs/sagemath_repl/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-repl ~= 10.3rc3
+sagemath-repl ~= 10.3rc4
diff --git a/build/pkgs/sagemath_sirocco/install-requires.txt b/build/pkgs/sagemath_sirocco/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-sirocco ~= 10.3rc3
+sagemath-sirocco ~= 10.3rc4
diff --git a/build/pkgs/sagemath_tdlib/install-requires.txt b/build/pkgs/sagemath_tdlib/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-tdlib ~= 10.3rc3
+sagemath-tdlib ~= 10.3rc4
diff --git a/pkgs/sage-conf/VERSION.txt b/pkgs/sage-conf/VERSION.txt
@@ -1 +1 @@
-10.3.rc3
+10.3.rc4
diff --git a/pkgs/sage-conf_conda/VERSION.txt b/pkgs/sage-conf_conda/VERSION.txt
@@ -1 +1 @@
-10.3.rc3
+10.3.rc4
diff --git a/pkgs/sage-conf_pypi/VERSION.txt b/pkgs/sage-conf_pypi/VERSION.txt
@@ -1 +1 @@
-10.3.rc3
+10.3.rc4
diff --git a/pkgs/sage-docbuild/VERSION.txt b/pkgs/sage-docbuild/VERSION.txt
@@ -1 +1 @@
-10.3.rc3
+10.3.rc4
diff --git a/pkgs/sage-setup/VERSION.txt b/pkgs/sage-setup/VERSION.txt
@@ -1 +1 @@
-10.3.rc3
+10.3.rc4
diff --git a/pkgs/sage-sws2rst/VERSION.txt b/pkgs/sage-sws2rst/VERSION.txt
@@ -1 +1 @@
-10.3.rc3
+10.3.rc4
diff --git a/pkgs/sagemath-bliss/VERSION.txt b/pkgs/sagemath-bliss/VERSION.txt
@@ -1 +1 @@
-10.3.rc3
+10.3.rc4
diff --git a/pkgs/sagemath-categories/VERSION.txt b/pkgs/sagemath-categories/VERSION.txt
@@ -1 +1 @@
-10.3.rc3
+10.3.rc4
diff --git a/pkgs/sagemath-coxeter3/VERSION.txt b/pkgs/sagemath-coxeter3/VERSION.txt
@@ -1 +1 @@
-10.3.rc3
+10.3.rc4
diff --git a/pkgs/sagemath-environment/VERSION.txt b/pkgs/sagemath-environment/VERSION.txt
@@ -1 +1 @@
-10.3.rc3
+10.3.rc4
diff --git a/pkgs/sagemath-mcqd/VERSION.txt b/pkgs/sagemath-mcqd/VERSION.txt
@@ -1 +1 @@
-10.3.rc3
+10.3.rc4
diff --git a/pkgs/sagemath-meataxe/VERSION.txt b/pkgs/sagemath-meataxe/VERSION.txt
@@ -1 +1 @@
-10.3.rc3
+10.3.rc4
diff --git a/pkgs/sagemath-objects/VERSION.txt b/pkgs/sagemath-objects/VERSION.txt
@@ -1 +1 @@
-10.3.rc3
+10.3.rc4
diff --git a/pkgs/sagemath-repl/VERSION.txt b/pkgs/sagemath-repl/VERSION.txt
@@ -1 +1 @@
-10.3.rc3
+10.3.rc4
diff --git a/pkgs/sagemath-sirocco/VERSION.txt b/pkgs/sagemath-sirocco/VERSION.txt
@@ -1 +1 @@
-10.3.rc3
+10.3.rc4
diff --git a/pkgs/sagemath-tdlib/VERSION.txt b/pkgs/sagemath-tdlib/VERSION.txt
@@ -1 +1 @@
-10.3.rc3
+10.3.rc4
diff --git a/src/VERSION.txt b/src/VERSION.txt
@@ -1 +1 @@
-10.3.rc3
+10.3.rc4
diff --git a/src/bin/sage-version.sh b/src/bin/sage-version.sh
@@ -4,6 +4,6 @@
 # which stops "setup.py develop" from rewriting it as a Python file.
 :
 # This file is auto-generated by the sage-update-version script, do not edit!
-SAGE_VERSION='10.3.rc3'
-SAGE_RELEASE_DATE='2024-03-10'
-SAGE_VERSION_BANNER='SageMath version 10.3.rc3, Release Date: 2024-03-10'
+SAGE_VERSION='10.3.rc4'
+SAGE_RELEASE_DATE='2024-03-17'
+SAGE_VERSION_BANNER='SageMath version 10.3.rc4, Release Date: 2024-03-17'
diff --git a/src/doc/en/installation/conda.rst b/src/doc/en/installation/conda.rst
@@ -9,32 +9,27 @@ SageMath can be installed on Linux and macOS via Conda from the
 Both the ``x86_64`` (Intel) architecture and the ``arm64``/``aarch64``
 architectures (including Apple Silicon, M1) are supported.
 
-You will need a working Conda installation: either Mambaforge/Miniforge,
+You will need a working Conda installation: either Miniforge (or Mambaforge),
 Miniconda or Anaconda. If you don't have one yet, we recommend installing
-`Mambaforge <https://github.com/conda-forge/miniforge#mambaforge>`_ as
+`Miniforge <https://github.com/conda-forge/miniforge>`_ as
 follows. In a terminal,
 
 .. 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
+   $ curl -L -O "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh"
+   $ bash Miniforge3-$(uname)-$(uname -m).sh
 
-* Mambaforge and Miniforge use conda-forge as the default channel.
+* Miniforge (and Mambaforge) 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``
 
   * Change channel priority to strict: ``conda config --set channel_priority strict``
 
-Optionally, use `mamba <https://github.com/mamba-org/mamba>`_,
+If you installed Miniforge (or Mambaforge), we recommend to use 
+`mamba <https://mamba.readthedocs.io/en/latest/index.html>`_ in the following, 
 which uses a faster dependency solver than ``conda``.
-If you installed Mambaforge, it is already provided. Otherwise, use
-
-.. code-block:: shell
-
-   $ conda install mamba
-
 
 .. _sec-installation-conda-binary:
 
@@ -43,10 +38,17 @@ Installing all of SageMath from conda (not for development)
 
 Create a new conda environment containing SageMath, either with ``mamba`` or ``conda``:
 
-.. code-block:: shell
+.. tab:: mamba
+
+  .. code-block:: shell
 
-    $ mamba create -n sage sage python=X        # either
-    $ conda create -n sage sage python=X        # or
+      $ mamba create -n sage sage python=X
+
+.. tab:: conda
+
+  .. code-block:: shell
+
+      $ conda create -n sage sage python=X
 
 where ``X`` is version of Python, e.g. ``3.9``.
 
@@ -109,17 +111,22 @@ Here we assume that you are using a git checkout.
 
       $ export SAGE_NUM_THREADS=24
 
-  - As a recommended step, install the ``mamba`` package manager. If
-    you skip this step, replace ``mamba`` by ``conda`` in the
-    following steps::
-
-      $ conda install mamba
-
   - Create and activate a new conda environment with the dependencies of Sage
     and a few additional developer tools::
 
-      $ mamba env create --file src/environment-dev-3.11-linux.yml --name sage-dev
-      $ conda activate sage-dev
+      .. tab:: mamba
+      
+        .. code-block:: shell
+      
+            $ mamba env create --file src/environment-dev-3.11-linux.yml --name sage-dev
+            $ conda activate sage-dev
+      
+      .. tab:: conda
+      
+        .. code-block:: shell
+      
+            $ conda env create --file src/environment-dev-3.11-linux.yml --name sage-dev
+            $ conda activate sage-dev
 
     Alternatively, you can use ``src/environment-3.11-linux.yml`` or
     ``src/environment-optional-3.11-linux.yml``, which will only install standard
diff --git a/src/sage/misc/cython.py b/src/sage/misc/cython.py
@@ -236,7 +236,7 @@ def cython(filename, verbose=0, compile_message=False,
         ...
         RuntimeError: Error compiling Cython file:
         ...
-        ...: 'sage/misc.pxd' not found
+        ...: 'sage/misc.pxd' not found...
     """
     if not filename.endswith('pyx'):
         print("Warning: file (={}) should have extension .pyx".format(filename), file=sys.stderr)
@@ -382,6 +382,12 @@ def cython(filename, verbose=0, compile_message=False,
             "Placing it before 'except' or 'noexcept' will be disallowed in a future version of Cython.\n",
             "", cython_messages, 0, re.MULTILINE)
 
+        # workaround for https://github.com/sagemath/sage/issues/37560
+        # triggered by Cython 3.0.9
+        cython_messages = re.sub(
+            "^warning: .*noexcept clause is ignored for function returning Python object\n",
+            "", cython_messages, 0, re.MULTILINE)
+
         sys.stderr.write(cython_messages)
         sys.stderr.flush()
 
diff --git a/src/sage/version.py b/src/sage/version.py

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-SageMath version 10.3.rc3, Release Date: 2024-03-10`
	`1`	`+SageMath version 10.3.rc4, Release Date: 2024-03-17`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-5c45eed9e45a60223067282bb70cdb805d66eeff`
	`1`	`+83d81f55354e4732096fbe0c0cd750eb6334e033`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 + | $(PYTHON_TOOLCHAIN) $(PYTHON)
++
 +----------
 +All lines of this file are ignored except the first.