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

Commit c3e7386

Browse files
author
Matthias Koeppe
committed
Merge branch 't/30944/tox__improve_local_sudo_ubuntu_standard' into t/31114/repology
2 parents c0cdd8c + ab19133 commit c3e7386

40 files changed

+164
-105
lines changed

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

Lines changed: 31 additions & 31 deletions
Large diffs are not rendered by default.

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
shell: bash {0}
4444
run: |
4545
choco --version
46-
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
46+
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
4747
choco install $PACKAGES --source cygwin
4848
- name: bootstrap
4949
run: |
@@ -113,7 +113,7 @@ jobs:
113113
shell: bash {0}
114114
run: |
115115
choco --version
116-
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
116+
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
117117
choco install $PACKAGES --source cygwin
118118
- name: bootstrap
119119
run: |
@@ -188,7 +188,7 @@ jobs:
188188
shell: bash {0}
189189
run: |
190190
choco --version
191-
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
191+
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
192192
choco install $PACKAGES --source cygwin
193193
- name: bootstrap
194194
run: |
@@ -268,7 +268,7 @@ jobs:
268268
shell: bash {0}
269269
run: |
270270
choco --version
271-
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
271+
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
272272
choco install $PACKAGES --source cygwin
273273
- name: bootstrap
274274
run: |
@@ -346,7 +346,7 @@ jobs:
346346
shell: bash {0}
347347
run: |
348348
choco --version
349-
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
349+
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
350350
choco install $PACKAGES --source cygwin
351351
- name: bootstrap
352352
run: |
@@ -424,7 +424,7 @@ jobs:
424424
shell: bash {0}
425425
run: |
426426
choco --version
427-
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
427+
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
428428
choco install $PACKAGES --source cygwin
429429
- name: bootstrap
430430
run: |
@@ -502,7 +502,7 @@ jobs:
502502
shell: bash {0}
503503
run: |
504504
choco --version
505-
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
505+
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
506506
choco install $PACKAGES --source cygwin
507507
- name: bootstrap
508508
run: |
@@ -582,7 +582,7 @@ jobs:
582582
shell: bash {0}
583583
run: |
584584
choco --version
585-
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
585+
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
586586
choco install $PACKAGES --source cygwin
587587
- name: bootstrap
588588
run: |
@@ -662,7 +662,7 @@ jobs:
662662
shell: bash {0}
663663
run: |
664664
choco --version
665-
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
665+
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
666666
choco install $PACKAGES --source cygwin
667667
- name: bootstrap
668668
run: |
@@ -740,7 +740,7 @@ jobs:
740740
shell: bash {0}
741741
run: |
742742
choco --version
743-
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
743+
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
744744
choco install $PACKAGES --source cygwin
745745
- name: bootstrap
746746
run: |
@@ -818,7 +818,7 @@ jobs:
818818
shell: bash {0}
819819
run: |
820820
choco --version
821-
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
821+
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
822822
choco install $PACKAGES --source cygwin
823823
- name: bootstrap
824824
run: |
@@ -896,7 +896,7 @@ jobs:
896896
shell: bash {0}
897897
run: |
898898
choco --version
899-
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
899+
PACKAGES=$(sed 's/#.*//;' ./build/pkgs/_prereq/distros/cygwin.txt ./build/pkgs/_prereq/distros/cygwin-bootstrap.txt)
900900
choco install $PACKAGES --source cygwin
901901
- name: bootstrap
902902
run: |

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ ptestoptional: all
208208
ptestoptionallong: all
209209
$(PTESTALL) --long --logfile=logs/ptestoptionallong.log
210210

