Improve initial developer experience

Signed-off-by: Anuraag Agrawal <anuraaga@gmail.com>

Author: anuraaga

Makefile

@@ -6,29 +6,20 @@ SHELL := bash
 MAKEFLAGS += --warn-undefined-variables
 MAKEFLAGS += --no-builtin-rules
 MAKEFLAGS += --no-print-directory
-BIN := .tmp/bin
-export PATH := $(BIN):$(PATH)
-export GOBIN := $(abspath $(BIN))
-export PYTHONPATH ?= gen
 BUF_VERSION := 1.62.1
-CONFORMANCE_ARGS ?= --strict_message --expected_failures=test/conformance/nonconforming.yaml --timeout 10s
-ADD_LICENSE_HEADER := $(BIN)/license-header \
+BUF := go run github.com/bufbuild/buf/cmd/buf@v$(BUF_VERSION)
+ADD_LICENSE_HEADER := go run github.com/bufbuild/buf/private/pkg/licenseheader/cmd/license-header@v${BUF_VERSION} \
 		--license-type apache \
 		--copyright-holder "Buf Technologies, Inc." \
 		--year-range "2023-2025"
+CONFORMANCE_ARGS ?= --strict_message --expected_failures=test/conformance/nonconforming.yaml --timeout 10s
 PROTOVALIDATE_VERSION ?= 895eefca6d1346f742fc18b9983d40478820906d
+PROTOVALIDATE_CONFORMANCE := go run github.com/bufbuild/protovalidate/tools/protovalidate-conformance@$(PROTOVALIDATE_VERSION)
 # Version of the cel-spec that this implementation is conformant with
 # This should be kept in sync with the version in test/test_format.py
 CEL_SPEC_VERSION ?= v0.25.1
 TESTDATA_FILE := test/testdata/string_ext_$(CEL_SPEC_VERSION).textproto
 
-PROTOVALIDATE_PROTO_PATH := buf.build/bufbuild/protovalidate:$(PROTOVALIDATE_VERSION)
-PROTOVALIDATE_TESTING_PROTO_PATH := buf.build/bufbuild/protovalidate-testing:$(PROTOVALIDATE_VERSION)
-ifneq ($(shell echo ${PROTOVALIDATE_VERSION} | grep -E "^v\d+\.\d+.\d+(-.+)?$$"), $(PROTOVALIDATE_VERSION))
-  PROTOVALIDATE_PROTO_PATH = https://github.com/bufbuild/protovalidate.git\#subdir=proto/protovalidate,ref=$(PROTOVALIDATE_VERSION)
-  PROTOVALIDATE_TESTING_PROTO_PATH = https://github.com/bufbuild/protovalidate.git\#subdir=proto/protovalidate-testing,ref=$(PROTOVALIDATE_VERSION)
-endif
-
 .PHONY: help
 help: ## Describe useful make targets
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "%-15s %s\n", $$1, $$2}'
@@ -43,47 +34,36 @@ clean: ## Delete intermediate build artifacts
 	@echo $(CEL_SPEC_VERSION)
 
 .PHONY: generate
-generate: $(BIN)/buf $(BIN)/license-header upstream ## Regenerate code and license headers
-	rm -rf gen
-	$(BIN)/buf generate $(PROTOVALIDATE_PROTO_PATH)
-	$(BIN)/buf generate $(PROTOVALIDATE_TESTING_PROTO_PATH)
-	$(BIN)/buf generate buf.build/google/cel-spec:$(CEL_SPEC_VERSION) --exclude-path cel/expr/conformance/proto2 --exclude-path cel/expr/conformance/proto3
-	$(BIN)/buf generate
-	$(ADD_LICENSE_HEADER)
-
-.PHONY: upstream
-upstream: $(BIN)/buf
-	rm -rf upstream
-	$(BIN)/buf export $(PROTOVALIDATE_PROTO_PATH) -o upstream/proto
+generate:  ## Regenerate code and license headers
+	rm -rf test/gen
+	(cd test && $(BUF) generate)
+	uv run -- ruff check --fix test/gen
+	uv run -- ruff format test/gen
 	$(ADD_LICENSE_HEADER)
 
 .PHONY: format
-format: install $(BIN)/buf $(BIN)/license-header ## Format code
+format:  ## Format code
 	$(ADD_LICENSE_HEADER)
-	buf format --write .
-	uv run -- ruff format protovalidate test
+	$(BUF) format --write .
 	uv run -- ruff check --fix protovalidate test
+	uv run -- ruff format protovalidate test
 
 .PHONY: test
-test: generate install $(TESTDATA_FILE) ## Run unit tests
+test: $(TESTDATA_FILE) ## Run unit tests
 	uv run -- pytest
 
 .PHONY: conformance
-conformance: $(BIN)/protovalidate-conformance generate install ## Run conformance tests
-	protovalidate-conformance $(CONFORMANCE_ARGS) uv run test/conformance/runner.py
+conformance: generate ## Run conformance tests
+	$(PROTOVALIDATE_CONFORMANCE) $(CONFORMANCE_ARGS) uv run test/conformance/runner.py
 
 .PHONY: lint
-lint: install $(BIN)/buf ## Lint code
-	buf format -d --exit-code
+lint: ## Lint code
+	$(BUF) format -d --exit-code
 	uv run -- ruff format --check --diff protovalidate test
 	uv run -- mypy protovalidate
 	uv run -- ruff check protovalidate test
 	uv lock --check
 
-.PHONY: install
-install: ## Install dependencies
-	uv sync --dev
-
 .PHONY: checkgenerate
 checkgenerate: generate
 	@# Used in CI to verify that `make generate` doesn't produce a diff.
@@ -92,15 +72,3 @@ checkgenerate: generate
 $(TESTDATA_FILE):
 	mkdir -p $(dir @)
 	curl -fsSL -o $@ https://raw.githubusercontent.com/google/cel-spec/refs/tags/$(CEL_SPEC_VERSION)/tests/simple/testdata/string_ext.textproto
-
-$(BIN):
-	@mkdir -p $(BIN)
-
-$(BIN)/buf: $(BIN) Makefile
-	go install github.com/bufbuild/buf/cmd/buf@v${BUF_VERSION}
-
-$(BIN)/license-header: $(BIN) Makefile
-	go install github.com/bufbuild/buf/private/pkg/licenseheader/cmd/license-header@v${BUF_VERSION}
-
-$(BIN)/protovalidate-conformance: $(BIN) Makefile
-	go install github.com/bufbuild/protovalidate/tools/protovalidate-conformance@$(PROTOVALIDATE_VERSION)