From 46ca9154c431b659d53a28e203711b12b0a5a8cf Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Thu, 20 Mar 2025 07:10:31 -0400 Subject: [PATCH] Add conda as a make setup option (#2305) Co-authored-by: Andrea Giammarchi --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 035ce943..0e603bfa 100644 --- a/Makefile +++ b/Makefile @@ -41,8 +41,8 @@ check-python: # Check the environment, install the dependencies. setup: check-node check-npm check-python cd core && npm ci && cd .. -ifeq ($(VIRTUAL_ENV),) - echo "\n\n\033[0;31mCannot install Python dependencies. Your virtualenv is not activated.\033[0m" +ifeq (,$(VIRTUAL_ENV)$(CONDA_PREFIX)) + echo "\n\n\033[0;31mCannot install Python dependencies. Your virtualenv or conda env is not activated.\033[0m" false else python -m pip install -r requirements.txt