rename PYTHON_UV_GLOBAL to MXENV_UV_GLOBAL

mxstack · Feb 27, 2024 · c519b59 · c519b59
1 parent 915f945
commit c519b59
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -65,7 +65,7 @@ PYTHON_PACKAGE_INSTALLER?=uv
 # Flag whether to use a global installed 'uv' or install
 # it in the virtual environment.
 # Default: false
-PYTHON_UV_GLOBAL?=false
+MXENV_UV_GLOBAL?=false
 
 # Flag whether to use virtual environment. If `false`, the
 # interpreter according to `PRIMARY_PYTHON` found in `PATH` is used.
@@ -233,15 +233,15 @@ MXENV_TARGET:=$(SENTINEL_FOLDER)/mxenv.sentinel
 $(MXENV_TARGET): $(SENTINEL)
 ifeq ("$(VENV_ENABLED)", "true")
 ifeq ("$(VENV_CREATE)", "true")
-ifeq ("$(PYTHON_PACKAGE_INSTALLER)$(PYTHON_UV_GLOBAL)", "uvtrue")
+ifeq ("$(PYTHON_PACKAGE_INSTALLER)$(MXENV_UV_GLOBAL)", "uvtrue")
 	@echo "Setup Python Virtual Environment using package 'uv' at '$(VENV_FOLDER)'"
 	@uv venv -p $(PRIMARY_PYTHON) --seed $(VENV_FOLDER)
 else
 	@echo "Setup Python Virtual Environment using module 'venv' at '$(VENV_FOLDER)'"
 	@$(MXENV_PYTHON) -m venv $(VENV_FOLDER)
 	@$(MXENV_PYTHON) -m ensurepip -U
 endif
-ifeq ("$(PYTHON_PACKAGE_INSTALLER)$(PYTHON_UV_GLOBAL)", "uvfalse")
+ifeq ("$(PYTHON_PACKAGE_INSTALLER)$(MXENV_UV_GLOBAL)", "uvfalse")
 	@echo "Install uv"
 	@$(MXENV_PYTHON) -m pip install uv
 endif

diff --git a/src/mxmake/tests/test_parser.py b/src/mxmake/tests/test_parser.py
@@ -22,7 +22,7 @@ def test_MakefileParser(self, tempdir):
             "core.mxenv.PRIMARY_PYTHON": "python3",
             "core.mxenv.PYTHON_MIN_VERSION": "3.7",
             "core.mxenv.PYTHON_PACKAGE_INSTALLER": "pip",
-            "core.mxenv.PYTHON_UV_GLOBAL": "false",
+            "core.mxenv.MXENV_UV_GLOBAL": "false",
             "core.mxenv.VENV_ENABLED": "true",
             "core.mxenv.VENV_CREATE": "true",
             "core.mxenv.VENV_FOLDER": "venv",
@@ -68,7 +68,7 @@ def test_MakefileParser(self, tempdir):
                 "core.mxenv.PRIMARY_PYTHON": "python3",
                 "core.mxenv.PYTHON_MIN_VERSION": "3.7",
                 "core.mxenv.PYTHON_PACKAGE_INSTALLER": "pip",
-                "core.mxenv.PYTHON_UV_GLOBAL": "false",
+                "core.mxenv.MXENV_UV_GLOBAL": "false",
                 "core.mxenv.VENV_ENABLED": "true",
                 "core.mxenv.VENV_CREATE": "true",
                 "core.mxenv.VENV_FOLDER": "venv",

diff --git a/src/mxmake/tests/test_templates.py b/src/mxmake/tests/test_templates.py
@@ -527,7 +527,7 @@ def test_Makefile(self, tempdir):
             "core.mxenv.PRIMARY_PYTHON": "python3",
             "core.mxenv.PYTHON_MIN_VERSION": "3.7",
             "core.mxenv.PYTHON_PACKAGE_INSTALLER": "pip",
