make it work with external virtualenv

mxstack · Feb 28, 2024 · 4933e9d · 4933e9d
1 parent d5f5200
commit 4933e9d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -240,15 +240,15 @@ else
 	@echo "Setup Python Virtual Environment using module 'venv' at '$(VENV_FOLDER)'"
 	@$(PRIMARY_PYTHON) -m venv $(VENV_FOLDER)
 	@$(MXENV_PYTHON) -m ensurepip -U
-endif
-ifeq ("$(PYTHON_PACKAGE_INSTALLER)$(MXENV_UV_GLOBAL)","uvfalse")
-	@echo "Install uv"
-	@$(MXENV_PYTHON) -m pip install uv
 endif
 	@$(PYTHON_PACKAGE_COMMAND) install -U pip setuptools wheel
 endif
 else
 	@echo "Using system Python interpreter"
+endif
+ifeq ("$(PYTHON_PACKAGE_INSTALLER)$(MXENV_UV_GLOBAL)","uvfalse")
+	@echo "Install uv"
+	@$(MXENV_PYTHON) -m pip install uv
 endif
 	@echo "Install/Update MXStack Python packages"
 	@$(PYTHON_PACKAGE_COMMAND) install -U $(MXDEV) $(MXMAKE)

diff --git a/src/mxmake/topics/core/mxenv.mk b/src/mxmake/topics/core/mxenv.mk
@@ -119,15 +119,15 @@ else
 	@$(PRIMARY_PYTHON) -m venv $(VENV_FOLDER)
 	@$(MXENV_PYTHON) -m ensurepip -U
 endif
+endif
+else
+	@echo "Using system Python interpreter"
+endif
 ifeq ("$(PYTHON_PACKAGE_INSTALLER)$(MXENV_UV_GLOBAL)","uvfalse")
 	@echo "Install uv"
 	@$(MXENV_PYTHON) -m pip install uv
 endif
 	@$(PYTHON_PACKAGE_COMMAND) install -U pip setuptools wheel
-endif
-else
-	@echo "Using system Python interpreter"
-endif
 	@echo "Install/Update MXStack Python packages"
 	@$(PYTHON_PACKAGE_COMMAND) install -U $(MXDEV) $(MXMAKE)
 	@touch $(MXENV_TARGET)