Skip to content

Commit 6d838ba

Browse files
author
Release Manager
committed
gh-36382: `configure --enable-system-site-packages`: First check all non-site packages <!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes #1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> We first test all the packages without SAGE_PYTHON_PACKAGE_CHECK, then those with SAGE_PYTHON_PACKAGE_CHECK. This is purely cosmetic, but possibly also useful preparation for checking for the site packages faster, using only one venv, and with less repeated output. <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [ ] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - #12345: short description why this is a dependency - #34567: ... --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: #36382 Reported by: Matthias Köppe Reviewer(s): Michael Orlitzky
2 parents 5da52a7 + 9871ad6 commit 6d838ba

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

bootstrap

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,19 @@ SAGE_SPKG_ENABLE([$pkgname], [$pkgtype], [$(grep -v ^= build/pkgs/$pkgname/SPKG.
7373
done
7474
for pkgname in $(sage-package list --has-file spkg-configure.m4 | sort); do
7575
echo "m4_sinclude([build/pkgs/$pkgname/spkg-configure.m4])"
76-
spkg_configures="$spkg_configures
77-
SAGE_SPKG_CONFIGURE_$(echo ${pkgname} | tr '[a-z]' '[A-Z]')"
76+
config="SAGE_SPKG_CONFIGURE_$(echo ${pkgname} | tr '[a-z]' '[A-Z]')"
77+
if grep -q SAGE_PYTHON_PACKAGE_CHECK build/pkgs/$pkgname/spkg-configure.m4; then
78+
spkg_configures_python="$spkg_configures_python
79+
$config"
80+
else
81+
spkg_configures="$spkg_configures
82+
$config"
83+
fi
7884
done >> m4/sage_spkg_configures.m4
85+
cat >> m4/sage_spkg_configures.m4 <<EOF
86+
$spkg_configures
87+
$spkg_configures_python
88+
EOF
7989
for pkgname in $(sage-package list | sort); do
8090
DIR=build/pkgs/$pkgname
8191
pkgtype="$(cat $DIR/type)"
@@ -102,10 +112,10 @@ SAGE_SPKG_CONFIGURE_$(echo ${pkgname} | tr '[a-z]' '[A-Z]')"
102112
echo "define(>>>SPKG_INSTALL_REQUIRES_${pkgname}<<<, >>>$(echo $(ENABLE_SYSTEM_SITE_PACKAGES=yes sage-get-system-packages install-requires-toml ${pkgname}))<<<)dnl" >> m4/sage_spkg_versions_toml.m4
103113
fi
104114
fi
105-
spkg_configures="$spkg_configures
115+
spkg_finalizes="$spkg_finalizes
106116
SAGE_SPKG_FINALIZE([$pkgname], [$pkgtype], [$SPKG_SOURCE], [$SPKG_TREE_VAR])"
107117
done
108-
echo "$spkg_configures" >> m4/sage_spkg_configures.m4
118+
echo "$spkg_finalizes" >> m4/sage_spkg_configures.m4
109119
for a in m4/sage_spkg_versions.m4 m4/sage_spkg_versions_toml.m4; do
110120
echo 'changequote(>>>`<<<, >>>'"'"'<<<)dnl' >> $a
111121
done

0 commit comments

Comments
 (0)