cleanup makefile and codspeed

Author: davidhewitt

.github/workflows/codspeed.yml

@@ -26,8 +26,8 @@ jobs:
 
       - name: install deps
         run: |
-          uv sync --python 3.13 --group testing
-          uv pip uninstall pytest-speed -y
+          uv sync --python 3.13 --group testing --no-install-project
+          uv pip uninstall pytest-speed
           uv pip install pytest-benchmark==4.0.0 pytest-codspeed
 
       - name: install rust stable

Makefile

@@ -4,9 +4,6 @@ sources = python/pydantic_core tests generate_self_schema.py wasm-preview/run_te
 # using pip install cargo (via maturin via pip) doesn't get the tty handle
 # so doesn't render color without some help
 export CARGO_TERM_COLOR=$(shell (test -t 0 && echo "always") || echo "auto")
-# maturin develop only makes sense inside a virtual env, is otherwise
-# more or less equivalent to pip install -e just a little nicer
-USE_MATURIN = $(shell [ "$$VIRTUAL_ENV" != "" ] && (which maturin))
 
 .PHONY: .uv  ## Check that uv is installed
 .uv:
@@ -19,7 +16,7 @@ USE_MATURIN = $(shell [ "$$VIRTUAL_ENV" != "" ] && (which maturin))
 .PHONY: install
 install: .uv .pre-commit
 	uv pip install -U wheel
-	uv sync --frozen --group all
+	uv sync --frozen --group all --no-install-project
 	uv pip install -v -e .
 	pre-commit install
 
@@ -38,56 +35,37 @@ install-rust-coverage:
 .PHONY: build-dev
 build-dev:
 	@rm -f python/pydantic_core/*.so
-ifneq ($(USE_MATURIN),)
-	uv run maturin develop
-else
-	uv pip install --force-reinstall -v -e . --config-settings=build-args='--profile dev'
-endif
+	uv sync --frozen --group maturin --no-install-project
+	uv run --no-sync maturin develop
 
 .PHONY: build-prod
 build-prod:
 	@rm -f python/pydantic_core/*.so
-ifneq ($(USE_MATURIN),)
-	uv run maturin develop --release
-else
-	uv pip install -v -e .
-endif
+	uv sync --frozen --group maturin --no-install-project
+	uv run --no-sync maturin develop --release
 
 .PHONY: build-profiling
 build-profiling:
 	@rm -f python/pydantic_core/*.so
-ifneq ($(USE_MATURIN),)
-	uv run maturin develop --profile profiling
-else
-	uv pip install --force-reinstall -v -e . --config-settings=build-args='--profile profiling'
-endif
+	uv sync --frozen --group maturin --no-install-project
+	uv run --no-sync maturin develop --profile profiling
 
 .PHONY: build-coverage
 build-coverage:
 	@rm -f python/pydantic_core/*.so
-ifneq ($(USE_MATURIN),)
-	RUSTFLAGS='-C instrument-coverage' uv run maturin develop --release
-else
-	RUSTFLAGS='-C instrument-coverage' uv pip install -v -e .
-endif
+	uv sync --frozen --group maturin --no-install-project
+	RUSTFLAGS='-C instrument-coverage' uv run --no-sync maturin develop --release
 
 .PHONY: build-pgo
 build-pgo:
 	@rm -f python/pydantic_core/*.so
 	$(eval PROFDATA := $(shell mktemp -d))
-ifneq ($(USE_MATURIN),)
+	uv sync --frozen --group maturin --no-install-project
 	RUSTFLAGS='-Cprofile-generate=$(PROFDATA)' uv run maturin develop --release
-else
-	RUSTFLAGS='-Cprofile-generate=$(PROFDATA)' uv pip install --force-reinstall -v -e .
-endif
 	pytest tests/benchmarks
 	$(eval LLVM_PROFDATA := $(shell rustup run stable bash -c 'echo $$RUSTUP_HOME/toolchains/$$RUSTUP_TOOLCHAIN/lib/rustlib/$$(rustc -Vv | grep host | cut -d " " -f 2)/bin/llvm-profdata'))
 	$(LLVM_PROFDATA) merge -o $(PROFDATA)/merged.profdata $(PROFDATA)
-ifneq ($(USE_MATURIN),)
 	RUSTFLAGS='-Cprofile-use=$(PROFDATA)/merged.profdata' uv run maturin develop --release
-else
-	RUSTFLAGS='-Cprofile-use=$(PROFDATA)/merged.profdata' uv pip install --force-reinstall -v -e .
-endif
 	@rm -rf $(PROFDATA)
 
 

pyproject.toml

@@ -82,6 +82,10 @@ wasm = [
     'maturin>=1,<2',
     'ruff',
 ]
+maturin = [
+    'maturin>=1,<2',
+    'pip'
+]
 
 all = [
   { include-group = 'testing' },