Skip to content

Commit d9d8e14

Browse files
author
Matthias Koeppe
committed
Merge remote-tracking branch 'upstream/develop' into no-cygwin-distro-support
2 parents 52a657a + 272582b commit d9d8e14

File tree

872 files changed

+11104
-5655
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

872 files changed

+11104
-5655
lines changed

.github/workflows/ci-linux-incremental.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ jobs:
6060
- name: Determine targets to build
6161
id: build-targets
6262
run: |
63-
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
64-
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
63+
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
64+
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
6565
cat $GITHUB_OUTPUT
6666
6767
test:
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Upstream packages as uploaded as GitHub release assets.
22
# This file is automatically updated by the sage-update-version script.
3+
https://github.com/sagemath/sage/releases/download/10.3/
34
https://github.com/sagemath/sage/releases/download/10.2/
45
https://github.com/sagemath/sage/releases/download/10.1/

CITATION.cff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ title: SageMath
44
abstract: SageMath is a free open-source mathematics software system.
55
authors:
66
- name: "The SageMath Developers"
7-
version: 10.2.rc4
7+
version: 10.3.beta0
88
doi: 10.5281/zenodo.593563
9-
date-released: 2023-11-17
9+
date-released: 2023-12-05
1010
repository-code: "https://github.com/sagemath/sage"
1111
url: "https://www.sagemath.org/"

VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 10.2.rc4, Release Date: 2023-11-17
1+
SageMath version 10.3.beta0, Release Date: 2023-12-05

build/bin/sage-build-env-config.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ export SAGE_SUITESPARSE_PREFIX="@SAGE_SUITESPARSE_PREFIX@"
5858

5959
export SAGE_CONFIGURE_FFLAS_FFPACK="@SAGE_CONFIGURE_FFLAS_FFPACK@"
6060

61+
export SAGE_HAVE_LIBJPEG="@SAGE_HAVE_LIBJPEG@"
62+
6163
export CONFIGURED_SAGE_EDITABLE="@SAGE_EDITABLE@"
6264
export CONFIGURED_SAGE_WHEELS="@SAGE_WHEELS@"
6365

build/pkgs/_recommended/dependencies

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pandoc ffmpeg imagemagick texlive git
1+
pandoc ffmpeg imagemagick texlive git libjpeg

build/pkgs/antic/SPKG.rst

Lines changed: 0 additions & 18 deletions
This file was deleted.

build/pkgs/antic/checksums.ini

Lines changed: 0 additions & 5 deletions
This file was deleted.

build/pkgs/antic/distros/arch.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

build/pkgs/antic/distros/conda.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)