211-
configure: bootstrap src/doc/bootstrap configure.ac src/bin/sage-version.sh m4/*.m4 build/pkgs/*/spkg-configure.m4 build/pkgs/*/type build/pkgs/*.txt build/pkgs/*/distros/*.txt
211+
configure: bootstrap src/doc/bootstrap configure.ac src/bin/sage-version.sh m4/*.m4 build/pkgs/*/spkg-configure.m4 build/pkgs/*/type build/pkgs/*/distros/*.txt
212212
./bootstrap -d
213213

214214
install: all

‎bootstrap‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,12 @@ bootstrap () {
8585
# --enable-SPKG options for installing pip packages
8686
if [ ! -f build/pkgs/$pkgname/requirements.txt ]; then
8787
pkgtype="$(cat build/pkgs/$pkgname/type)"
88-
spkg_configures="$spkg_configures
89-
SAGE_SPKG_ENABLE([$pkgname], [$pkgtype])"
88+
# Trac #29124: Do not provide --enable-_recommended and similar
89+
case "$pkgname" in
90+
_*) ;;
91+
*) spkg_configures="$spkg_configures
92+
SAGE_SPKG_ENABLE([$pkgname], [$pkgtype])" ;;
93+
esac
9094
fi
9195
done
9296
for pkgname in $(./sage --package list --has-file spkg-configure.m4 | sort); do

‎build/bin/sage-print-system-package-command‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ if [ -z "$system" -o -z "$command" ]; then
5353
fi
5454
system_packages="$*"
5555
options=
56+
env=
5657
shopt -s extglob
5758

5859
function print_shell_command()
@@ -96,8 +97,8 @@ case $system:$command in
9697
;;
9798
@(debian*|ubuntu*):*)
9899
[ "$NO_INSTALL_RECOMMENDS" = yes ] && options="$options --no-install-recommends"
99-
[ "$YES" = yes ] && options="$options --yes"
100-
[ -n "$system_packages" ] && print_shell_command "${SUDO}apt-get $command $options $system_packages"
100+
[ "$YES" = yes ] && options="$options --yes" env="DEBIAN_FRONTEND=noninteractive "
101+
[ -n "$system_packages" ] && print_shell_command "${SUDO}${env}apt-get $command $options $system_packages"
101102
;;
102103
@(fedora*|redhat*|centos*):install)
103104
[ "$YES" = yes ] && options="$options -y"

‎build/bin/write-dockerfile.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ IGNORE_MISSING_SYSTEM_PACKAGES="${4:-no}"
1212
STRIP_COMMENTS="sed s/#.*//;"
1313
SAGE_ROOT=.
1414
export PATH="$SAGE_ROOT"/build/bin:$PATH
15-
SYSTEM_PACKAGES=$(echo $(${STRIP_COMMENTS} "$SAGE_ROOT"/build/pkgs/$SYSTEM{,-bootstrap}.txt))
15+
SYSTEM_PACKAGES=
1616
CONFIGURE_ARGS="--enable-option-checking "
17-
for PKG_BASE in $($SAGE_ROOT/sage -package list --has-file=distros/$SYSTEM.txt $SAGE_PACKAGE_LIST_ARGS); do
17+
for PKG_BASE in $($SAGE_ROOT/sage -package list --has-file=distros/$SYSTEM.txt $SAGE_PACKAGE_LIST_ARGS) _bootstrap; do
1818
PKG_SCRIPTS="$SAGE_ROOT"/build/pkgs/$PKG_BASE
1919
if [ -d $PKG_SCRIPTS ]; then
2020
SYSTEM_PACKAGES_FILE=$PKG_SCRIPTS/distros/$SYSTEM.txt

‎build/pkgs/_bootstrap/SPKG.rst‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
_bootstrap
2+
==========
3+
4+
This optional script package represents the requirements (system packages)
5+
that are needed in addition to those represented by the ``_prereq`` package
6+
in order to run the top-level ``bootstrap`` script.

build/pkgs/arch-bootstrap.txt renamed to build/pkgs/_bootstrap/distros/arch.txt

File renamed without changes.

build/pkgs/conda-bootstrap.txt renamed to build/pkgs/_bootstrap/distros/conda.txt

File renamed without changes.

build/pkgs/cygwin-bootstrap.txt renamed to build/pkgs/_bootstrap/distros/cygwin.txt

File renamed without changes.

0 commit comments

Comments
 (0)