Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into meson-compile
Browse files Browse the repository at this point in the history
  • Loading branch information
tobiasdiez authored Dec 7, 2023
2 parents 46dbc4f + 272582b commit f001d1a
Show file tree
Hide file tree
Showing 757 changed files with 10,304 additions and 5,028 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,15 @@ jobs:
SAGE_NUM_THREADS: 2

- name: Build modularized distributions
if: always() && steps.worktree.outcome == 'success'
if: (success() || failure()) && steps.worktree.outcome == 'success'
run: make V=0 tox && make SAGE_CHECK=no pypi-wheels
working-directory: ./worktree-image
env:
MAKE: make -j2 --output-sync=recurse
SAGE_NUM_THREADS: 2

- name: Static code check with pyright
if: always() && steps.worktree.outcome == 'success'
if: (success() || failure()) && steps.worktree.outcome == 'success'
uses: jakebailey/pyright-action@v1
with:
version: 1.1.332
Expand All @@ -116,7 +116,7 @@ jobs:
NODE_OPTIONS: --max-old-space-size=8192

- name: Static code check with pyright (annotated)
if: always() && steps.worktree.outcome == 'success'
if: (success() || failure()) && steps.worktree.outcome == 'success'
uses: jakebailey/pyright-action@v1
with:
version: 1.1.332
Expand All @@ -130,7 +130,7 @@ jobs:

- name: Clean (fallback to non-incremental)
id: clean
if: always() && steps.worktree.outcome == 'success' && steps.incremental.outcome != 'success'
if: (success() || failure()) && 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
Expand All @@ -143,7 +143,7 @@ jobs:
# 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')
if: (success() || failure()) && (steps.incremental.outcome == 'success' || steps.clean.outcome == 'success')
run: |
make build
working-directory: ./worktree-image
Expand All @@ -154,7 +154,7 @@ jobs:
# Testing

- name: Test changed files (sage -t --new)
if: always() && steps.build.outcome == 'success'
if: (success() || failure()) && steps.build.outcome == 'success'
run: |
# We run tests with "sage -t --new"; this only tests the uncommitted changes.
./sage -t --new -p2
Expand All @@ -164,7 +164,7 @@ jobs:
SAGE_NUM_THREADS: 2

- name: Test modularized distributions
if: always() && steps.build.outcome == 'success'
if: (success() || failure()) && steps.build.outcome == 'success'
run: make V=0 tox && make pypi-wheels-check
working-directory: ./worktree-image
env:
Expand All @@ -182,14 +182,14 @@ jobs:
COLUMNS: 120

- name: Test all files (sage -t --all --long)
if: always() && steps.build.outcome == 'success'
if: (success() || failure()) && 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.build.outcome == 'success'
if: (success() || failure()) && steps.build.outcome == 'success'
run: |
./venv/bin/python3 -m coverage combine src/.coverage/
./venv/bin/python3 -m coverage xml
Expand All @@ -198,7 +198,7 @@ jobs:
working-directory: ./worktree-image

- name: Upload coverage to codecov
if: always() && steps.build.outcome == 'success'
if: (success() || failure()) && steps.build.outcome == 'success'
uses: codecov/codecov-action@v3
with:
directory: ./worktree-image/coverage-report
4 changes: 2 additions & 2 deletions .github/workflows/ci-linux-incremental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ jobs:
- name: Determine targets to build
id: build-targets
run: |
echo "uninstall_targets=$(echo $(for a in '' ${{ steps.changed-packages.outputs.configures_all_changed_files }}; do echo $a | sed -E 's,build/pkgs/([_.a-z0-9]*)/spkg-configure[.]m4 *,\1-uninstall,'; done | sort -u))" >> $GITHUB_OUTPUT
echo "build_targets=$(echo $(for a in '' ${{ steps.changed-packages.outputs.pkgs_all_changed_files }}; do echo $a | sed -E 's,-,_,g;s,(build/)?pkgs/([-_.a-z0-9]*)/[^ ]* *,\2-ensure,;'; done | sort -u))" >> $GITHUB_OUTPUT
echo "uninstall_targets=$(echo $(for a in '' ${{ steps.changed-packages.outputs.configures_all_changed_files }}; do echo $a | sed -E 's,build/pkgs/([a-z0-9][_.a-z0-9]*)/spkg-configure[.]m4 *,\1-uninstall,'; done | sort -u))" >> $GITHUB_OUTPUT
echo "build_targets=$(echo $(for a in '' ${{ steps.changed-packages.outputs.pkgs_all_changed_files }}; do SPKG=$(echo $a | sed -E 's,-,_,g;s,(build/)?pkgs/([a-z0-9][-_.a-z0-9]*)/[^ ]* *,\2,;'); if [ -f "build/pkgs/$SPKG/checksums.ini" -o -f "build/pkgs/$SPKG/requirements.txt" -o -f "build/pkgs/$SPKG/spkg-install" ]; then echo "$SPKG-ensure"; fi; done | sort -u))" >> $GITHUB_OUTPUT
cat $GITHUB_OUTPUT
test:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/doc-build-pdf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:

