Merge branch 'main' into jrinehart/dvrl-518-update-links-in-all-protovalidate-github-repos-to-use

Author: jrinehart-buf

.env

@@ -22,7 +22,7 @@ cd protovalidate-python
 Next, install dependencies. You will need:
 
 * Python >=v3.9
-* [Pipenv](https://pipenv.pypa.io/en/latest/index.html)
+* [uv](https://docs.astral.sh/uv/)
 
 We use a Makefile to test and lint our code, so you'll also need a few non-Python tools:
 
@@ -35,7 +35,7 @@ We use a Makefile to test and lint our code, so you'll also need a few non-Pytho
 
 With Go and GNU Make installed, you can verify that your changes pass tests and
 lint checks by running `make`. If your Python 3 interpreter isn't available as
-`python3`, try `PYTHON=python make`. For a list of other useful commands, run
+`python3`, try `UV_PYTHON=python make`. For a list of other useful commands, run
 `make help`.
 
 ### Reporting Bugs
@@ -67,7 +67,7 @@ better!
 
 We welcome ideas for enhancements and new features to improve `protovalidate-python`.
 If you have an idea you'd like to share, if you want to expand language
-support,  
+support,
 please read [the section below](#language-support-requirements) first.
 
 1. __Check if the enhancement is already suggested__: Before creating a new

.github/CONTRIBUTING.md

@@ -4,7 +4,7 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
-  - package-ecosystem: "pip"
+  - package-ecosystem: "uv"
     directory: "/"
     schedule:
       interval: "weekly"

.github/dependabot.yml

@@ -27,18 +27,15 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version: stable
-      - name: Install Python ${{ matrix.python-version }}
-        id: python
-        uses: actions/setup-python@v5
+          cache: false
+      - uses: astral-sh/setup-uv@v6
         with:
           python-version: ${{ matrix.python-version }}
-          cache: "pipenv"
-      - run: ${{steps.python.outputs.python-path}}  -m pip install --upgrade pip pipenv
       - name: Execute tests
-        run: make test PYTHON=${{ steps.python.outputs.python-path }}
+        run: make test
       - name: Lint
-        run: make lint PYTHON=${{ steps.python.outputs.python-path }}
+        run: make lint
       - name: Format
-        run: make format PYTHON=${{ steps.python.outputs.python-path }}
+        run: make format
       - name: Check generated
-        run: make checkgenerate PYTHON=${{ steps.python.outputs.python-path }}
+        run: make checkgenerate

.github/workflows/ci.yaml

@@ -27,12 +27,9 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version: stable
+          cache: false
+      - uses: astral-sh/setup-uv@v6
       - name: Install Python ${{ matrix.python-version }}
-        id: python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: "pipenv"
-      - run: ${{steps.python.outputs.python-path}}  -m pip install --upgrade pip pipenv
+        run: uv python install ${{ matrix.python-version }}
       - name: Test conformance
-        run: make conformance PYTHON=${{ steps.python.outputs.python-path }}
+        run: make conformance

.github/workflows/conformance.yaml

@@ -19,14 +19,10 @@ jobs:
         run: |
           VERSION=${{github.head_ref}}
           echo "VERSION=${VERSION##*/}" >> $GITHUB_ENV
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.13"
-      - name: Install pypa/build
+      - uses: astral-sh/setup-uv@v6
+      - name: Build release
         run: |
-          python -m pip install build
-          python -m build
+          uv build
       - uses: actions/upload-artifact@v4
         with:
           name: package
@@ -37,6 +33,9 @@ jobs:
     runs-on: ubuntu-latest
     environment:
       name: release
+    permissions:
+      # IMPORTANT: this permission is mandatory for Trusted Publishing
+      id-token: write
     needs: build
     steps:
       - name: Checkout source
@@ -52,5 +51,3 @@ jobs:
 
       - name: Publish on PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/release.yaml

@@ -9,19 +9,18 @@ MAKEFLAGS += --no-print-directory
 BIN := .tmp/bin
 export PATH := $(BIN):$(PATH)
 export GOBIN := $(abspath $(BIN))
-# Set to use a different Python interpreter. For example, `PYTHON=python make test`.
-PYTHON ?= python3
-CONFORMANCE_ARGS ?= --strict_message --expected_failures=tests/conformance/nonconforming.yaml --timeout 10s
+export PYTHONPATH ?= gen
+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"
 # This version should be kept in sync with the version in buf.yaml
-PROTOVALIDATE_VERSION ?= v0.13.3
+PROTOVALIDATE_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 format_test.py
 CEL_SPEC_VERSION ?= v0.24.0
-TESTDATA_FILE := tests/testdata/string_ext_$(CEL_SPEC_VERSION).textproto
+TESTDATA_FILE := test/testdata/string_ext_$(CEL_SPEC_VERSION).textproto
 
 .PHONY: help
 help: ## Describe useful make targets
@@ -47,27 +46,33 @@ generate: $(BIN)/buf $(BIN)/license-header ## Regenerate code and license header
 .PHONY: format
 format: install $(BIN)/license-header ## Format code
 	$(ADD_LICENSE_HEADER)
-	pipenv run ruff format protovalidate tests
-	pipenv run ruff check --fix protovalidate tests
+	uv run -- ruff format protovalidate test
+	uv run -- ruff check --fix protovalidate test
 
 .PHONY: test
 test: generate install gettestdata ## Run unit tests
-	pipenv run pytest
+	uv run -- python -m unittest
+	$(MAKE) testextra
+
+.PHONY: testextra
+testextra:
+	uv sync --extra re2
+	uv run -- python -m unittest
 
 .PHONY: conformance
 conformance: $(BIN)/protovalidate-conformance generate install ## Run conformance tests
-	protovalidate-conformance $(CONFORMANCE_ARGS) pipenv -- --python $(PYTHON) run python3 -m tests.conformance.runner
+	protovalidate-conformance $(CONFORMANCE_ARGS) uv -- run python3 -m test.conformance.runner
 
 .PHONY: lint
 lint: install ## Lint code
-	pipenv run ruff format --check --diff protovalidate tests
-	pipenv run mypy protovalidate
-	pipenv run ruff check protovalidate tests
-	pipenv verify
+	uv run -- ruff format --check --diff protovalidate test
+	uv run -- mypy protovalidate
+	uv run -- ruff check protovalidate test
+	uv sync --locked
 
 .PHONY: install
 install: ## Install dependencies
-	pipenv --python $(PYTHON) sync --dev
+	uv sync --dev
 
 .PHONY: checkgenerate
 checkgenerate: generate