Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit 7ad4c0e

Browse files
author
Matthias Koeppe
committed
Merge tag '9.3.beta4' into t/30912/sagelib__update_metadata_for_pypi_deployment
SageMath version 9.3.beta4, Release Date: 2020-12-14
2 parents deb9eb3 + c4a802d commit 7ad4c0e

File tree

439 files changed

+3116
-3411
lines changed

Some content is hidden

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

439 files changed

+3116
-3411
lines changed

‎.github/workflows/ci-cygwin-standard.yml

+19-19
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ jobs:
205205
path: C:\\tools\\cygwin\\tmp
206206
- name: Extract sage-local artifact
207207
run: |
208-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-${{ env.PREVIOUS_STAGES }}.tar'
208+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null local'
209209
- name: configure
210210
run: |
211211
C:\\tools\\cygwin\\bin\\bash -l -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && ./configure $CONFIGURE_ARGS'
@@ -233,7 +233,7 @@ jobs:
233233
# We specifically use the cygwin tar so that symlinks are saved/restored correctly on Windows.
234234
# We remove the local/lib64 link, which will be recreated by the next stage.
235235
run: |
236-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --remove-files local'
236+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --listed-incremental=/tmp/sage-local.snar local'
237237
if: always()
238238
- uses: actions/upload-artifact@v2
239239
# upload-artifact@v2 does not support whitespace in file names.
@@ -285,7 +285,7 @@ jobs:
285285
path: C:\\tools\\cygwin\\tmp
286286
- name: Extract sage-local artifact
287287
run: |
288-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-${{ env.PREVIOUS_STAGES }}.tar'
288+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null local'
289289
- name: configure
290290
run: |
291291
C:\\tools\\cygwin\\bin\\bash -l -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && ./configure $CONFIGURE_ARGS'
@@ -313,7 +313,7 @@ jobs:
313313
# We specifically use the cygwin tar so that symlinks are saved/restored correctly on Windows.
314314
# We remove the local/lib64 link, which will be recreated by the next stage.
315315
run: |
316-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --remove-files local'
316+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --listed-incremental=/tmp/sage-local.snar local'
317317
if: always()
318318
- uses: actions/upload-artifact@v2
319319
with:
@@ -363,7 +363,7 @@ jobs:
363363
path: C:\\tools\\cygwin\\tmp
364364
- name: Extract sage-local artifact
365365
run: |
366-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-${{ env.PREVIOUS_STAGES }}.tar'
366+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null local'
367367
- name: configure
368368
run: |
369369
C:\\tools\\cygwin\\bin\\bash -l -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && ./configure $CONFIGURE_ARGS'
@@ -391,7 +391,7 @@ jobs:
391391
# We specifically use the cygwin tar so that symlinks are saved/restored correctly on Windows.
392392
# We remove the local/lib64 link, which will be recreated by the next stage.
393393
run: |
394-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --remove-files local'
394+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --listed-incremental=/tmp/sage-local.snar local'
395395
if: always()
396396
- uses: actions/upload-artifact@v2
397397
with:
@@ -441,7 +441,7 @@ jobs:
441441
path: C:\\tools\\cygwin\\tmp
442442
- name: Extract sage-local artifact
443443
run: |
444-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-${{ env.PREVIOUS_STAGES }}.tar'
444+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null local'
445445
- name: configure
446446
run: |
447447
C:\\tools\\cygwin\\bin\\bash -l -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && ./configure $CONFIGURE_ARGS'
@@ -469,7 +469,7 @@ jobs:
469469
# We specifically use the cygwin tar so that symlinks are saved/restored correctly on Windows.
470470
# We remove the local/lib64 link, which will be recreated by the next stage.
471471
run: |
472-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --remove-files local'
472+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --listed-incremental=/tmp/sage-local.snar local'
473473
if: always()
474474
- uses: actions/upload-artifact@v2
475475
with:
@@ -519,7 +519,7 @@ jobs:
519519
path: C:\\tools\\cygwin\\tmp
520520
- name: Extract sage-local artifact
521521
run: |
522-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-${{ env.PREVIOUS_STAGES }}.tar'
522+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null local'
523523
- name: configure
524524
run: |
525525
C:\\tools\\cygwin\\bin\\bash -l -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && ./configure $CONFIGURE_ARGS'
@@ -547,7 +547,7 @@ jobs:
547547
# We specifically use the cygwin tar so that symlinks are saved/restored correctly on Windows.
548548
# We remove the local/lib64 link, which will be recreated by the next stage.
549549
run: |
550-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --remove-files local'
550+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --listed-incremental=/tmp/sage-local.snar local'
551551
if: always()
552552
- uses: actions/upload-artifact@v2
553553
with:
@@ -599,7 +599,7 @@ jobs:
599599
path: C:\\tools\\cygwin\\tmp
600600
- name: Extract sage-local artifact
601601
run: |
602-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-${{ env.PREVIOUS_STAGES }}.tar'
602+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null local'
603603
- name: configure
604604
run: |
605605
C:\\tools\\cygwin\\bin\\bash -l -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && ./configure $CONFIGURE_ARGS'
@@ -627,7 +627,7 @@ jobs:
627627
# We specifically use the cygwin tar so that symlinks are saved/restored correctly on Windows.
628628
# We remove the local/lib64 link, which will be recreated by the next stage.
629629
run: |
630-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --remove-files local'
630+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --listed-incremental=/tmp/sage-local.snar local'
631631
if: always()
632632
- uses: actions/upload-artifact@v2
633633
with:
@@ -679,7 +679,7 @@ jobs:
679679
path: C:\\tools\\cygwin\\tmp
680680
- name: Extract sage-local artifact
681681
run: |
682-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-${{ env.PREVIOUS_STAGES }}.tar'
682+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null local'
683683
- name: configure
684684
run: |
685685
C:\\tools\\cygwin\\bin\\bash -l -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && ./configure $CONFIGURE_ARGS'
@@ -707,7 +707,7 @@ jobs:
707707
# We specifically use the cygwin tar so that symlinks are saved/restored correctly on Windows.
708708
# We remove the local/lib64 link, which will be recreated by the next stage.
709709
run: |
710-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --remove-files local'
710+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --listed-incremental=/tmp/sage-local.snar local'
711711
if: always()
712712
- uses: actions/upload-artifact@v2
713713
with:
@@ -757,7 +757,7 @@ jobs:
757757
path: C:\\tools\\cygwin\\tmp
758758
- name: Extract sage-local artifact
759759
run: |
760-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-${{ env.PREVIOUS_STAGES }}.tar'
760+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null local'
761761
- name: configure
762762
run: |
763763
C:\\tools\\cygwin\\bin\\bash -l -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && ./configure $CONFIGURE_ARGS'
@@ -785,7 +785,7 @@ jobs:
785785
# We specifically use the cygwin tar so that symlinks are saved/restored correctly on Windows.
786786
# We remove the local/lib64 link, which will be recreated by the next stage.
787787
run: |
788-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --remove-files local'
788+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --listed-incremental=/tmp/sage-local.snar local'
789789
if: always()
790790
- uses: actions/upload-artifact@v2
791791
with:
@@ -835,7 +835,7 @@ jobs:
835835
path: C:\\tools\\cygwin\\tmp
836836
- name: Extract sage-local artifact
837837
run: |
838-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-${{ env.PREVIOUS_STAGES }}.tar'
838+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null local'
839839
- name: configure
840840
run: |
841841
C:\\tools\\cygwin\\bin\\bash -l -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && ./configure $CONFIGURE_ARGS'
@@ -863,7 +863,7 @@ jobs:
863863
# We specifically use the cygwin tar so that symlinks are saved/restored correctly on Windows.
864864
# We remove the local/lib64 link, which will be recreated by the next stage.
865865
run: |
866-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --remove-files local'
866+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --listed-incremental=/tmp/sage-local.snar local'
867867
if: always()
868868
- uses: actions/upload-artifact@v2
869869
with:
@@ -941,7 +941,7 @@ jobs:
941941
# We specifically use the cygwin tar so that symlinks are saved/restored correctly on Windows.
942942
# We remove the local/lib64 link, which will be recreated by the next stage.
943943
run: |
944-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --remove-files local'
944+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --listed-incremental=/tmp/sage-local.snar local'
945945
if: always()
946946
- uses: actions/upload-artifact@v2
947947
with:

