Skip to content

Commit 7e808bc

Browse files
ampagentpatrick91
andcommitted
Merge main and fix Python 3.15 compatibility
Amp-Thread-ID: https://ampcode.com/threads/T-01a04938-a944-74db-a1e9-3bd34e58c0f5 Co-authored-by: Patrick Arminio <patrick.arminio@gmail.com>
2 parents 1069c10 + 00cb770 commit 7e808bc

23 files changed

Lines changed: 147 additions & 75 deletions

.agents/resume

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
4+
# This repository has no services or authentication that need wake-time repair.
5+
printf 'No resume-time setup required.\n'

.agents/setup

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
4+
repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
5+
cd "$repo_root"
6+
7+
run_step() {
8+
local label="$1"
9+
shift
10+
11+
local start=$SECONDS
12+
printf '\n==> %s\n' "$label"
13+
"$@"
14+
printf '<== %s completed in %ss\n' "$label" "$((SECONDS - start))"
15+
}
16+
17+
install_uv() {
18+
curl --proto '=https' --tlsv1.2 -LsSf https://astral.sh/uv/install.sh |
19+
env UV_INSTALL_DIR="$HOME/.local/bin" UV_NO_MODIFY_PATH=1 sh
20+
}
21+
22+
install_pre_commit_hook() {
23+
if git config --get core.hooksPath >/dev/null; then
24+
printf 'Skipping hook installation: core.hooksPath is already configured.\n'
25+
return
26+
fi
27+
28+
uv run --frozen pre-commit install
29+
}
30+
31+
if ! command -v uv >/dev/null 2>&1; then
32+
run_step "Install uv" install_uv
33+
fi
34+
35+
export PATH="$HOME/.local/bin:$PATH"
36+
37+
run_step "Sync Python dependencies" uv sync --frozen
38+
run_step "Install pre-commit hook" install_pre_commit_hook
39+
run_step "Sync E2E dependencies" bun install --cwd e2e --no-save
40+
41+
printf '\nOrb setup complete.\n'

.github/workflows/claude.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
done
4949
5050
- name: Review release copy
51-
uses: anthropics/claude-code-action@be7b93b1907a4abad570368f3c74b6fe3807510b # v1.0.183
51+
uses: anthropics/claude-code-action@3f854a8fb5146b39d5cbf8b57f70d80810e1366f # v1.0.198
5252
with:
5353
claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
5454
# Use the workflow's built-in token to post the review comment.

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2323

2424
- name: Initialize CodeQL
25-
uses: github/codeql-action/init@f205ea1c3313d32999d8d6a48b4f6530d4437b38 # v4.37.4
25+
uses: github/codeql-action/init@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
2626
with:
2727
languages: python
2828

2929
- name: Perform CodeQL Analysis
30-
uses: github/codeql-action/analyze@f205ea1c3313d32999d8d6a48b4f6530d4437b38 # v4.37.4
30+
uses: github/codeql-action/analyze@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7

.github/workflows/e2e-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
bunx playwright install --with-deps
3939
4040
- name: Install uv
41-
uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
41+
uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
4242
with:
4343
enable-cache: true
4444
python-version: "3.12"

.github/workflows/federation-compatibility.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
persist-credentials: false
3434

3535
- name: Install uv
36-
uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
36+
uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
3737
with:
3838
enable-cache: true
3939
python-version: "3.12"
@@ -43,7 +43,7 @@ jobs:
4343
run: uv run strawberry export-schema schema:schema > schema.graphql
4444
working-directory: federation-compatibility
4545

46-
- uses: apollographql/federation-subgraph-compatibility@b6981fd83d24450a7cbd2d7727196e0ba57614e0 # v2
46+
- uses: apollographql/federation-subgraph-compatibility@f688595a4637f0307944672c49b1121618953f74 # v3.0.1
4747
with:
4848
compose: 'federation-compatibility/docker-compose.yml'
4949
schema: 'federation-compatibility/schema.graphql'

.github/workflows/test.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
with:
2525
persist-credentials: false
2626
- name: Install uv
27-
uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
27+
uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
2828
- run: uv sync
2929
- id: set-matrix
3030
shell: bash
@@ -59,7 +59,7 @@ jobs:
5959
python-version: ${{ matrix.session.python }}
6060
allow-prereleases: true
6161
- name: Install uv
62-
uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
62+
uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
6363
with:
6464
enable-cache: true
6565

@@ -94,7 +94,7 @@ jobs:
9494
persist-credentials: false
9595
fetch-depth: 0
9696
- name: Install uv
97-
uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
97+
uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
9898

9999
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
100100
with:
@@ -138,15 +138,15 @@ jobs:
138138
with:
139139
persist-credentials: false
140140
- name: Install uv
141-
uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
141+
uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
142142
with:
143143
enable-cache: true
144144
python-version: "3.14"
145145

146146
- run: uv sync
147147

148148
- name: Run benchmarks
149-
uses: CodSpeedHQ/action@88472375d0a4572cf70a9f1fe3a4e0ab8da1b924 # v5.0.1
149+
uses: CodSpeedHQ/action@4296e51e7041e24dadb86d1d6e8b9320d223dbe8 # v5.0.3
150150
with:
151151
mode: simulation
152152
run: uv run pytest tests/benchmarks --codspeed -p no:codeflash-benchmark
@@ -160,7 +160,7 @@ jobs:
160160
with:
161161
persist-credentials: false
162162
- name: Install uv
163-
uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
163+
uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
164164
with:
165165
enable-cache: true
166166
python-version: "3.12"
@@ -181,7 +181,7 @@ jobs:
181181
with:
182182
persist-credentials: false
183183
- name: Install uv
184-
uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
184+
uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
185185
with:
186186
enable-cache: true
187187
python-version: "3.11"

.github/workflows/zizmor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ jobs:
2323
persist-credentials: false
2424

2525
- name: Run zizmor
26-
uses: zizmorcore/zizmor-action@6fc4b006235f201fdab3722e17240ab420d580e5 # v0.6.1
26+
uses: zizmorcore/zizmor-action@3dc1ecc9bcb9e94e9b2c709687979e1298497054 # v0.6.2

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,3 +195,6 @@ $RECYCLE.BIN/
195195
.idea/
196196
node_modules/
197197
.codspeed/
198+
199+
# Amp orb runtime files
200+
.amp/portals/*

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
3-
rev: v0.16.1
3+
rev: v0.16.4
44
hooks:
55
- id: ruff-format
66
exclude: ^tests/\w+/snapshots/

0 commit comments

Comments
 (0)