Skip to content

Commit 805206f

Browse files
committed
don't install sage-setup in conda
1 parent 0e5a201 commit 805206f

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

.devcontainer/onCreate-conda.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ conda init bash
99
# Build sage
1010
conda run -n sage-dev ./bootstrap
1111
conda run -n sage-dev ./configure --with-python=/opt/conda/envs/sage-dev/bin/python --prefix=/opt/conda/envs/sage-dev
12-
conda run -n sage-dev pip install --no-build-isolation -v -v -e ./pkgs/sage-conf ./pkgs/sage-setup
12+
conda run -n sage-dev pip install --no-build-isolation -v -v -e ./pkgs/sage-conf
1313
conda run -n sage-dev pip install --no-build-isolation -v -v -e ./src

.github/workflows/ci-conda.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
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-conf
9595
pip install --no-build-isolation --no-deps --config-settings editable_mode=compat -v -v -e ./src
9696
env:
9797
SAGE_NUM_THREADS: 2

.gitpod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ tasks:
1212
&& conda activate $(pwd)/venv
1313
&& ./bootstrap
1414
&& ./configure --enable-build-as-root --with-python=$CONDA_PREFIX/bin/python --prefix=$CONDA_PREFIX
15-
&& pip install --no-build-isolation -v -v -e ./pkgs/sage-conf ./pkgs/sage-setup
15+
&& pip install --no-build-isolation -v -v -e ./pkgs/sage-conf
1616
&& pip install --no-build-isolation -v -v -e ./src
1717
# Activate conda environment, set up Trac remote
1818
# RestructuredText extension recommends python extension, although we have already installed it

src/doc/en/installation/conda.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ Here we assume that you are using a git checkout.
138138
- Bootstrap the source tree and install the build prerequisites and the Sage library::
139139

140140
$ ./bootstrap
141-
$ pip install --no-build-isolation -v -v --editable ./pkgs/sage-conf_conda ./pkgs/sage-setup
141+
$ pip install --no-build-isolation -v -v --editable ./pkgs/sage-conf_conda
142142
$ pip install --no-build-isolation --config-settings editable_mode=compat -v -v --editable ./src
143143

144144
- Verify that Sage has been installed::

0 commit comments

Comments
 (0)