Skip to content

Commit 203603e

Browse files
author
Matthias Koeppe
committed
.github/workflows/ci-conda.yml: Use sage-conf_conda
1 parent 80c2440 commit 203603e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/ci-conda.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,15 @@ 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 --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)
86+
pip install --no-build-isolation --no-deps -v -v -e ./pkgs/sage-conf_conda
8787
echo "::remove-matcher owner=configure-system-package-warning::"
8888
echo "::remove-matcher owner=configure-system-package-error::"
8989
9090
- name: Build
9191
shell: bash -l {0}
9292
run: |
9393
# Use --no-deps and pip check below to verify that all necessary dependencies are installed via conda.
94-
pip install --no-build-isolation --no-deps -v -v -e ./pkgs/sage-conf ./pkgs/sage-setup
94+
pip install --no-build-isolation --no-deps -v -v -e ./pkgs/sage-setup
9595
pip install --no-build-isolation --no-deps --config-settings editable_mode=compat -v -v -e ./src
9696
env:
9797
SAGE_NUM_THREADS: 2

pkgs/sage-conf_conda/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def run(self):
2929
'See https://doc.sagemath.org/html/en/installation/conda.html on how to get started.')
3030

3131
cmd = f"cd {SAGE_ROOT} && ./configure --enable-build-as-root --with-system-python3=force --disable-notebook --disable-sagelib --disable-sage_conf --disable-doc"
32-
cmd += ' --with-python=$CONDA_PREFIX/bin/python --prefix="$CONDA_PREFIX"'
32+
cmd += ' --with-python=$CONDA_PREFIX/bin/python --prefix="$CONDA_PREFIX" --enable-system-site-packages'
3333
cmd += ' $(for pkg in $(PATH="build/bin:$PATH" build/bin/sage-package list :standard: --exclude rpy2 --has-file spkg-configure.m4 --has-file distros/conda.txt --exclude-dependencies); do echo --with-system-$pkg=force; done)'
3434
print(f"Running {cmd}")
3535
sys.stdout.flush()

0 commit comments

Comments
 (0)