Skip to content

Commit db4ae6d

Browse files
committed
Merge branch 'main' of https://github.com/bufbuild/protovalidate-python into cel-python
2 parents a3941ce + 4e940e8 commit db4ae6d

10 files changed

Lines changed: 128 additions & 79 deletions

.github/workflows/add-to-project.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ on:
1717
jobs:
1818
call-workflow-add-to-project:
1919
name: Call workflow to add issue to project
20-
uses: bufbuild/base-workflows/.github/workflows/add-to-project.yaml@936b87d881ecb3b746df8b7e88ae583de5423a07 # main
20+
uses: bufbuild/base-workflows/.github/workflows/add-to-project.yaml@1f59ddae24793e271c2a4fea27d9c8985b5e1f8e # main
2121
secrets: inherit

.github/workflows/ci.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ jobs:
2424
UV_RESOLUTION: "${{ matrix.resolution }}"
2525
steps:
2626
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
27-
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
27+
- uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
2828
with:
2929
go-version: stable
3030
# We use this to install certain tools defined in poe tasks
3131
cache-dependency-path: poe_tasks.toml
32-
- uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
32+
- uses: astral-sh/setup-uv@d31148d669074a8d0a63714ba94f3201e7020bc3 # v8.3.0
3333
with:
3434
python-version: ${{ matrix.python-version }}
3535
- run: uv sync
@@ -39,12 +39,12 @@ jobs:
3939
runs-on: ubuntu-latest
4040
steps:
4141
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
42-
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
42+
- uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
4343
with:
4444
go-version: stable
4545
# We use this to install certain tools defined in poe tasks
4646
cache-dependency-path: poe_tasks.toml
47-
- uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
47+
- uses: astral-sh/setup-uv@d31148d669074a8d0a63714ba94f3201e7020bc3 # v8.3.0
4848
with:
4949
python-version: ${{ matrix.python-version }}
5050
- run: uv sync --locked

.github/workflows/emergency-review-bypass.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ jobs:
99
approve:
1010
name: Approve
1111
if: github.event.label.name == 'Emergency Bypass Review'
12-
uses: bufbuild/base-workflows/.github/workflows/emergency-review-bypass.yaml@936b87d881ecb3b746df8b7e88ae583de5423a07 # main
12+
uses: bufbuild/base-workflows/.github/workflows/emergency-review-bypass.yaml@1f59ddae24793e271c2a4fea27d9c8985b5e1f8e # main
1313
secrets: inherit

.github/workflows/notify-approval-bypass.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ permissions:
1010
jobs:
1111
notify:
1212
name: Notify
13-
uses: bufbuild/base-workflows/.github/workflows/notify-approval-bypass.yaml@936b87d881ecb3b746df8b7e88ae583de5423a07 # main
13+
uses: bufbuild/base-workflows/.github/workflows/notify-approval-bypass.yaml@1f59ddae24793e271c2a4fea27d9c8985b5e1f8e # main
1414
secrets: inherit

.github/workflows/pr-title.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ on:
1515
- synchronize
1616
jobs:
1717
lint:
18-
uses: bufbuild/base-workflows/.github/workflows/pr-title.yaml@936b87d881ecb3b746df8b7e88ae583de5423a07 # main
18+
uses: bufbuild/base-workflows/.github/workflows/pr-title.yaml@1f59ddae24793e271c2a4fea27d9c8985b5e1f8e # main

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
run: |
2020
VERSION=${{github.head_ref}}
2121
echo "VERSION=${VERSION##*/}" >> $GITHUB_ENV
22-
- uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
22+
- uses: astral-sh/setup-uv@d31148d669074a8d0a63714ba94f3201e7020bc3 # v8.3.0
2323
- name: Build release
2424
run: |
2525
uv build
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
{
2+
"folders": [
3+
{
4+
"name": "/",
5+
"path": ".",
6+
},
7+
],
8+
"extensions": {
9+
"recommendations": [
10+
"bufbuild.vscode-buf",
11+
"charliermarsh.ruff",
12+
"esbenp.prettier-vscode",
13+
"github.vscode-github-actions",
14+
"ms-python.python",
15+
"ms-python.vscode-pylance",
16+
"tombi-toml.tombi",
17+
],
18+
},
19+
"settings": {
20+
"editor.formatOnSave": true,
21+
"files.insertFinalNewline": true,
22+
"python.analysis.typeCheckingMode": "basic",
23+
"python.defaultInterpreterPath": "${workspaceFolder:/}/.venv/bin/python",
24+
"python.testing.pytestEnabled": true,
25+
"python.testing.pytestArgs": ["test"],
26+
"python.testing.unittestEnabled": false,
27+
"[github-actions-workflow]": {
28+
"editor.formatOnSave": true,
29+
"editor.defaultFormatter": "esbenp.prettier-vscode",
30+
},
31+
"debugpy.debugJustMyCode": false,
32+
"[python]": {
33+
"editor.formatOnSave": true,
34+
"editor.codeActionsOnSave": {
35+
"source.fixAll": "explicit",
36+
"source.organizeImports": "explicit",
37+
},
38+
"editor.defaultFormatter": "charliermarsh.ruff",
39+
},
40+
"[json][jsonc]": {
41+
"editor.formatOnSave": true,
42+
"editor.defaultFormatter": "esbenp.prettier-vscode",
43+
},
44+
"yaml.format.enable": false,
45+
"[yaml]": {
46+
"editor.formatOnSave": true,
47+
"editor.defaultFormatter": "esbenp.prettier-vscode",
48+
},
49+
},
50+
}

pyproject.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ dev = [
5656
"buf-bin==1.71.0",
5757
"fix-protobuf-imports==0.1.7",
5858
"google-re2-stubs==0.1.1",
59-
"poethepoet==0.46.0",
59+
"poethepoet==0.48.0",
6060
"pytest==9.1.1",
6161
"pytest-benchmark==5.2.3",
62-
"ruff==0.15.18",
63-
"tombi==1.1.4",
64-
"ty==0.0.51",
62+
"ruff==0.15.20",
63+
"tombi==1.2.0",
64+
"ty==0.0.56",
6565
"types-protobuf==6.32.1.20260221",
6666

6767
# The optional cel-expr backend, installed for local/CI testing of both

test/conformance/test_conformance.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
"cel-expr": "nonconforming.cel-expr.yaml",
3333
}
3434

35-
3635
def maybe_patch_args_with_debug(args: list[str]) -> list[str]:
3736
# Do a best effort to invoke the child with debugging.
3837
# This invokes internal methods from bundles provided by the IDE

0 commit comments

Comments
 (0)