Merge branch 'entry-point-handling-delegated'

mxstack · Apr 9, 2024 · 810b4ff · 810b4ff
2 parents 3393cf9 + 33fb711
commit 810b4ff
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 66 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,9 @@
 
 ## 1.0a5 (unreleased)
 
+- Perform `mxenv` domain related checks inside target to support setups
+  which install their own python environment.
+
 - Add `Makefile` as dependency target for `SENTINEL` target to make sure
   target execution if Makefile changes.
 

diff --git a/Makefile b/Makefile
@@ -222,27 +222,6 @@ $(SENTINEL): Makefile
 # mxenv
 ##############################################################################
 
-# Check if given Python is installed
-ifeq (,$(shell which $(PRIMARY_PYTHON)))
-$(error "PYTHON=$(PRIMARY_PYTHON) not found in $(PATH)")
-endif
-
-# Check if given Python version is ok
-PYTHON_VERSION_OK=$(shell $(PRIMARY_PYTHON) -c "import sys; print((int(sys.version_info[0]), int(sys.version_info[1])) >= tuple(map(int, '$(PYTHON_MIN_VERSION)'.split('.'))))")
-ifeq ($(PYTHON_VERSION_OK),0)
-$(error "Need Python >= $(PYTHON_MIN_VERSION)")
-endif
-
-# Check if venv folder is configured if venv is enabled
-ifeq ($(shell [[ "$(VENV_ENABLED)" == "true" && "$(VENV_FOLDER)" == "" ]] && echo "true"),"true")
-$(error "VENV_FOLDER must be configured if VENV_ENABLED is true")
-endif
-
-# Check if global python is used with uv (this is not supported by uv)
-ifeq ("$(VENV_ENABLED)$(PYTHON_PACKAGE_INSTALLER)","falseuv")
-$(error "Package installer uv does not work with a global Python interpreter.")
-endif
-
 # Determine the executable path
 ifeq ("$(VENV_ENABLED)", "true")
 export VIRTUAL_ENV=$(abspath $(VENV_FOLDER))
@@ -266,6 +245,12 @@ endif
 
 MXENV_TARGET:=$(SENTINEL_FOLDER)/mxenv.sentinel
 $(MXENV_TARGET): $(SENTINEL)
+	@$(PRIMARY_PYTHON) -c "import sys; vi = sys.version_info; sys.exit(1 if (int(vi[0]), int(vi[1])) >= tuple(map(int, '$(PYTHON_MIN_VERSION)'.split('.'))) else 0)" \
+		&& echo "Need Python >= $(PYTHON_MIN_VERSION)" && exit 1 || :
+	@[[ "$(VENV_ENABLED)" == "true" && "$(VENV_FOLDER)" == "" ]] \
+		&& echo "VENV_FOLDER must be configured if VENV_ENABLED is true" && exit 1 || :
+	@[[ "$(VENV_ENABLED)$(PYTHON_PACKAGE_INSTALLER)" == "falseuv" ]] \
+		&& echo "Package installer uv does not work with a global Python interpreter." && exit 1 || :
 ifeq ("$(VENV_ENABLED)", "true")
 ifeq ("$(VENV_CREATE)", "true")
 ifeq ("$(PYTHON_PACKAGE_INSTALLER)$(MXENV_UV_GLOBAL)","uvtrue")

diff --git a/src/mxmake/tests/test_templates.py b/src/mxmake/tests/test_templates.py
@@ -651,7 +651,8 @@ def test_Makefile(self, tempdir):
 
                 # mxmake folder
                 MXMAKE_FOLDER?=.mxmake
-                 # Sentinel files
+
+                # Sentinel files
                 SENTINEL_FOLDER?=$(MXMAKE_FOLDER)/sentinels
                 SENTINEL?=$(SENTINEL_FOLDER)/about.txt
                 $(SENTINEL): $(firstword $(MAKEFILE_LIST))
@@ -662,27 +663,6 @@ def test_Makefile(self, tempdir):
                 # mxenv
                 ##############################################################################
 
-                # Check if given Python is installed
-                ifeq (,$(shell which $(PRIMARY_PYTHON)))
-                $(error "PYTHON=$(PRIMARY_PYTHON) not found in $(PATH)")
-                endif
-
-                # Check if given Python version is ok
-                PYTHON_VERSION_OK=$(shell $(PRIMARY_PYTHON) -c "import sys; print((int(sys.version_info[0]), int(sys.version_info[1])) >= tuple(map(int, '$(PYTHON_MIN_VERSION)'.split('.'))))")
-                ifeq ($(PYTHON_VERSION_OK),0)
-                $(error "Need Python >= $(PYTHON_MIN_VERSION)")
-                endif
-
-                # Check if venv folder is configured if venv is enabled
-                ifeq ($(shell [[ "$(VENV_ENABLED)" == "true" && "$(VENV_FOLDER)" == "" ]] && echo "true"),"true")
-                $(error "VENV_FOLDER must be configured if VENV_ENABLED is true")
-                endif
-
-                # Check if global python is used with uv (this is not supported by uv)
-                ifeq ("$(VENV_ENABLED)$(PYTHON_PACKAGE_INSTALLER)","falseuv")
-                $(error "Package installer uv does not work with a global Python interpreter.")
-                endif
-
                 # Determine the executable path
                 ifeq ("$(VENV_ENABLED)", "true")
                 export VIRTUAL_ENV=$(abspath $(VENV_FOLDER))
