Split gencode into a publishable subpackage and a part only needed for unit tests

Author: lukasbindreiter

Makefile

@@ -35,13 +35,32 @@ clean: ## Delete intermediate build artifacts
 	git clean -Xdf
 
 .PHONY: generate
-generate: $(BIN)/buf $(BIN)/license-header ## Regenerate code and license headers
-	rm -rf gen
-	$(BIN)/buf generate buf.build/bufbuild/protovalidate:$(PROTOVALIDATE_VERSION)
+generate: generate-protovalidate-pypi-package 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)
+	
+	# 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
+	# we need to update the `from cel.expr` imports in those generated files to `from test.gen.cel.expr`
+	LC_ALL=C find test/gen/cel -type f -exec sed -i "" 's/from cel.expr/from test.gen.cel.expr/g' {} +
+
+	# generate proto/tests/example/v1/validations.proto into test/gen/tests/example/v1
 	$(BIN)/buf generate
-	$(ADD_LICENSE_HEADER)
+
+.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 '' 's/^version = "[^"]*"/version = "$(PROTOVALIDATE_VERSION)"/' bufbuild-protovalidate-protocolbuffers/pyproject.toml
 
 .PHONY: format
 format: install $(BIN)/buf $(BIN)/license-header ## Format code

buf.gen.yaml

@@ -4,6 +4,6 @@ managed:
 plugins:
     # NOTE: v26.0 is the earliest version supporting protobuf==5.
     - remote: buf.build/protocolbuffers/python:v26.0
-      out: gen
+      out: test/gen
     - remote: buf.build/protocolbuffers/pyi:v26.0
-      out: gen
+      out: test/gen

bufbuild-protovalidate-protocolbuffers/README.md

@@ -0,0 +1,3 @@
+# bufbuild-protovalidate-protocolbuffers
+
+Messages, enum types and stubs for [buf.build/bufbuild/protovalidate](https://buf.build/bufbuild/protovalidate) for python.

bufbuild-protovalidate-protocolbuffers/buf.gen.yaml

@@ -0,0 +1,14 @@
+version: v2
+managed:
+  enabled: true
+plugins:
+    # NOTE: v26.0 is the earliest version supporting protobuf==5.
+    - remote: buf.build/protocolbuffers/python:v26.0
+      out: buf/validate/proto5
+    - remote: buf.build/protocolbuffers/pyi:v26.0
+      out: buf/validate/proto5
+    # NOTE: v30.0 is the earliest version supporting protobuf==6.
+    - remote: buf.build/protocolbuffers/python:v30.0
+      out: buf/validate/proto6
+    - remote: buf.build/protocolbuffers/pyi:v30.0
+      out: buf/validate/proto6

bufbuild-protovalidate-protocolbuffers/buf.lock

@@ -0,0 +1,6 @@
+# Generated by buf. DO NOT EDIT.
+version: v2
+deps:
+  - name: buf.build/bufbuild/protovalidate
+    commit: d22d418d82d84932ba4ba554ce4208ca
+    digest: b5:8b454cb411e14f0024bdb58ac2689aed2321e81617b61ef8a22c8147a7a9757eeb049ebfb899a699d37051bdb3251e172ba1c1ae2f5005d7c3f47a202109136a

bufbuild-protovalidate-protocolbuffers/buf.yaml

@@ -0,0 +1,14 @@
+version: v2
+modules:
+  - path: proto
+deps:
+  - buf.build/bufbuild/protovalidate:v0.14.0
+lint:
+  use:
+    - STANDARD
+  ignore_only:
+    PROTOVALIDATE:
+      - proto/tests/example/v1/validations.proto
+breaking:
+  use:
+    - FILE