Skip to content

Commit a7214a0

Browse files
committed
Merge branch 'main' into jrinehart/dvrl-61-update-protovalidate-python-repository
2 parents 9a4bbee + 0f5fd6b commit a7214a0

File tree

88 files changed

+2629
-605
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+2629
-605
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright 2023 Buf Technologies, Inc.
189+
Copyright 2023-2025 Buf Technologies, Inc.
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

Makefile

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ export PATH := $(BIN):$(PATH)
1111
export GOBIN := $(abspath $(BIN))
1212
# Set to use a different Python interpreter. For example, `PYTHON=python make test`.
1313
PYTHON ?= python3
14-
CONFORMANCE_ARGS ?= --strict --strict_message --expected_failures=tests/conformance/nonconforming.yaml --timeout 10s
14+
CONFORMANCE_ARGS ?= --strict_message --expected_failures=tests/conformance/nonconforming.yaml --timeout 10s
1515
ADD_LICENSE_HEADER := $(BIN)/license-header \
1616
--license-type apache \
1717
--copyright-holder "Buf Technologies, Inc." \
18-
--year-range "2023"
19-
PROTOVALIDATE_VERSION ?= v0.10.0
18+
--year-range "2023-2025"
19+
PROTOVALIDATE_VERSION ?= v0.10.3
2020

2121
.PHONY: help
2222
help: ## Describe useful make targets
@@ -35,7 +35,7 @@ generate: $(BIN)/buf $(BIN)/license-header ## Regenerate code and license header
3535
rm -rf gen
3636
buf generate buf.build/bufbuild/protovalidate:$(PROTOVALIDATE_VERSION)
3737
buf generate buf.build/bufbuild/protovalidate-testing:$(PROTOVALIDATE_VERSION)
38-
$(ADD_LICENSE_HEADER) --ignore __init__.py
38+
$(ADD_LICENSE_HEADER)
3939

4040
.PHONY: format
4141
format: install $(BIN)/license-header ## Format code
@@ -58,11 +58,6 @@ lint: install ## Lint code
5858
pipenv run ruff check protovalidate tests
5959
pipenv verify
6060

61-
.PHONY: lint-fix
62-
lint-fix: install ## Lint code
63-
pipenv run ruff format protovalidate tests
64-
pipenv run ruff check --fix protovalidate tests
65-
6661
.PHONY: install
6762
install: ## Install dependencies
6863
$(PYTHON) -m pip install --upgrade pip pipenv

Pipfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name = "pypi"
55

66
[packages]
77
cel-python = "==0.2.*"
8-
protobuf = "==5.*"
8+
protobuf = "==6.*"
99

1010
[dev-packages]
1111
pytest = "*"

Pipfile.lock

Lines changed: 37 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gen/buf/validate/conformance/cases/bool_pb2.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gen/buf/validate/conformance/cases/bool_pb2.pyi

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gen/buf/validate/conformance/cases/bytes_pb2.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gen/buf/validate/conformance/cases/bytes_pb2.pyi

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)