Merge remote-tracking branch 'upstream/main' into svanburen/contains-bytestype

Author: hudlow

.github/workflows/ci.yaml

@@ -5,7 +5,7 @@ on:
   pull_request:
 env:
   POETRY_VERSION: "1.8.3"
-  DEFAULT_PY_VERSION: "3.12"
+  DEFAULT_PY_VERSION: "3.13"
 
 jobs:
   Lint:
@@ -36,6 +36,8 @@ jobs:
             tox-target: py311
           - python-version: "3.12"
             tox-target: py312
+          - python-version: "3.13"
+            tox-target: py313
 
     steps:
       - uses: actions/checkout@v2

features/steps/cli_binding.py

@@ -34,7 +34,7 @@
 from behave import *
 
 
-@given(u'JSON Document \'{json}\'')
+@given(u'JSON document \'{json}\'')
 def step_impl(context, json):
     context.data['json'].append(json)
 

pyproject.toml

@@ -33,7 +33,10 @@ dependencies = [
     "pendulum>=3.1.0",
     "pyyaml>=6.0.2",
     "jmespath>=1.0.1",
-    "google-re2>=1.1.20240702 ; python_version!='3.13' or sys_platform!='darwin' or platform_machine!='arm64'",
+    # 3.13 needs at least this version, which started publishing wheels for Python 3.13.
+    # Ref: https://github.com/google/re2/issues/516
+    "google-re2>=1.1.20250722; python_version == '3.13'",
+    "google-re2>=1.1.20240702",
     "tomli >= 1.1.0 ; python_version < '3.11'",
 ]