Skip to content

Commit d6e3515

Browse files
Merge branch 'sagemath:develop' into 39314CoefficientPowerSeries
2 parents 2de57b5 + e0cf1e4 commit d6e3515

File tree

168 files changed

+1898
-956
lines changed

Some content is hidden

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

168 files changed

+1898
-956
lines changed

.github/workflows/ci-conda-known-test-failures.json

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

.github/workflows/ci-conda.yml

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

.github/workflows/ci-macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,14 @@ jobs:
8484
run: |
8585
sudo DEBIAN_FRONTEND=noninteractive apt-get update
8686
sudo DEBIAN_FRONTEND=noninteractive apt-get install $(build/bin/sage-get-system-packages debian _bootstrap)
87-
- name: Bootstrap with sage-update-version
87+
- name: Bootstrap with update-version
8888
# We set SAGE_ROOT and SAGE_SRC by hand
8989
# because 'sage -sh' does not work with an unconfigured tree,
9090
# giving: Error: SAGE_SCRIPTS_DIR is set to a bad value
9191
run: |
9292
git config --global user.email "[email protected]"
9393
git config --global user.name "Sage GitHub CI"
94-
SAGE_ROOT=. SAGE_SRC=./src src/bin/sage-update-version $(cat src/VERSION.txt).dev0 || echo "(ignoring error)"
94+
SAGE_ROOT=. SAGE_SRC=./src tools/update-version $(cat src/VERSION.txt).dev0 || echo "(ignoring error)"
9595
- name: make dist
9696
run: |
9797
./configure --enable-download-from-upstream-url && make dist

.github/workflows/ci-meson.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
# If editable then deleting the directory will cause sage to detect rebuild, which will cause ninja to fail
124124
# so we don't delete the directory in this case
125125
${{ matrix.editable && 'true' || 'rm -R ./src/sage_setup/' }}
126-
./sage -t --${{ matrix.tests }} -p4 --format github
126+
./sage -t ${{ matrix.tests == 'all' && '--all' || '--new --long' }} -p4 --format github
127127
128128
- name: Check that all modules can be imported
129129
shell: bash -l {0}

.upstream.d/20-github.com-sagemath-sage-releases

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@
22
# This file is automatically updated by the sage-update-version script.
33
https://github.com/sagemath/sage/releases/download/10.7/
44
https://github.com/sagemath/sage/releases/download/10.6/
5-
https://github.com/sagemath/sage/releases/download/10.5/

.vscode/settings.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// Exclude symbolic links into SAGE_ROOT/pkgs/
1010
"build/pkgs/*/src": true,
1111
// Exclude symbolic links into SAGE_ROOT/src/
12-
"pkgs/sage-conf_conda/sage_root": true,
1312
"pkgs/sage-conf_pypi/sage_root": true,
1413
"pkgs/sage-docbuild/sage_docbuild": true,
1514
"pkgs/sage-setup/sage_setup": true,

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.7.beta0
7+
version: 10.7.beta1
88
doi: 10.5281/zenodo.8042260
9-
date-released: 2025-04-02
9+
date-released: 2025-04-18
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.7.beta0, Release Date: 2025-04-02
1+
SageMath version 10.7.beta1, Release Date: 2025-04-18

build/pkgs/configure/SPKG.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ Special Update/Build Instructions
2424
---------------------------------
2525

2626
This tarball is automatically generated by Sage whenever you run the
27-
$SAGE_ROOT/bootstrap -s or the $SAGE_ROOT/src/bin/sage-update-version
27+
$SAGE_ROOT/bootstrap -s or the $SAGE_ROOT/tools/update-version
2828
script.

build/pkgs/configure/checksums.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=3371667ee074aefdde8fc64ad60928a29a1e3578
3-
sha256=4e93801f29ba7d242285ed1461300586b50db56474e84cefe0b793f8dbf54842
2+
sha1=db1650ff7b9bb3d07adbf2c6c1d4be2e39c22920
3+
sha256=7998f8b4ce7b527248461f87b305752f18d07460792d157447bd31b45b0dbc3d

0 commit comments

Comments
 (0)