-            "core.mxenv.PYTHON_UV_GLOBAL": "false",
+            "core.mxenv.MXENV_UV_GLOBAL": "false",
             "core.mxenv.VENV_ENABLED": "true",
             "core.mxenv.VENV_CREATE": "true",
             "core.mxenv.VENV_FOLDER": "venv",
@@ -601,7 +601,7 @@ def test_Makefile(self, tempdir):
                 # Flag whether to use a global installed 'uv' or install
                 # it in the virtual environment.
                 # Default: false
-                PYTHON_UV_GLOBAL?=false
+                MXENV_UV_GLOBAL?=false
 
                 # Flag whether to use virtual environment. If `false`, the
                 # interpreter according to `PRIMARY_PYTHON` found in `PATH` is used.
@@ -701,15 +701,15 @@ def test_Makefile(self, tempdir):
                 $(MXENV_TARGET): $(SENTINEL)
                 ifeq ("$(VENV_ENABLED)", "true")
                 ifeq ("$(VENV_CREATE)", "true")
-                ifeq ("$(PYTHON_PACKAGE_INSTALLER)$(PYTHON_UV_GLOBAL)", "uvtrue")
+                ifeq ("$(PYTHON_PACKAGE_INSTALLER)$(MXENV_UV_GLOBAL)", "uvtrue")
                 	@echo "Setup Python Virtual Environment using package 'uv' at '$(VENV_FOLDER)'"
                 	@uv venv -p $(PRIMARY_PYTHON) --seed $(VENV_FOLDER)
                 else
                 	@echo "Setup Python Virtual Environment using module 'venv' at '$(VENV_FOLDER)'"
                 	@$(MXENV_PYTHON) -m venv $(VENV_FOLDER)
                 	@$(MXENV_PYTHON) -m ensurepip -U
                 endif
-                ifeq ("$(PYTHON_PACKAGE_INSTALLER)$(PYTHON_UV_GLOBAL)", "uvfalse")
+                ifeq ("$(PYTHON_PACKAGE_INSTALLER)$(MXENV_UV_GLOBAL)", "uvfalse")
                 	@echo "Install uv"
                 	@$(MXENV_PYTHON) -m pip install uv
                 endif

diff --git a/src/mxmake/topics/core/mxenv.mk b/src/mxmake/topics/core/mxenv.mk
@@ -39,7 +39,7 @@
 #:  environment.
 #:default = pip
 #:
-#:[setting.PYTHON_UV_GLOBAL]
+#:[setting.MXENV_UV_GLOBAL]
 #:description = Flag whether to use a global installed 'uv' or install
 #:  it in the virtual environment.
 #:default = false
@@ -111,15 +111,15 @@ MXENV_TARGET:=$(SENTINEL_FOLDER)/mxenv.sentinel
 $(MXENV_TARGET): $(SENTINEL)
 ifeq ("$(VENV_ENABLED)", "true")
 ifeq ("$(VENV_CREATE)", "true")
-ifeq ("$(PYTHON_PACKAGE_INSTALLER)$(PYTHON_UV_GLOBAL)", "uvtrue")
+ifeq ("$(PYTHON_PACKAGE_INSTALLER)$(MXENV_UV_GLOBAL)", "uvtrue")
 	@echo "Setup Python Virtual Environment using package 'uv' at '$(VENV_FOLDER)'"
 	@uv venv -p $(PRIMARY_PYTHON) --seed $(VENV_FOLDER)
 else
 	@echo "Setup Python Virtual Environment using module 'venv' at '$(VENV_FOLDER)'"
 	@$(MXENV_PYTHON) -m venv $(VENV_FOLDER)
 	@$(MXENV_PYTHON) -m ensurepip -U
 endif
-ifeq ("$(PYTHON_PACKAGE_INSTALLER)$(PYTHON_UV_GLOBAL)", "uvfalse")
+ifeq ("$(PYTHON_PACKAGE_INSTALLER)$(MXENV_UV_GLOBAL)", "uvfalse")
 	@echo "Install uv"
 	@$(MXENV_PYTHON) -m pip install uv
 endif