Skip to content

Commit

Permalink
Merge branch 'develop' into conda-grayskull
Browse files Browse the repository at this point in the history
  • Loading branch information
dimpase authored Mar 20, 2024
2 parents 6319ac1 + ccc11b6 commit 55df9a9
Show file tree
Hide file tree
Showing 1,022 changed files with 4,150 additions and 4,050 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ jobs:
uses: ./.github/workflows/docker.yml
with:
# Build from scratch
free_disk_space: true
docker_targets: "with-system-packages configured with-targets-pre with-targets"
# FIXME: duplicated from env.TARGETS
targets_pre: all-sage-local
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ title: SageMath
abstract: SageMath is a free open-source mathematics software system.
authors:
- name: "The SageMath Developers"
version: 10.3.rc2
version: 10.3
doi: 10.5281/zenodo.593563
date-released: 2024-03-04
date-released: 2024-03-19
repository-code: "https://github.com/sagemath/sage"
url: "https://www.sagemath.org/"
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SageMath version 10.3.rc2, Release Date: 2024-03-04
SageMath version 10.3, Release Date: 2024-03-19
6 changes: 3 additions & 3 deletions build/pkgs/configure/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=configure-VERSION.tar.gz
sha1=ff35813eb1168b754ab9470066b39aeaca9d462c
md5=834bc382880b0cfea48fa00bdff79534
cksum=4002007446
sha1=f4a7dd60c09ac2f3e1f8e388cbf2a527dcd5547c
md5=c16cb118d9ad6a495f6c5d509b2ec570
cksum=3417350968
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
872ca39ec422cacd1005dd6b1ccd9737d5d88712
ab1a517b64b02bf15bbcb8d7c2d4d643bd5eff9b
18 changes: 18 additions & 0 deletions build/pkgs/h11/SPKG.rst
Original file line number Diff line number Diff line change
@@ -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/

5 changes: 5 additions & 0 deletions build/pkgs/h11/checksums.ini
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions build/pkgs/h11/dependencies
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
| $(PYTHON_TOOLCHAIN) $(PYTHON)

----------
All lines of this file are ignored except the first.
1 change: 1 addition & 0 deletions build/pkgs/h11/install-requires.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
h11
1 change: 1 addition & 0 deletions build/pkgs/h11/package-version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.14.0
1 change: 1 addition & 0 deletions build/pkgs/h11/type
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
standard
16 changes: 16 additions & 0 deletions build/pkgs/httpcore/SPKG.rst
Original file line number Diff line number Diff line change
@@ -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/

5 changes: 5 additions & 0 deletions build/pkgs/httpcore/checksums.ini
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions build/pkgs/httpcore/dependencies
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
h11 | $(PYTHON_TOOLCHAIN) $(PYTHON)

----------
All lines of this file are ignored except the first.
1 change: 1 addition & 0 deletions build/pkgs/httpcore/install-requires.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
httpcore
1 change: 1 addition & 0 deletions build/pkgs/httpcore/package-version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.0.4
1 change: 1 addition & 0 deletions build/pkgs/httpcore/type
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
standard
16 changes: 16 additions & 0 deletions build/pkgs/httpx/SPKG.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
httpx: The next generation HTTP client.
=======================================

Description
-----------

The next generation HTTP client.

License
-------

Upstream Contact
----------------

https://pypi.org/project/httpx/

5 changes: 5 additions & 0 deletions build/pkgs/httpx/checksums.ini
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions build/pkgs/httpx/dependencies
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
httpcore | $(PYTHON_TOOLCHAIN) $(PYTHON)

