Separate makefile for protovalidate gencode

Author: lukasbindreiter

Makefile

@@ -15,8 +15,8 @@ ADD_LICENSE_HEADER := $(BIN)/license-header \
 		--license-type apache \
 		--copyright-holder "Buf Technologies, Inc." \
 		--year-range "2023-2025"
-# This version should be kept in sync with the version in buf.yaml
-PROTOVALIDATE_VERSION ?= v0.14.0
+# This version should be kept in sync with the version in buf.yaml and the bufbuild-protovalidate-protocolbuffers version in uv.lock
+PROTOVALIDATE_TESTING_VERSION ?= v0.14.0
 # 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.24.0
@@ -35,14 +35,14 @@ clean: ## Delete intermediate build artifacts
 	git clean -Xdf
 
 .PHONY: generate
-generate: generate-protovalidate-pypi-package generate-protobuf-tests $(BIN)/license-header  ## Regenerate code and license headers
+generate: generate-protobuf-tests $(BIN)/license-header  ## Regenerate code and license headers
 	$(ADD_LICENSE_HEADER)
 
 .PHONY: generate-protobuf-tests
 generate-protobuf-tests: $(BIN)/buf ## Regenerate protobuf gencode used in unit tests
 	rm -rf test/gen
 	# generate protovalidate-testing into test/gen/buf/validate
-	$(BIN)/buf generate buf.build/bufbuild/protovalidate-testing:$(PROTOVALIDATE_VERSION)
+	$(BIN)/buf generate buf.build/bufbuild/protovalidate-testing:$(PROTOVALIDATE_TESTING_VERSION)
 
 	# generate cel-spec into test/gen/cel/expr
 	$(BIN)/buf generate buf.build/google/cel-spec:$(CEL_SPEC_VERSION) --exclude-path cel/expr/conformance/proto2 --exclude-path cel/expr/conformance/proto3
@@ -52,16 +52,6 @@ generate-protobuf-tests: $(BIN)/buf ## Regenerate protobuf gencode used in unit
 	# generate proto/tests/example/v1/validations.proto into test/gen/tests/example/v1
 	$(BIN)/buf generate
 
-.PHONY:
-generate-protovalidate-pypi-package: $(BIN)/buf  ## Regenerate protobuf gencode for the bufbuild-protovalidate-protocolbuffers pypi package
-	rm -rf bufbuild-protovalidate-protocolbuffers/buf/validate/proto5
-	rm -rf bufbuild-protovalidate-protocolbuffers/buf/validate/proto6
-	# generate gencode for both proto5 and proto6 for buf.build/bufbuild/protovalidate
-	cd bufbuild-protovalidate-protocolbuffers && ../$(BIN)/buf generate buf.build/bufbuild/protovalidate:$(PROTOVALIDATE_VERSION)
-
-	# set the version of bufbuild-protovalidate-protocolbuffers to the used PROTOVALIDATE_VERSION
-	sed -i .bak 's/^version = "[^"]*"/version = "$(PROTOVALIDATE_VERSION)"/' bufbuild-protovalidate-protocolbuffers/pyproject.toml  && rm bufbuild-protovalidate-protocolbuffers/pyproject.toml.bak
-
 .PHONY: format
 format: install $(BIN)/buf $(BIN)/license-header ## Format code
 	$(ADD_LICENSE_HEADER)

bufbuild-protovalidate-protocolbuffers/Makefile

@@ -0,0 +1,49 @@
+# See https://tech.davis-hansson.com/p/make/
+SHELL := bash
+.DELETE_ON_ERROR:
+.SHELLFLAGS := -eu -o pipefail -c
+.DEFAULT_GOAL := all
+MAKEFLAGS += --warn-undefined-variables
+MAKEFLAGS += --no-builtin-rules
+MAKEFLAGS += --no-print-directory
+BIN := .tmp/bin
+export PATH := $(BIN):$(PATH)
+export GOBIN := $(abspath $(BIN))
+CONFORMANCE_ARGS ?= --strict_message --expected_failures=test/conformance/nonconforming.yaml --timeout 10s
+ADD_LICENSE_HEADER := $(BIN)/license-header \
+		--license-type apache \
+		--copyright-holder "Buf Technologies, Inc." \
+		--year-range "2023-2025"
+PROTOVALIDATE_VERSION ?= v0.14.0
+
+.PHONY: help
+help: ## Describe useful make targets
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "%-15s %s\n", $$1, $$2}'
+
+.PHONY: all
+all: build
+
+.PHONY: generate
+generate: $(BIN)/buf $(BIN)/license-header  ## Regenerate protobuf gencode for the bufbuild-protovalidate-protocolbuffers pypi package
+	rm -rf buf/validate/proto5
+	rm -rf buf/validate/proto6
+	# generate gencode for both proto5 and proto6 for buf.build/bufbuild/protovalidate
+	$(BIN)/buf generate buf.build/bufbuild/protovalidate:$(PROTOVALIDATE_VERSION)
+
+	# add license headers to the source files
+	$(ADD_LICENSE_HEADER)
+
+	# set the version of bufbuild-protovalidate-protocolbuffers to the used PROTOVALIDATE_VERSION
+	uv version $(PROTOVALIDATE_VERSION)
+
+build: generate
+	uv build
+
+$(BIN):
+	@mkdir -p $(BIN)
+
+$(BIN)/buf: $(BIN) Makefile
+	go install github.com/bufbuild/buf/cmd/buf@latest
+
+$(BIN)/license-header: $(BIN) Makefile
+	go install github.com/bufbuild/buf/private/pkg/licenseheader/cmd/license-header@latest

bufbuild-protovalidate-protocolbuffers/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "bufbuild-protovalidate-protocolbuffers"
-version = "v0.14.0"
+version = "0.14.0"
 description = "Messages, enum types and stubs for buf.build/bufbuild/protovalidate for python."
 readme = "README.md"
 license = "Apache-2.0"