Skip to content

Commit 94b783f

Browse files
authored
Merge pull request #683 from mrava87/build-makefileconda
build: fix broken conda activate in *_conda Makefile targets
2 parents d64fe47 + b03a665 commit 94b783f

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ dev-install_gpu:
3030
$(PIP) install -e .
3131

3232
install_conda:
33-
conda env create -f environment.yml && conda activate pylops && pip install .
33+
conda env create -f environment.yml && source ${CONDA_PREFIX}/etc/profile.d/conda.sh && conda activate pylops && pip install .
3434

3535
dev-install_conda:
36-
conda env create -f environment-dev.yml && conda activate pylops && pip install -e .
36+
conda env create -f environment-dev.yml && source ${CONDA_PREFIX}/etc/profile.d/conda.sh && conda activate pylops && pip install -e .
3737

3838
dev-install_conda_arm:
39-
conda env create -f environment-dev-arm.yml && conda activate pylops && pip install -e .
39+
conda env create -f environment-dev-arm.yml && source ${CONDA_PREFIX}/etc/profile.d/conda.sh && conda activate pylops && pip install -e .
4040

4141
dev-install_conda_gpu:
42-
conda env create -f environment-dev-gpu.yml && conda activate pylops_gpu && pip install -e .
42+
conda env create -f environment-dev-gpu.yml && source ${CONDA_PREFIX}/etc/profile.d/conda.sh && conda activate pylops_gpu && pip install -e .
4343

4444
tests:
4545
# Run tests with CPU

0 commit comments

Comments
 (0)