Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
6127016
bootstrap-conda: Generate environment files with hard-coded Python mi…
mkoeppe Oct 5, 2023
03a2acf
src/doc/en/installation/conda.rst: Update for versioned environment-.…
mkoeppe Oct 8, 2023
5c0bac8
bootstrap, Makefile (bootstrap-clean): Update for versioned environme…
mkoeppe Sep 27, 2023
c2be172
tox.ini (local-conda-environment): Update for versioned environment-.…
mkoeppe Sep 27, 2023
b3ba591
.github/workflows/ci-conda.yml: Update for versioned environment*.yml
mkoeppe Sep 27, 2023
018de2b
.github/workflows/ci-conda.yml: Fix environment name
mkoeppe Oct 3, 2023
fc9bab5
tox.ini (conda-environment-{src,dev}), .github/workflows/ci-conda.yml…
mkoeppe Sep 27, 2023
b02ef8e
bootstrap-conda: Refactor using sage-get-system-packages
mkoeppe Oct 5, 2023
235ce91
bootstrap-conda: Only one 'python' line + speed up
mkoeppe Oct 9, 2023
3332a89
build/sage_bootstrap/download/mirror_list.py: Remove sagepad.org
mkoeppe Oct 9, 2023
dd939ff
sage_bootstrap.{tarball, download.mirror_list}: Lower layout of the m…
mkoeppe Oct 9, 2023
2dfe081
sage_bootstrap.download.mirror_list: Delay downloading/reading/rankin…
mkoeppe Oct 9, 2023
a37f4fd
sage_bootstrap.download.mirror_list: Use master list of download sour…
mkoeppe Oct 9, 2023
2323480
src/bin/sage-update-version: Update .upstream.d/20-github.amrom.workers.dev-sagemat…
mkoeppe Oct 9, 2023
7e65260
sage_bootstrap.download.mirror_list: Skip empty lines earlier
mkoeppe Oct 9, 2023
371be50
src/bin/sage-update-version: Also commit
mkoeppe Oct 9, 2023
423e48a
build/bin/write-dockerfile.sh: ADD .upstream.d
mkoeppe Oct 9, 2023
73ab316
bootstrap-conda (src/environment-dev*.yml): Suppress pip section, for…
mkoeppe Oct 10, 2023
f429993
.ci/retrofit-worktree.sh: New, factored out from .github/workflows/bu…
mkoeppe Oct 10, 2023
47f6a98
src/tox.ini (pyright): Remove old version pin, do not rely on global …
mkoeppe Oct 10, 2023
47e2783
.github/workflows/build.yml: Simplify use of pyright by going through…
mkoeppe Oct 10, 2023
94c8b88
Fixup
mkoeppe Oct 11, 2023
8bf3bcb
src/tox.ini (pyright): Do not restrict to subdirectories by default
mkoeppe Oct 11, 2023
81e1afa
src/tox.ini (pyright): Pin to 1.1.331 (latest)
mkoeppe Oct 11, 2023
e3dce3f
conda: Do not pin setuptools, instead add legacy editable to install …
mkoeppe Oct 12, 2023
c60de9a
build/pkgs/setuptools_wheel: Make distros a symlink too
mkoeppe Sep 27, 2023
756e5c4
src/doc/en/installation/conda.rst: Restore 'bootstrap' in instruction…
mkoeppe Oct 11, 2023
ddbbdc5
pkgs/sage-conf_conda/setup.py: Always run configure
mkoeppe Oct 11, 2023
d0cae80
pkgs/sage-conf_conda/setup.py: Remove 'reusing configured SAGE_ROOT' …
mkoeppe Oct 12, 2023
c555723
Merge branch 'tox_pyright_update' into ci_streamline
mkoeppe Oct 12, 2023
19f029b
Merge branch 'conda_legacy_editable' into ci_streamline
mkoeppe Oct 12, 2023
68e9997
Merge branch 'bootstrap_conda_refactor' into ci_streamline
mkoeppe Oct 12, 2023
66a8be4
Merge branch 'gh_actions_release' into ci_streamline
mkoeppe Oct 12, 2023
2e11b0f
Merge branch 'ci_refactor_build' into ci_streamline
mkoeppe Oct 12, 2023
0bfb487
build/bin/write-dockerfile.sh, tox.ini (docker-incremental): Make inc…
mkoeppe Oct 11, 2023
8e25cbd
.github/workflows/build.yml: Merge doc-build.yml, doc-build-pdf.yml
mkoeppe Oct 11, 2023
459da44
.github/workflows/build.yml: Merge ci-linux-incremental.yml
mkoeppe Oct 11, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
src/doc/en/installation/conda.rst: Update for versioned environment-.…
….. files
  • Loading branch information
Matthias Koeppe committed Oct 8, 2023
commit 03a2acfeade61d5bc57c1bfb79be802b8b10b7f2
22 changes: 12 additions & 10 deletions src/doc/en/installation/conda.rst
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,16 @@ from source as follows:
- Create a new conda environment including all standard packages
recognized by sage, and activate it::

$ conda env create --file environment.yml --name sage-build
$ conda env create --file environment-3.11.yml --name sage-build
$ conda activate sage-build

Alternatively, use ``environment-optional.yml`` in place of
Alternatively, use ``environment-optional-3.11.yml`` in place of
``environment.yml`` to create an environment with all standard and optional
packages recognized by sage.

A different Python version can be selected by replacing ``3.11`` by ``3.9``
or ``3.10`` in these commands.

- Then the SageMath distribution will be built using the compilers provided by Conda
and using many packages installed by Conda::

Expand Down Expand Up @@ -123,16 +126,15 @@ Here we assume that you are using a git checkout.
- 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.yml --name sage-dev
$ mamba env create --file src/environment-dev-3.11.yml --name sage-dev
$ conda activate sage-dev

Alternatively, you can use ``src/environment.yml`` or
``src/environment-optional.yml``, which will only install standard
Alternatively, you can use ``src/environment-3.11.yml`` or
``src/environment-optional-3.11.yml``, which will only install standard
(and optional) packages without any additional developer tools.

By default, the most recent version of Python supported by Sage is
installed. You can use the additional option ``python=3.9`` in the above
``env create`` command to select another Python version (here 3.9).
A different Python version can be selected by replacing ``3.11`` by ``3.9``
or ``3.10`` in these commands.

- Install the build prerequisites and the Sage library::

Expand All @@ -142,7 +144,7 @@ Here we assume that you are using a git checkout.
- Verify that Sage has been installed::

$ sage -c 'print(version())'
SageMath version 9.6.beta5, Release Date: 2022-03-12
SageMath version 10.2.beta4, Release Date: 2023-09-24

Note that ``make`` is not used at all. All dependencies
(including all Python packages) are provided by conda.
Expand All @@ -162,7 +164,7 @@ After editing any Cython files, rebuild the Sage library using::

In order to update the conda environment later, you can run::

$ mamba env update --file src/environment-dev.yml --name sage-dev
$ mamba env update --file src/environment-dev-3.11.yml --name sage-dev

To build the documentation, use::

Expand Down