Skip to content

Commit

Permalink
Merge branch 'sagemath:develop' into dsg_ticket2
Browse files Browse the repository at this point in the history
  • Loading branch information
MatheMagicianPi committed Aug 16, 2023
2 parents 5f66f5e + aa220c4 commit fa300ae
Show file tree
Hide file tree
Showing 505 changed files with 18,674 additions and 15,735 deletions.
24 changes: 18 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,24 @@ jobs:
run: pyright
working-directory: ./worktree-image

- name: Build (fallback to non-incremental)
id: build
- name: Clean (fallback to non-incremental)
id: clean
if: always() && steps.worktree.outcome == 'success' && steps.incremental.outcome != 'success'
run: |
set -ex
./bootstrap && make doc-clean doc-uninstall sagelib-clean && git clean -fx src/sage && ./config.status && make build
./bootstrap && make doc-clean doc-uninstall sagelib-clean && git clean -fx src/sage && ./config.status
working-directory: ./worktree-image
env:
MAKE: make -j2
SAGE_NUM_THREADS: 2

- name: Build
# This step is needed because building the modularized distributions installs some optional packages,
# so the editable install of sagelib needs to build the corresponding optional extension modules.
id: build
if: always() && (steps.incremental.outcome == 'success' || steps.clean.outcome == 'success')
run: |
make build
working-directory: ./worktree-image
env:
MAKE: make -j2
Expand All @@ -125,22 +137,22 @@ jobs:
COLUMNS: 120

- name: Test all files (sage -t --all --long)
if: always() && (steps.incremental.outcome == 'success' || steps.build.outcome == 'success')
if: always() && steps.build.outcome == 'success'
run: |
../sage -python -m pip install coverage
../sage -python -m coverage run ./bin/sage-runtests --all --long -p2 --random-seed=286735480429121101562228604801325644303
working-directory: ./worktree-image/src

- name: Prepare coverage results
if: always() && (steps.incremental.outcome == 'success' || steps.build.outcome == 'success')
if: always() && steps.build.outcome == 'success'
run: |
./venv/bin/python3 -m coverage combine src/.coverage/
./venv/bin/python3 -m coverage xml
find . -name *coverage*
working-directory: ./worktree-image

- name: Upload coverage to codecov
if: always() && (steps.incremental.outcome == 'success' || steps.build.outcome == 'success')
if: always() && steps.build.outcome == 'success'
uses: codecov/codecov-action@v3
with:
files: ./worktree-image/coverage.xml
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.1.beta8
version: 10.1.rc0
doi: 10.5281/zenodo.593563
date-released: 2023-07-30
date-released: 2023-08-13
repository-code: "https://github.com/sagemath/sage"
url: "https://www.sagemath.org/"
14 changes: 13 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ your Windows. Make sure you allocate WSL sufficient RAM; 5GB is known to work, w
Then all instructions for installation in Linux apply.

As an alternative, you can also run Linux on Windows using Docker (see
above) or other virtualization solutions.
below) or other virtualization solutions.

[macOS] Preparing the Platform
------------------------------
Expand Down Expand Up @@ -416,6 +416,18 @@ You need to install `sage_conf`, a wheelhouse of various python packages. You ca

**NOTE:** You can find `sage` and `sagemath` pip packages but with these packages, you will encounter `ModuleNotFoundError`.

SageMath Docker images
----------------------