@@ -706,6 +686,12 @@ def test_Makefile(self, tempdir):
 
                 MXENV_TARGET:=$(SENTINEL_FOLDER)/mxenv.sentinel
                 $(MXENV_TARGET): $(SENTINEL)
+                	@$(PRIMARY_PYTHON) -c "import sys; vi = sys.version_info; sys.exit(1 if (int(vi[0]), int(vi[1])) >= tuple(map(int, '$(PYTHON_MIN_VERSION)'.split('.'))) else 0)" \\
+                		&& echo "Need Python >= $(PYTHON_MIN_VERSION)" && exit 1 || :
+                	@[[ "$(VENV_ENABLED)" == "true" && "$(VENV_FOLDER)" == "" ]] \\
+                		&& echo "VENV_FOLDER must be configured if VENV_ENABLED is true" && exit 1 || :
+                	@[[ "$(VENV_ENABLED)$(PYTHON_PACKAGE_INSTALLER)" == "falseuv" ]] \\
+                		&& echo "Package installer uv does not work with a global Python interpreter." && exit 1 || :
                 ifeq ("$(VENV_ENABLED)", "true")
                 ifeq ("$(VENV_CREATE)", "true")
                 ifeq ("$(PYTHON_PACKAGE_INSTALLER)$(MXENV_UV_GLOBAL)","uvtrue")
@@ -752,10 +738,12 @@ def test_Makefile(self, tempdir):
                 CLEAN_TARGETS+=mxenv-clean
 
                 -include $(INCLUDE_MAKEFILE)
-                 ##############################################################################
+
+                ##############################################################################
                 # Default targets
                 ##############################################################################
-                 INSTALL_TARGET:=$(SENTINEL_FOLDER)/install.sentinel
+
+                INSTALL_TARGET:=$(SENTINEL_FOLDER)/install.sentinel
                 $(INSTALL_TARGET): $(INSTALL_TARGETS)
                 	@touch $(INSTALL_TARGET)
 

diff --git a/src/mxmake/topics/core/mxenv.mk b/src/mxmake/topics/core/mxenv.mk
@@ -75,27 +75,6 @@
 # mxenv
 ##############################################################################
 
-# Check if given Python is installed
-ifeq (,$(shell which $(PRIMARY_PYTHON)))
-$(error "PYTHON=$(PRIMARY_PYTHON) not found in $(PATH)")
-endif
-
-# Check if given Python version is ok
-PYTHON_VERSION_OK=$(shell $(PRIMARY_PYTHON) -c "import sys; print((int(sys.version_info[0]), int(sys.version_info[1])) >= tuple(map(int, '$(PYTHON_MIN_VERSION)'.split('.'))))")
-ifeq ($(PYTHON_VERSION_OK),0)
-$(error "Need Python >= $(PYTHON_MIN_VERSION)")
-endif
-
-# Check if venv folder is configured if venv is enabled
-ifeq ($(shell [[ "$(VENV_ENABLED)" == "true" && "$(VENV_FOLDER)" == "" ]] && echo "true"),"true")
-$(error "VENV_FOLDER must be configured if VENV_ENABLED is true")
-endif
-
-# Check if global python is used with uv (this is not supported by uv)
-ifeq ("$(VENV_ENABLED)$(PYTHON_PACKAGE_INSTALLER)","falseuv")
-$(error "Package installer uv does not work with a global Python interpreter.")
-endif
-
 # Determine the executable path
 ifeq ("$(VENV_ENABLED)", "true")
 export VIRTUAL_ENV=$(abspath $(VENV_FOLDER))
@@ -119,6 +98,12 @@ endif
 
 MXENV_TARGET:=$(SENTINEL_FOLDER)/mxenv.sentinel
 $(MXENV_TARGET): $(SENTINEL)
+	@$(PRIMARY_PYTHON) -c "import sys; vi = sys.version_info; sys.exit(1 if (int(vi[0]), int(vi[1])) >= tuple(map(int, '$(PYTHON_MIN_VERSION)'.split('.'))) else 0)" \
+		&& echo "Need Python >= $(PYTHON_MIN_VERSION)" && exit 1 || :
+	@[[ "$(VENV_ENABLED)" == "true" && "$(VENV_FOLDER)" == "" ]] \
+		&& echo "VENV_FOLDER must be configured if VENV_ENABLED is true" && exit 1 || :
+	@[[ "$(VENV_ENABLED)$(PYTHON_PACKAGE_INSTALLER)" == "falseuv" ]] \
+		&& echo "Package installer uv does not work with a global Python interpreter." && exit 1 || :
 ifeq ("$(VENV_ENABLED)", "true")
 ifeq ("$(VENV_CREATE)", "true")
 ifeq ("$(PYTHON_PACKAGE_INSTALLER)$(MXENV_UV_GLOBAL)","uvtrue")