- name: Build (fallback to non-incremental)
id: build
if: always() && steps.worktree.outcome == 'success' && steps.incremental.outcome != 'success'
if: (success() || failure()) && steps.worktree.outcome == 'success' && steps.incremental.outcome != 'success'
run: |
set -ex
make sagelib-clean && git clean -fx src/sage && ./config.status && make build
Expand All @@ -103,7 +103,7 @@ jobs:

- name: Build docs (PDF)
id: docbuild
if: always() && (steps.incremental.outcome == 'success' || steps.build.outcome == 'success')
if: (success() || failure()) && (steps.incremental.outcome == 'success' || steps.build.outcome == 'success')
run: |
make doc-clean doc-uninstall; make sagemath_doc_html-build-deps sagemath_doc_pdf-no-deps
working-directory: ./worktree-image
Expand All @@ -113,7 +113,7 @@ jobs:

- name: Copy docs
id: copy
if: always() && steps.docbuild.outcome == 'success'
if: (success() || failure()) && steps.docbuild.outcome == 'success'
run: |
# For some reason the deploy step below cannot find /sage/...
# So copy everything from there to local folder
Expand All @@ -123,7 +123,7 @@ jobs:
zip -r docs-pdf.zip docs
- name: Upload docs
if: always() && steps.copy.outcome == 'success'
if: (success() || failure()) && steps.copy.outcome == 'success'
uses: actions/upload-artifact@v3
with:
name: docs-pdf
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/doc-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:

- name: Build (fallback to non-incremental)
id: build
if: always() && steps.worktree.outcome == 'success' && steps.incremental.outcome != 'success'
if: (success() || failure()) && steps.worktree.outcome == 'success' && steps.incremental.outcome != 'success'
run: |
set -ex
make sagelib-clean && git clean -fx src/sage && ./config.status && make sagemath_doc_html-build-deps
Expand All @@ -110,7 +110,7 @@ jobs:

- name: Build docs
id: docbuild
if: always() && (steps.incremental.outcome == 'success' || steps.build.outcome == 'success')
if: (success() || failure()) && (steps.incremental.outcome == 'success' || steps.build.outcome == 'success')
# Always non-incremental because of the concern that
# incremental docbuild may introduce broken links (inter-file references) though build succeeds
run: |
Expand All @@ -127,7 +127,7 @@ jobs:

- name: Copy docs
id: copy
if: always() && steps.docbuild.outcome == 'success'
if: (success() || failure()) && steps.docbuild.outcome == 'success'
run: |
set -ex
mkdir -p ./docs
Expand Down Expand Up @@ -191,7 +191,7 @@ jobs:
zip -r docs.zip docs
- name: Upload docs
if: always() && steps.copy.outcome == 'success'
if: (success() || failure()) && steps.copy.outcome == 'success'
uses: actions/upload-artifact@v3
with:
name: docs
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ jobs:
run: pip install tox

- name: Code style check with pycodestyle
if: always() && steps.deps.outcome == 'success'
if: (success() || failure()) && steps.deps.outcome == 'success'
run: tox -e pycodestyle-minimal

- name: Code style check with relint
if: always() && steps.deps.outcome == 'success'
if: (success() || failure()) && steps.deps.outcome == 'success'
run: tox -e relint -- src/sage/