[![Docker Status](http://dockeri.co/image/sagemath/sagemath)](https://hub.docker.com/r/sagemath/sagemath)

SageMath is available on Docker Hub and can be downloaded by:
``` bash
docker pull sagemath/sagemath
```

Currently, only stable versions are kept up to date.

Troubleshooting
---------------

Expand Down
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SageMath version 10.1.beta8, Release Date: 2023-07-30
SageMath version 10.1.rc0, Release Date: 2023-08-13
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=5930a5bb8c0164176122d6ffb1143df61b990213
md5=b70ab1eaa247dce59a59910ec8e89051
cksum=3869087595
sha1=139bcabc03fbf74d05379ff27713c7e3496fc362
md5=2631cd73e85221b77dea105e30f6165d
cksum=2003135383
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
79dc3510abb05344ac7ef23d42d1228f186b7493
50208b761995b49bf6f0702f4b9d36da24fae1a0
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.1b8
sage-conf ~= 10.1rc0
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.1b8
sage-docbuild ~= 10.1rc0
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.1b8
sage-setup ~= 10.1rc0
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.1b8
sage-sws2rst ~= 10.1rc0
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.1b8
sagemath-standard ~= 10.1rc0
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.1b8
sagemath-bliss ~= 10.1rc0
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.1b8
sagemath-categories ~= 10.1rc0
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.1b8
sagemath-coxeter3 ~= 10.1rc0
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.1b8
sagemath-environment ~= 10.1rc0
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.1b8
sagemath-mcqd ~= 10.1rc0
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.1b8
sagemath-meataxe ~= 10.1rc0
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.1b8
sagemath-objects ~= 10.1rc0
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.1b8
sagemath-repl ~= 10.1rc0
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.1b8
sagemath-sirocco ~= 10.1rc0
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.1b8
sagemath-tdlib ~= 10.1rc0
2 changes: 1 addition & 1 deletion pkgs/sage-conf/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta8
10.1.rc0
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.1.beta8
10.1.rc0
2 changes: 1 addition & 1 deletion pkgs/sage-docbuild/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta8
10.1.rc0
2 changes: 1 addition & 1 deletion pkgs/sage-setup/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta8
10.1.rc0
2 changes: 1 addition & 1 deletion pkgs/sage-sws2rst/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta8
10.1.rc0
5 changes: 3 additions & 2 deletions pkgs/sagemath-bliss/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
global-include all__sagemath_bliss.py

include VERSION.txt

graft sage/graphs/bliss_cpp

global-exclude *.c
global-exclude *.cpp

global-exclude all__sagemath_*.*
global-include all__sagemath_bliss.py

global-exclude __pycache__
global-exclude *.py[co]
global-exclude *.bak
Expand Down
2 changes: 1 addition & 1 deletion pkgs/sagemath-bliss/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta8
10.1.rc0
4 changes: 3 additions & 1 deletion pkgs/sagemath-categories/MANIFEST.in.m4
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ prune sage

include VERSION.txt

global-include all__sagemath_categories.py
graft sage/categories
# Exclude what is already shipped in sagemath-objects
exclude sage/categories/action.*
Expand Down Expand Up @@ -42,6 +41,9 @@ graft sage/typeset # dep of sage.categories.tensor
global-exclude *.c
global-exclude *.cpp

global-exclude all__sagemath_*.*
global-include all__sagemath_categories.py

global-exclude __pycache__
global-exclude *.py[co]
global-exclude *.bak
Expand Down
2 changes: 1 addition & 1 deletion pkgs/sagemath-categories/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta8
10.1.rc0
5 changes: 3 additions & 2 deletions pkgs/sagemath-coxeter3/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
prune sage

global-include all__sagemath_coxeter3.py

include VERSION.txt

graft sage/libs/coxeter3

global-exclude *.c
global-exclude *.cpp

global-exclude all__sagemath_*.*
global-include all__sagemath_coxeter3.py

global-exclude __pycache__
global-exclude *.py[co]
global-exclude *.bak
Expand Down
2 changes: 1 addition & 1 deletion pkgs/sagemath-coxeter3/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta8
10.1.rc0
12 changes: 10 additions & 2 deletions pkgs/sagemath-environment/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
prune sage

global-include all__sagemath_environment.py

include sage/env.py
include sage/version.py
include sage/misc/package.py
Expand All @@ -12,4 +10,14 @@ graft sage/features

include VERSION.txt

global-exclude all__*.py
global-include all__sagemath_environment.py

global-exclude __pycache__
global-exclude *.py[co]
global-exclude *.bak
global-exclude *.so
global-exclude *~
prune .tox
prune build
prune dist
2 changes: 1 addition & 1 deletion pkgs/sagemath-environment/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta8
10.1.rc0
5 changes: 3 additions & 2 deletions pkgs/sagemath-mcqd/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
prune sage

global-include all__sagemath_mcqd.py

include VERSION.txt

include sage/graphs/mcqd.p*

global-exclude *.c
global-exclude *.cpp

global-exclude all__sagemath_*.*
global-include all__sagemath_mcqd.py

global-exclude __pycache__
global-exclude *.py[co]
global-exclude *.bak
Expand Down
2 changes: 1 addition & 1 deletion pkgs/sagemath-mcqd/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta8
10.1.rc0
5 changes: 3 additions & 2 deletions pkgs/sagemath-meataxe/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
prune sage

global-include all__sagemath_meataxe.py

include VERSION.txt

include sage/libs/meataxe.p*
Expand All @@ -10,6 +8,9 @@ include sage/matrix/matrix_gfpn_dense.p*
global-exclude *.c
global-exclude *.cpp

global-exclude all__sagemath_*.*
global-include all__sagemath_meataxe.py

global-exclude __pycache__
global-exclude *.py[co]
global-exclude *.bak
Expand Down
4 changes: 2 additions & 2 deletions pkgs/sagemath-meataxe/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ About this pip-installable source distribution
This pip-installable source distribution ``sagemath-meataxe`` is a small
optional distribution for use with ``sagemath-standard``.

This distribution provides the SageMath modules :mod:`sage.libs.meataxe`
and :mod:`sage.matrix.matrix_gfpn_dense`.
This distribution provides the SageMath modules ``sage.libs.meataxe``
and ``sage.matrix.matrix_gfpn_dense``.

It provides a specialized implementation of matrices over the finite field F_q, where
q <= 255, using the `SharedMeatAxe <http://users.minet.uni-jena.de/~king/SharedMeatAxe/>`
Expand Down
2 changes: 1 addition & 1 deletion pkgs/sagemath-meataxe/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta8
10.1.rc0
4 changes: 2 additions & 2 deletions pkgs/sagemath-objects/MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ graft sage/cpython

include VERSION.txt

global-include all__sagemath_objects.py

graft sage/structure
include sage/categories/action.*
include sage/categories/algebra_functor.*
Expand Down Expand Up @@ -85,6 +83,8 @@ graft sage/libs/gmp
include sage/misc/misc.* # some_tuples used in sage.misc.sage_unittest
include sage/misc/timing.p* # walltime, cputime used in sage.doctest

global-exclude all__*.py
global-include all__sagemath_objects.py

global-exclude *.c
global-exclude *.cpp
Expand Down
2 changes: 1 addition & 1 deletion pkgs/sagemath-objects/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta8
10.1.rc0
5 changes: 3 additions & 2 deletions pkgs/sagemath-repl/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
prune sage

global-include all__sagemath_repl.py

graft sage/doctest
graft sage/repl
include sage/misc/banner.py
Expand All @@ -11,6 +9,9 @@ include sage/misc/sage_eval.py

include VERSION.txt

global-exclude all__*.py
global-include all__sagemath_repl.py

global-exclude __pycache__
global-exclude *.py[co]
global-exclude *.bak
Expand Down
2 changes: 1 addition & 1 deletion pkgs/sagemath-repl/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta8
10.1.rc0
5 changes: 3 additions & 2 deletions pkgs/sagemath-sirocco/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
global-include all__sagemath_sirocco.py

include VERSION.txt

global-exclude *.c
global-exclude *.cpp

global-exclude all__sagemath_*.*
global-include all__sagemath_sirocco.py

global-exclude __pycache__
global-exclude *.py[co]
global-exclude *.bak
Expand Down
2 changes: 1 addition & 1 deletion pkgs/sagemath-sirocco/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta8
10.1.rc0
5 changes: 3 additions & 2 deletions pkgs/sagemath-tdlib/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
global-include all__sagemath_tdlib.py

include VERSION.txt

global-exclude *.c
global-exclude *.cpp

include sage/graphs/graph_decompositions/sage_tdlib.cpp

global-exclude all__sagemath_*.*
global-include all__sagemath_tdlib.py

global-exclude __pycache__
global-exclude *.py[co]
global-exclude *.bak
Expand Down
2 changes: 1 addition & 1 deletion pkgs/sagemath-tdlib/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.beta8
10.1.rc0
Loading

0 comments on commit fa300ae

Please sign in to comment.