Merge branch 'main' into main

Author: engnatha

.github/workflows/ci.yaml

@@ -18,6 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        resolution: ["highest", "lowest-direct"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v5
@@ -31,13 +32,17 @@ jobs:
       - uses: astral-sh/setup-uv@v6
         with:
           python-version: ${{ matrix.python-version }}
+      - name: Install dependencies with resolution ${{ matrix.resolution }}
+        run: UV_RESOLUTION=${{ matrix.resolution }} make install
       - name: Execute tests
         run: make test
       - name: Lint
         run: make lint
       - name: Format
         run: make format
-      - name: Check generated
+      # When running with matrix.resolution == lowest, we expect uv.lock to change, but we don't want that file checked in.
+      - if: matrix.resolution == 'highest'
+        name: Check generated
         run: make checkgenerate
         env:
           BUF_TOKEN: ${{ secrets.BUF_TOKEN }}

.github/workflows/conformance.yaml

@@ -18,6 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        resolution: ["highest", "lowest-direct"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v5
@@ -29,7 +30,7 @@ jobs:
           go-version: stable
           cache: false
       - uses: astral-sh/setup-uv@v6
-      - name: Install Python ${{ matrix.python-version }}
-        run: uv python install ${{ matrix.python-version }}
+        with:
+          python-version: ${{ matrix.python-version }}
       - name: Test conformance
-        run: make conformance
+        run: UV_RESOLUTION=${{ matrix.resolution }} make conformance

Makefile

@@ -70,7 +70,7 @@ lint: install $(BIN)/buf ## Lint code
 	uv run -- ruff format --check --diff protovalidate test
 	uv run -- mypy protovalidate
 	uv run -- ruff check protovalidate test
-	uv sync --locked
+	uv lock --check
 
 .PHONY: install
 install: ## Install dependencies

buf.gen.yaml

@@ -2,7 +2,8 @@ version: v2
 managed:
   enabled: true
 plugins:
-    - remote: buf.build/protocolbuffers/python:v30.1
+    # NOTE: v30.0 is the earliest version supporting protobuf==6.
+    - remote: buf.build/protocolbuffers/python:v30.0
       out: gen
-    - remote: buf.build/protocolbuffers/pyi:v30.1
+    - remote: buf.build/protocolbuffers/pyi:v30.0
       out: gen