- name: Validate docstring markup as RST
if: always() && steps.deps.outcome == 'success'
if: (success() || failure()) && steps.deps.outcome == 'success'
run: tox -e rst
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ on:
default: >-
[["latest", "", "homebrew-macos-usrlocal-minimal"],
["latest", "", "homebrew-macos-usrlocal-standard"],
["11", "xcode_13.2.1", "homebrew-macos-usrlocal-minimal],
["11", "xcode_13.2.1", "homebrew-macos-usrlocal-minimal"],
["12", "", "homebrew-macos-usrlocal-standard"],
["13", "xcode_15.0", "homebrew-macos-usrlocal-standard"],
["latest", "", "homebrew-macos-usrlocal-maximal"],
Expand Down
1 change: 1 addition & 0 deletions .upstream.d/20-github.com-sagemath-sage-releases
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Upstream packages as uploaded as GitHub release assets.
# This file is automatically updated by the sage-update-version script.
https://github.com/sagemath/sage/releases/download/10.3/
https://github.com/sagemath/sage/releases/download/10.2/
https://github.com/sagemath/sage/releases/download/10.1/
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.2.rc3
version: 10.3.beta0
doi: 10.5281/zenodo.593563
date-released: 2023-11-14
date-released: 2023-12-05
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.2.rc3, Release Date: 2023-11-14
SageMath version 10.3.beta0, Release Date: 2023-12-05
2 changes: 2 additions & 0 deletions build/bin/sage-build-env-config.in
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ export SAGE_SUITESPARSE_PREFIX="@SAGE_SUITESPARSE_PREFIX@"

export SAGE_CONFIGURE_FFLAS_FFPACK="@SAGE_CONFIGURE_FFLAS_FFPACK@"

export SAGE_HAVE_LIBJPEG="@SAGE_HAVE_LIBJPEG@"

export CONFIGURED_SAGE_EDITABLE="@SAGE_EDITABLE@"
export CONFIGURED_SAGE_WHEELS="@SAGE_WHEELS@"

Expand Down
1 change: 1 addition & 0 deletions build/pkgs/_prereq/distros/opensuse.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
binutils
make
m4
gawk
perl
python3
tar
Expand Down
2 changes: 1 addition & 1 deletion build/pkgs/_recommended/dependencies
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pandoc ffmpeg imagemagick texlive git
pandoc ffmpeg imagemagick texlive git libjpeg
18 changes: 0 additions & 18 deletions build/pkgs/antic/SPKG.rst

This file was deleted.

5 changes: 0 additions & 5 deletions build/pkgs/antic/checksums.ini

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/antic/distros/arch.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/antic/distros/conda.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/antic/distros/debian.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/antic/distros/fedora.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/antic/distros/freebsd.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/antic/distros/opensuse.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/antic/distros/repology.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/antic/package-version.txt

This file was deleted.

19 changes: 0 additions & 19 deletions build/pkgs/antic/spkg-install.in

This file was deleted.

18 changes: 18 additions & 0 deletions build/pkgs/anyio/SPKG.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
anyio: High level compatibility layer for multiple asynchronous event loop implementations
==========================================================================================

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

High level compatibility layer for multiple asynchronous event loop implementations

License
-------

MIT

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

https://pypi.org/project/anyio/

5 changes: 5 additions & 0 deletions build/pkgs/anyio/checksums.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
tarball=anyio-VERSION-py3-none-any.whl
sha1=bb08368bb19e1aff2f4190e39300e43fee52103e
md5=420d85e19168705cdf0223621b18831a
cksum=627181302
upstream_url=https://pypi.io/packages/py3/a/anyio/anyio-VERSION-py3-none-any.whl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
hatchling | $(PYTHON_TOOLCHAIN) $(PYTHON)
idna sniffio | $(PYTHON_TOOLCHAIN) $(PYTHON)

----------
All lines of this file are ignored except the first.
1 change: 1 addition & 0 deletions build/pkgs/anyio/install-requires.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
anyio
1 change: 1 addition & 0 deletions build/pkgs/anyio/package-version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4.0.0
File renamed without changes.
27 changes: 0 additions & 27 deletions build/pkgs/arb/SPKG.rst

This file was deleted.

5 changes: 0 additions & 5 deletions build/pkgs/arb/checksums.ini

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/arb/distros/arch.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/arb/distros/conda.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/arb/distros/debian.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/arb/distros/fedora.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/arb/distros/freebsd.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/arb/distros/gentoo.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/arb/distros/homebrew.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/arb/distros/nix.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/arb/distros/opensuse.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/arb/distros/repology.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/arb/distros/void.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/arb/package-version.txt

This file was deleted.

2 changes: 0 additions & 2 deletions build/pkgs/arb/spkg-check.in

This file was deleted.

Loading

0 comments on commit f001d1a

Please sign in to comment.