Remove re2

Author: Steve Ayers

.github/workflows/ci.yaml

@@ -17,9 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # 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"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

.github/workflows/conformance.yaml

@@ -17,9 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # 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"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

.github/workflows/release.yaml

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

Pipfile

@@ -6,10 +6,8 @@ name = "pypi"
 [packages]
 cel-python = "==0.2.*"
 protobuf = "==6.*"
-google-re2 = "*"
 
 [dev-packages]
-google-re2-stubs = "*"
 pytest = "*"
 mypy = "*"
 ruff = "*"

Pipfile.lock

@@ -13,35 +13,22 @@
 # 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 = re2.compile(
+_email_regex = re.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"
@@ -1573,7 +1560,6 @@ 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,