Skip to content

Commit bf625c4

Browse files
authored
Merge branch 'main' into refactor/mxenv-autodetect-uv
2 parents 1f30ea2 + 20a86ba commit bf625c4

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

src/mxmake/main.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,7 @@ def list_command(args: argparse.Namespace):
9797
##############################################################################
9898

9999

100-
def create_config(
101-
prompt: bool, preseeds: dict[str, typing.Any] | None
102-
):
100+
def create_config(prompt: bool, preseeds: dict[str, typing.Any] | None):
103101
if prompt and preseeds:
104102
sys.stdout.write("Either use prompt or preseeds, not both\n")
105103
sys.exit(1)

src/mxmake/tests/expected/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,8 @@ endif
188188
# Create virtual environment
189189
ifeq ("$(VENV_ENABLED)", "true")
190190
ifeq ("$(VENV_CREATE)", "true")
191-
ifeq ("$(USE_GLOBAL_UV)","true")
192191
@echo "Setup Python Virtual Environment using global uv at '$(VENV_FOLDER)'"
193-
@uv venv --quiet --no-progress -p $(UV_PYTHON) --seed $(VENV_FOLDER)
192+
@uv venv --allow-existing --no-progress --python $(UV_PYTHON) --seed $(VENV_FOLDER)
194193
else
195194
@echo "Setup Python Virtual Environment using module 'venv' at '$(VENV_FOLDER)'"
196195
@$(PRIMARY_PYTHON) -m venv $(VENV_FOLDER)

0 commit comments

Comments
 (0)