diff --git a/Makefile b/Makefile index 1c64ed21..dbce6b01 100644 --- a/Makefile +++ b/Makefile @@ -9,8 +9,6 @@ ifneq ($(VERSION_CODENAME),) SETUP_TESTS_EXTRA_ARGS=--extra apt-$(VERSION_CODENAME) endif -UV_FROZEN=true - include common.mk .PHONY: format diff --git a/common.mk b/common.mk index 1bb756f4..2ab69538 100644 --- a/common.mk +++ b/common.mk @@ -16,6 +16,9 @@ endif PRETTIER=npm exec --package=prettier -- prettier PRETTIER_FILES=**.yaml **.yml **.json **.json5 **.css **.md +# By default we should not update the uv lock file here. +export UV_FROZEN := true + .DEFAULT_GOAL := help .ONESHELL: @@ -45,19 +48,19 @@ help: ## Show this help. .PHONY: setup setup: install-uv setup-precommit ## Set up a development environment - uv sync --frozen $(SETUP_TESTS_EXTRA_ARGS) --extra docs --extra lint --extra types + uv sync $(SETUP_TESTS_EXTRA_ARGS) --extra docs --extra lint --extra types .PHONY: setup-tests setup-tests: install-uv install-build-deps ##- Set up a testing environment without linters - uv sync --frozen $(SETUP_TESTS_EXTRA_ARGS) + uv sync $(SETUP_TESTS_EXTRA_ARGS) .PHONY: setup-lint setup-lint: install-uv install-shellcheck install-pyright install-lint-build-deps ##- Set up a linting-only environment - uv sync --frozen --no-install-workspace --extra lint --extra types + uv sync --no-install-workspace --extra lint --extra types .PHONY: setup-docs setup-docs: install-uv ##- Set up a documentation-only environment - uv sync --frozen --no-dev --no-install-workspace --extra docs + uv sync --no-dev --no-install-workspace --extra docs .PHONY: setup-precommit setup-precommit: install-uv ##- Set up pre-commit hooks in this repository.