Remove pipenv install from Makefile

.github/CONTRIBUTING.md

@@ -19,8 +19,12 @@ git clone git@github.com:bufbuild/protovalidate-python.git
 cd protovalidate-python
 ```
 
-Then, make any changes you'd like. We use a Makefile to test and lint our code,
-so you'll need a few non-Python tools:
+Next, install dependencies. You will need:
+
+* Python >=v3.9
+* [Pipenv](https://pipenv.pypa.io/en/latest/index.html)
+
+We use a Makefile to test and lint our code, so you'll also need a few non-Python tools:
 
 * GNU Make (to use the Makefile): part of the `build-essential` package on
   Debian-derived Linux distributions (including Ubuntu), and part of

.github/workflows/ci.yaml

@@ -17,7 +17,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        # Note we can't test above v3.12 because google-re2 does not have a 
+        # built wheel beyond 3.12 on PyPI
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -32,6 +34,8 @@ jobs:
         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
       - name: Execute tests
         run: make test PYTHON=${{ steps.python.outputs.python-path }}
       - name: Lint

.github/workflows/conformance.yaml

@@ -17,7 +17,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        # Note we can't test above v3.12 because google-re2 does not have a 
+        # built wheel beyond 3.12 on PyPI
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -32,5 +34,7 @@ jobs:
         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
       - name: Test conformance
         run: make conformance PYTHON=${{ steps.python.outputs.python-path }}

.github/workflows/release.yaml

@@ -22,7 +22,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.13"
+          python-version: "3.12"
       - name: Install pypa/build
         run: |
           python -m pip install build

Makefile

@@ -62,7 +62,6 @@ lint: install ## Lint code
 
 .PHONY: install
 install: ## Install dependencies
-	$(PYTHON) -m pip install --upgrade pip pipenv
 	pipenv --python $(PYTHON) sync --dev
 
 .PHONY: checkgenerate

Pipfile

@@ -6,12 +6,14 @@ name = "pypi"
 [packages]
 cel-python = "==0.2.*"
 protobuf = "==6.*"
+google-re2 = "*"
 
 [dev-packages]
+google-re2-stubs = "*"
 pytest = "*"
 mypy = "*"
 ruff = "*"
-types-protobuf = "*"
+types-protobuf = "==6.30.2.20250503"
 exceptiongroup = "*"
 tomli = "*"
 

protovalidate/internal/extra_func.py

@@ -13,22 +13,35 @@
 # limitations under the License.
 
 import math
-import re
 import typing
 from urllib import parse as urlparse
 
 import celpy
+import re2
 from celpy import celtypes
 
 from protovalidate.internal import string_format
 from protovalidate.internal.rules import MessageType, field_to_cel
 
 # See https://html.spec.whatwg.org/multipage/input.html#valid-e-mail-address
-_email_regex = re.compile(
+_email_regex = re2.compile(
     r"^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$"
 )
 
 
+# Currently cel-python does not support re2. So we are overriding their `matches`
+# function with our own that leverages re2. Note there is a PR in cel-python to
+# add re2 support. See https://github.com/cloud-custodian/cel-python/pull/67.
+# Once that lands, this `matches` override can be removed.
+def cel_matches(text: str, pattern: str) -> celpy.Result:
+    try:
+        m = re2.search(pattern, text)
+    except re2.error as ex:
+        msg = "match error"
+        raise celpy.CELEvalError(msg, ex.__class__, ex.args) from ex
+    return celtypes.BoolType(m is not None)
+
+
 def cel_get_field(message: celtypes.Value, field_name: celtypes.Value) -> celpy.Result:
     if not isinstance(message, MessageType):
         msg = "invalid argument, expected message"
@@ -1560,6 +1573,7 @@ def make_extra_funcs(locale: str) -> dict[str, celpy.CELFunction]:
     return {
         # Missing standard functions
         "format": string_fmt.format,
+        "matches": cel_matches,
         # protovalidate specific functions
         "getField": cel_get_field,
         "isNan": cel_is_nan,

pyproject.toml

@@ -6,7 +6,8 @@ build-backend = "hatchling.build"
 name = "protovalidate"
 description = "Protocol Buffer Validation for Python"
 readme = "README.md"
-license = { file = "LICENSE" }
+license-expression = "Apache 2.0"
+license-file = "LICENSE"
 keywords = ["validate", "protobuf", "protocol buffer"]
 requires-python = ">=3.9"
 classifiers = [
@@ -15,12 +16,11 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
-  "License :: OSI Approved :: Apache Software License",
   "Operating System :: OS Independent",
   "Typing :: Typed",
 ]
 dynamic = ["version"]
-dependencies = ["protobuf", "cel-python"]
+dependencies = ["protobuf", "cel-python", "google-re2"]
 
 [project.urls]
 Homepage = "https://github.com/bufbuild/protovalidate-python"