‎.github/workflows/tox-experimental.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
fail-fast: false
3737
max-parallel: 6
3838
matrix:
39-
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, ubuntu-focal, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, centos-7, centos-8, gentoo, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-eoan-i386, debian-buster-i386, centos-7-i386]
39+
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7, centos-8, gentoo, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-focal-i386, debian-buster-i386, centos-7-i386]
4040
tox_packages_factor: [maximal]
4141
targets_pattern: [0-g, h-o, p, q-z]
4242
env:

‎.github/workflows/tox-optional.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
fail-fast: false
3737
max-parallel: 6
3838
matrix:
39-
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, ubuntu-focal, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, centos-7, centos-8, gentoo, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-eoan-i386, debian-buster-i386, centos-7-i386]
39+
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7, centos-8, gentoo, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-focal-i386, debian-buster-i386, centos-7-i386]
4040
tox_packages_factor: [maximal]
4141
targets_pattern: [0-g, h-o, p, q-z]
4242
env:

‎.github/workflows/tox.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
fail-fast: false
3737
max-parallel: 20
3838
matrix:
39-
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, ubuntu-focal, ubuntu-groovy, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, centos-7, centos-8, gentoo, gentoo-python3.7, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-focal-i386, debian-buster-i386, centos-7-i386]
39+
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7, centos-8, gentoo, gentoo-python3.7, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-focal-i386, debian-buster-i386, centos-7-i386]
4040
tox_packages_factor: [minimal, standard]
4141
env:
4242
TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ src/*.egg-info/
135135
/src/build
136136
/src/Makefile
137137
/src/bin/sage-env-config
138+
/src/bin/sage-src-env-config
138139

139140
# Virtual environments
140141
src/.env

‎.zenodo.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"description": "Mirror of the Sage https://sagemath.org/ source tree",
33
"license": "other-open",
4-
"title": "sagemath/sage: 9.3.beta3",
5-
"version": "9.3.beta3",
4+
"title": "sagemath/sage: 9.3.beta4",
5+
"version": "9.3.beta4",
66
"upload_type": "software",
7-
"publication_date": "2020-12-06",
7+
"publication_date": "2020-12-14",
88
"creators": [
99
{
1010
"affiliation": "SageMath.org",
@@ -15,7 +15,7 @@
1515
"related_identifiers": [
1616
{
1717
"scheme": "url",
18-
"identifier": "https://github.com/sagemath/sage/tree/9.3.beta3",
18+
"identifier": "https://github.com/sagemath/sage/tree/9.3.beta4",
1919
"relation": "isSupplementTo"
2020
},
2121
{

‎VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 9.3.beta3, Release Date: 2020-12-06
1+
SageMath version 9.3.beta4, Release Date: 2020-12-14

‎bootstrap

+5-11
Original file line numberDiff line numberDiff line change
@@ -80,23 +80,17 @@ install_config_rpath() {
8080
bootstrap () {
8181
rm -f m4/sage_spkg_configures.m4
8282
spkg_configures=""
83-
for filename in $(find build/pkgs -type f -name type); do
84-
pkgtype="$(cat $filename)"
85-
pkgname="$(echo $filename | cut -d/ -f3)"
86-
case "$pkgtype" in
87-
optional|experimental)
83+
for pkgname in $(./sage --package list :optional: :experimental: | sort); do
8884
# Trac #29629: Temporary solution for Sage 9.1: Do not provide
8985
# --enable-SPKG options for installing pip packages
90-
if [ ! -f "$(dirname $filename)/requirements.txt" ]; then
86+
if [ ! -f build/pkgs/$pkgname/requirements.txt ]; then
87+
pkgtype="$(cat build/pkgs/$pkgname/type)"
9188
spkg_configures="$spkg_configures
9289
SAGE_SPKG_ENABLE([$pkgname], [$pkgtype])"
9390
fi
94-
;;
95-
esac
9691
done
97-
for filename in $(find build/pkgs -type f -name spkg-configure.m4 | sort); do
98-
pkgname="$(echo $filename | cut -d/ -f3)"
99-
echo "m4_sinclude([$filename])" >> m4/sage_spkg_configures.m4
92+
for pkgname in $(./sage --package list --has-file spkg-configure.m4 | sort); do
93+
echo "m4_sinclude([build/pkgs/$pkgname/spkg-configure.m4])" >> m4/sage_spkg_configures.m4
10094
spkg_configures="$spkg_configures
10195
SAGE_SPKG_CONFIGURE_$(echo ${pkgname} | tr '[a-z]' '[A-Z]')"
10296
done

0 commit comments

Comments
 (0)