forked from sagemath/sage
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into p/38285/add-version-selector-top
- Loading branch information
Showing
67 changed files
with
126 additions
and
160 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
SageMath version 10.4.rc1, Release Date: 2024-06-27 | ||
SageMath version 10.4.rc2, Release Date: 2024-07-04 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -205,25 +205,16 @@ sdh_make_install() { | |
sdh_die "Error installing $PKG_NAME" | ||
} | ||
|
||
sdh_setup_bdist_wheel() { | ||
# Issue #32046: Most uses of this function can be replaced by sdh_pip_install | ||
mkdir -p dist | ||
rm -f dist/*.whl | ||
BDIST_DIR="$(mktemp -d)" | ||
python3 setup.py --no-user-cfg \ | ||
bdist_wheel --bdist-dir "$BDIST_DIR" \ | ||
"$@" || sdh_die "Error building a wheel for $PKG_NAME" | ||
} | ||
|
||
sdh_pip_install() { | ||
echo "Installing $PKG_NAME" | ||
sdh_build_wheel() { | ||
mkdir -p dist | ||
rm -f dist/*.whl | ||
export PIP_NO_INDEX=1 | ||
install_options="" | ||
build_options="" | ||
# pip has --no-build-isolation but no flag that turns the default back on... | ||
build_isolation_option="" | ||
# build has --wheel but no flag that turns the default (build sdist and then wheel) back on | ||
dist_option="--wheel" | ||
export PIP_FIND_LINKS="$SAGE_SPKG_WHEELS" | ||
unset PIP_NO_BINARY | ||
while [ $# -gt 0 ]; do | ||
|
@@ -243,6 +234,9 @@ sdh_pip_install() { | |
export PIP_NO_BINARY=:all: | ||
build_isolation_option="--no-isolation --skip-dependency-check" | ||
;; | ||
--sdist-then-wheel) | ||
dist_option="" | ||
;; | ||
--no-deps) | ||
install_options="$install_options $1" | ||
;; | ||
|
@@ -258,20 +252,20 @@ sdh_pip_install() { | |
esac | ||
shift | ||
done | ||
if python3 -m build --wheel --outdir=dist $build_isolation_option $build_options "$@"; then | ||
if python3 -m build $dist_option --outdir=dist $build_isolation_option $build_options "$@"; then | ||
: # successful | ||
else | ||
case $build_isolation_option in | ||
*--no-isolation*) | ||
sdh_die "Error building a wheel for $PKG_NAME" | ||
;; | ||
*) | ||
echo >&2 "Warning: building with \"python3 -m build --wheel --outdir=dist $build_isolation_option $build_options $@\" failed." | ||
echo >&2 "Warning: building with \"python3 -m build $dist_option --outdir=dist $build_isolation_option $build_options $@\" failed." | ||
unset PIP_FIND_LINKS | ||
export PIP_NO_BINARY=:all: | ||
build_isolation_option="--no-isolation --skip-dependency-check" | ||
echo >&2 "Retrying with \"python3 -m build --wheel --outdir=dist $build_isolation_option $build_options $@\"." | ||
if python3 -m build --wheel --outdir=dist $build_isolation_option $build_options "$@"; then | ||
echo >&2 "Retrying with \"python3 -m build $dist_option --outdir=dist $build_isolation_option $build_options $@\"." | ||
if python3 -m build $dist_option --outdir=dist $build_isolation_option $build_options "$@"; then | ||
echo >&2 "Warning: Wheel building needed to use \"$build_isolation_option\" to succeed. This means that a dependencies file in build/pkgs/ needs to be updated. Please report this to [email protected], including the build log of this package." | ||
else | ||
sdh_die "Error building a wheel for $PKG_NAME" | ||
|
@@ -282,6 +276,16 @@ sdh_pip_install() { | |
unset PIP_FIND_LINKS | ||
unset PIP_NO_BINARY | ||
unset PIP_NO_INDEX | ||
} | ||
|
||
sdh_build_and_store_wheel() { | ||
sdh_build_wheel "$@" | ||
sdh_store_wheel . | ||
} | ||
|
||
sdh_pip_install() { | ||
echo "Installing $PKG_NAME" | ||
sdh_build_wheel "$@" | ||
sdh_store_and_pip_install_wheel $install_options . | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
tarball=configure-VERSION.tar.gz | ||
sha1=7e1e01d82e171303935202d5876e0c109d431f8b | ||
sha256=eec0d494a20c6eff61a1ccc679cca149efd78cb191f88ade0446468b45abee00 | ||
sha1=1451031f1325bb7d31929b92415ee25795ed7022 | ||
sha256=a5c2064d5c792d32bbfa6c97a72aab395764ed7882f9bcadb8f04ca34c42c6b4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
19bd20218effcdb6b242bfb18b113ff85c6d8497 | ||
812a1160c06c055f74f9fcc86a7678c5a7a8788c |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../sage_setup/spkg-install.in |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.4rc1 | ||
sage-conf ~= 10.4rc2 |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../sage_setup/spkg-install.in |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.4rc1 | ||
sage-docbuild ~= 10.4rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.4rc1 | ||
sage-setup ~= 10.4rc2 |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../sage_setup/spkg-install.in |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.4rc1 | ||
sage-sws2rst ~= 10.4rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.4rc1 | ||
sagemath-standard ~= 10.4rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.4rc1 | ||
sagemath-bliss ~= 10.4rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.4rc1 | ||
sagemath-categories ~= 10.4rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.4rc1 | ||
sagemath-coxeter3 ~= 10.4rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.4rc1 | ||
sagemath-environment ~= 10.4rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.4rc1 | ||
sagemath-mcqd ~= 10.4rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.4rc1 | ||
sagemath-meataxe ~= 10.4rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.4rc1 | ||
sagemath-objects ~= 10.4rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.4rc1 | ||
sagemath-repl ~= 10.4rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.4rc1 | ||
sagemath-sirocco ~= 10.4rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.4rc1 | ||
sagemath-tdlib ~= 10.4rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
10.4.rc1 | ||
10.4.rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
10.4.rc1 | ||
10.4.rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
10.4.rc1 | ||
10.4.rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
10.4.rc1 | ||
10.4.rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
10.4.rc1 | ||
10.4.rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
10.4.rc1 | ||
10.4.rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
10.4.rc1 | ||
10.4.rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
10.4.rc1 | ||
10.4.rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
10.4.rc1 | ||
10.4.rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
10.4.rc1 | ||
10.4.rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
10.4.rc1 | ||
10.4.rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
10.4.rc1 | ||
10.4.rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
10.4.rc1 | ||
10.4.rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
10.4.rc1 | ||
10.4.rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
10.4.rc1 | ||
10.4.rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
10.4.rc1 | ||
10.4.rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
10.4.rc1 | ||
10.4.rc2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.