Skip to content

Commit a55933b

Browse files
authored
Merge branch 'main' into feature/hatch-vcs-versioning
2 parents 4f0941d + 20a86ba commit a55933b

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ ifeq ("$(VENV_ENABLED)", "true")
162162
ifeq ("$(VENV_CREATE)", "true")
163163
ifeq ("$(PYTHON_PACKAGE_INSTALLER)$(MXENV_UV_GLOBAL)","uvtrue")
164164
@echo "Setup Python Virtual Environment using package 'uv' at '$(VENV_FOLDER)'"
165-
@uv venv -p $(PRIMARY_PYTHON) --seed $(VENV_FOLDER)
165+
@uv venv -p $(PRIMARY_PYTHON) --seed --allow-existing $(VENV_FOLDER)
166166
else
167167
@echo "Setup Python Virtual Environment using module 'venv' at '$(VENV_FOLDER)'"
168168
@$(PRIMARY_PYTHON) -m venv $(VENV_FOLDER)

0 commit comments

Comments
 (0)