Merge branch 'main' into sayers/validation_upgrades

Author: Steve Ayers

Makefile

@@ -33,8 +33,9 @@ clean: ## Delete intermediate build artifacts
 .PHONY: generate
 generate: $(BIN)/buf $(BIN)/license-header ## Regenerate code and license headers
 	rm -rf gen
-	buf generate buf.build/bufbuild/protovalidate:$(PROTOVALIDATE_VERSION)
-	buf generate buf.build/bufbuild/protovalidate-testing:$(PROTOVALIDATE_VERSION)
+	$(BIN)/buf generate buf.build/bufbuild/protovalidate:$(PROTOVALIDATE_VERSION)
+	$(BIN)/buf generate buf.build/bufbuild/protovalidate-testing:$(PROTOVALIDATE_VERSION)
+	$(BIN)/buf generate
 	$(ADD_LICENSE_HEADER)
 
 .PHONY: format
@@ -44,7 +45,7 @@ format: install $(BIN)/license-header ## Format code
 	pipenv run ruff check --fix protovalidate tests
 
 .PHONY: test
-test: $(BIN)/protovalidate-conformance generate install ## Run unit tests
+test: generate install ## Run unit tests
 	pipenv run pytest
 
 .PHONY: conformance

Pipfile.lock

@@ -0,0 +1,9 @@
+# Generated by buf. DO NOT EDIT.
+version: v2
+deps:
+  - name: buf.build/bufbuild/protovalidate
+    commit: 0409229c37804d6187ee0806eb4eebce
+    digest: b5:795db9d3a6e066dc61d99ac651fa7f136171869abe2211ca272dd84aada7bc4583b9508249fa5b61300a5b1fe8b6dbf6edbc088aa0345d1ccb9fff705e3d48e9
+  - name: buf.build/bufbuild/protovalidate-testing
+    commit: 5acbe1f3c8f24ced9466b9ccccad4cb0
+    digest: b5:5e9d54d19ce3d9d368f4b1b5ee4f20094d1c33d0f2dca19536339335c2e70d5ffedbd4fa28e290b59ecae0671c9d2dc20b6b8ebba5a9ac76cbf5f9d2af655ef4

buf.lock

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