Skip to content

Commit fc9bab5

Browse files
author
Matthias Koeppe
committed
tox.ini (conda-environment-{src,dev}), .github/workflows/ci-conda.yml: Use configure --enable-system-site-packages
1 parent 018de2b commit fc9bab5

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

.github/workflows/ci-conda.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
run: |
8484
./bootstrap
8585
echo "::add-matcher::.github/workflows/configure-systempackage-problem-matcher.json"
86-
./configure --enable-build-as-root --with-python=$CONDA_PREFIX/bin/python --prefix=$CONDA_PREFIX $(for pkg in $(./sage -package list :standard: --has-file spkg-configure.m4 --has-file distros/conda.txt --exclude rpy2); do echo --with-system-$pkg=force; done)
86+
./configure --enable-build-as-root --with-python=$CONDA_PREFIX/bin/python --prefix=$CONDA_PREFIX --enable-system-site-packages $(for pkg in $(./sage -package list :standard: --has-file spkg-configure.m4 --has-file distros/conda.txt --exclude rpy2); do echo --with-system-$pkg=force; done)
8787
echo "::remove-matcher owner=configure-system-package-warning::"
8888
echo "::remove-matcher owner=configure-system-package-error::"
8989

tox.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ setenv =
191191
sitepackages: ENABLE_SYSTEM_SITE_PACKAGES=yes
192192
sitepackages: CONFIG_CONFIGURE_ARGS_SITEPACKAGES=--enable-system-site-packages
193193
conda-environment: SAGE_PACKAGE_LIST_ARGS=_prereq
194+
conda-environment-{src,dev}: CONFIG_CONFIGURE_ARGS_SITEPACKAGES=--enable-system-site-packages
194195
# Whether to add the system packages needed for bootstrapping
195196
EXTRA_SAGE_PACKAGES_0=_bootstrap
196197
nobootstrap: EXTRA_SAGE_PACKAGES_0=

0 commit comments

Comments
 (0)