Skip to content

Commit 46ca915

Browse files
Add conda as a make setup option (#2305)
Co-authored-by: Andrea Giammarchi <andrea.giammarchi@gmail.com>
1 parent afd7a8e commit 46ca915

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ check-python:
4141
# Check the environment, install the dependencies.
4242
setup: check-node check-npm check-python
4343
cd core && npm ci && cd ..
44-
ifeq ($(VIRTUAL_ENV),)
45-
echo "\n\n\033[0;31mCannot install Python dependencies. Your virtualenv is not activated.\033[0m"
44+
ifeq (,$(VIRTUAL_ENV)$(CONDA_PREFIX))
45+
echo "\n\n\033[0;31mCannot install Python dependencies. Your virtualenv or conda env is not activated.\033[0m"
4646
false
4747
else
4848
python -m pip install -r requirements.txt

0 commit comments

Comments
 (0)