----------
All lines of this file are ignored except the first.
1 change: 1 addition & 0 deletions build/pkgs/httpx/install-requires.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
httpx
1 change: 1 addition & 0 deletions build/pkgs/httpx/package-version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.27.0
1 change: 1 addition & 0 deletions build/pkgs/httpx/type
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
standard
6 changes: 3 additions & 3 deletions build/pkgs/jupyterlab/checksums.ini
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion build/pkgs/jupyterlab/dependencies
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion build/pkgs/jupyterlab/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0.6
4.1.3
6 changes: 3 additions & 3 deletions build/pkgs/notebook/checksums.ini
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion build/pkgs/notebook/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.0.6
7.1.1
6 changes: 3 additions & 3 deletions build/pkgs/prompt_toolkit/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=prompt_toolkit-VERSION.tar.gz
sha1=d36c3286a16c09b9bc02c2733b9fc7a8a9c30ba1
md5=252a5d200e41d46b65a3076d2bc0a4bd
cksum=361343842
sha1=b5ada8cb45c11f9184c990bd33a98d3d690e6edc
md5=f33c0f4ae8d11addababf6d90c98f8bc
cksum=1262534330
upstream_url=https://pypi.io/packages/source/p/prompt_toolkit/prompt_toolkit-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/prompt_toolkit/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.41
3.0.43
2 changes: 1 addition & 1 deletion build/pkgs/sage_conf/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sage-conf ~= 10.3rc2
sage-conf ~= 10.3
2 changes: 1 addition & 1 deletion build/pkgs/sage_docbuild/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sage-docbuild ~= 10.3rc2
sage-docbuild ~= 10.3
2 changes: 1 addition & 1 deletion build/pkgs/sage_setup/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sage-setup ~= 10.3rc2
sage-setup ~= 10.3
2 changes: 1 addition & 1 deletion build/pkgs/sage_sws2rst/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sage-sws2rst ~= 10.3rc2
sage-sws2rst ~= 10.3
2 changes: 1 addition & 1 deletion build/pkgs/sagelib/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-standard ~= 10.3rc2
sagemath-standard ~= 10.3
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_bliss/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-bliss ~= 10.3rc2
sagemath-bliss ~= 10.3
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_categories/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-categories ~= 10.3rc2
sagemath-categories ~= 10.3
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_coxeter3/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-coxeter3 ~= 10.3rc2
sagemath-coxeter3 ~= 10.3
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_doc_html/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sagelib sphinx sphinx_copybutton sphinx_inline_tabs pplpy_doc | $(SAGERUNTIME) maxima networkx scipy sympy matplotlib pillow mathjax mpmath ipykernel jupyter_client conway_polynomials tachyon jmol ipywidgets jupyter_sphinx sage_docbuild elliptic_curves furo fpylll
sagelib sphinx sphinx_copybutton sphinx_inline_tabs pplpy_doc | $(SAGERUNTIME) maxima networkx scipy sympy matplotlib pillow mathjax mpmath ipykernel jupyter_client conway_polynomials tachyon jmol ipywidgets jupyter_sphinx sage_docbuild elliptic_curves furo fpylll graphs

# Building the documentation has many dependencies, because all
# documented modules are imported and because we use matplotlib to
Expand Down
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_environment/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-environment ~= 10.3rc2
sagemath-environment ~= 10.3
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_mcqd/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-mcqd ~= 10.3rc2
sagemath-mcqd ~= 10.3
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_meataxe/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-meataxe ~= 10.3rc2
sagemath-meataxe ~= 10.3
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_objects/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-objects ~= 10.3rc2
sagemath-objects ~= 10.3
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_repl/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-repl ~= 10.3rc2
sagemath-repl ~= 10.3
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_sirocco/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-sirocco ~= 10.3rc2
sagemath-sirocco ~= 10.3
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_tdlib/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This file is updated on every release by the sage-update-version script
sagemath-tdlib ~= 10.3rc2
sagemath-tdlib ~= 10.3
2 changes: 1 addition & 1 deletion pkgs/sage-conf/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.3.rc2
10.3
2 changes: 1 addition & 1 deletion pkgs/sage-conf_conda/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.3.rc2
10.3
2 changes: 1 addition & 1 deletion pkgs/sage-conf_pypi/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.3.rc2
10.3
2 changes: 1 addition & 1 deletion pkgs/sage-docbuild/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.3.rc2
10.3
2 changes: 1 addition & 1 deletion pkgs/sage-setup/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.3.rc2
10.3
2 changes: 1 addition & 1 deletion pkgs/sage-sws2rst/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.3.rc2
10.3
2 changes: 1 addition & 1 deletion pkgs/sagemath-bliss/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.3.rc2
10.3
2 changes: 1 addition & 1 deletion pkgs/sagemath-categories/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.3.rc2
10.3
2 changes: 1 addition & 1 deletion pkgs/sagemath-coxeter3/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.3.rc2
10.3
2 changes: 1 addition & 1 deletion pkgs/sagemath-environment/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.3.rc2
10.3
2 changes: 1 addition & 1 deletion pkgs/sagemath-mcqd/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.3.rc2
10.3
2 changes: 1 addition & 1 deletion pkgs/sagemath-meataxe/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.3.rc2
10.3
2 changes: 1 addition & 1 deletion pkgs/sagemath-objects/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.3.rc2
10.3
2 changes: 1 addition & 1 deletion pkgs/sagemath-repl/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.3.rc2
10.3
2 changes: 1 addition & 1 deletion pkgs/sagemath-sirocco/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.3.rc2
10.3
2 changes: 1 addition & 1 deletion pkgs/sagemath-tdlib/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.3.rc2
10.3
2 changes: 1 addition & 1 deletion src/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.3.rc2
10.3
6 changes: 3 additions & 3 deletions src/bin/sage-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.rc2'
SAGE_RELEASE_DATE='2024-03-04'
SAGE_VERSION_BANNER='SageMath version 10.3.rc2, Release Date: 2024-03-04'
SAGE_VERSION='10.3'
SAGE_RELEASE_DATE='2024-03-19'
SAGE_VERSION_BANNER='SageMath version 10.3, Release Date: 2024-03-19'
53 changes: 30 additions & 23 deletions src/doc/en/installation/conda.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -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``.

Expand Down Expand Up @@ -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
Expand Down
Loading

0 comments on commit 55df9a9

Please sign in to comment.