Skip to content

Commit da6e6ef

Browse files
committed
fixup tests and CI
1 parent 9dde9b8 commit da6e6ef

File tree

4 files changed

+20
-15
lines changed

4 files changed

+20
-15
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
- name: install deps
4040
run: |
41-
uv sync --group testing --no-install-project
41+
uv sync --group testing
4242
uv pip install maturin pip
4343
4444
- run: rustc --version --verbose
@@ -210,7 +210,7 @@ jobs:
210210
uses: Swatinem/rust-cache@v2
211211

212212
- name: install deps
213-
run: uv sync --group testing --no-install-project
213+
run: uv sync --group testing
214214

215215
- run: make build-dev
216216

@@ -291,7 +291,7 @@ jobs:
291291

292292
- name: install deps
293293
run: |
294-
uv sync --group linting --no-install-project
294+
uv sync --group linting
295295
make build-dev
296296
uv pip freeze
297297
@@ -350,7 +350,7 @@ jobs:
350350
enable-cache: true
351351

352352
- name: install deps
353-
run: uv sync --group wasm --no-install-project
353+
run: uv sync --group wasm
354354

355355
- name: build wheels
356356
run: make build-wasm
@@ -582,7 +582,7 @@ jobs:
582582

583583
- name: generate pgo data
584584
run: |
585-
uv sync --group testing --no-install-project
585+
uv sync --group testing
586586
uv pip install pydantic-core --no-index --no-deps --find-links pgo-wheel --force-reinstall
587587
uv run pytest tests/benchmarks
588588
rustup run ${{ steps.rust-toolchain.outputs.name }} bash -c 'echo LLVM_PROFDATA=$RUSTUP_HOME/toolchains/$RUSTUP_TOOLCHAIN/lib/rustlib/${{ env.RUST_HOST }}/bin/llvm-profdata >> "$GITHUB_ENV"'
@@ -679,11 +679,11 @@ jobs:
679679
if command -v apt-get &> /dev/null; then
680680
echo "installing python & pip with apt-get..."
681681
apt-get update
682-
apt-get install -y --no-install-recommends python3 python3-pip python3-venv git
682+
apt-get install -y --no-install-recommends python3 python3-pip python3-venv git curl
683683
else
684684
echo "installing python & pip with apk..."
685685
apk update
686-
apk add python3 py3-pip git
686+
apk add python3 py3-pip git curl
687687
fi
688688
run: |
689689
set -x
@@ -706,10 +706,10 @@ jobs:
706706
steps:
707707
- uses: actions/checkout@v4
708708

709-
- name: set up python
710-
uses: actions/setup-python@v5
709+
- name: install uv
710+
uses: astral-sh/setup-uv@v3
711711
with:
712-
python-version: '3.13'
712+
enable-cache: true
713713

714714
- name: get dist artifacts
715715
uses: actions/download-artifact@v4
@@ -718,9 +718,9 @@ jobs:
718718
merge-multiple: true
719719
path: dist
720720

721-
- run: pip install -r tests/requirements.txt
722-
- run: pip install pydantic-core --no-index --no-deps --find-links dist --force-reinstall
723-
- run: pytest --ignore=tests/test_docstrings.py
721+
- run: uv sync --group testing
722+
- run: uv pip install pydantic-core --no-index --no-deps --find-links dist --force-reinstall
723+
- run: uv run pytest --ignore=tests/test_docstrings.py
724724

725725
release:
726726
needs: [test-builds-arch, test-builds-os, build-sdist, check]

.github/workflows/codspeed.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
RUSTFLAGS: "-Cprofile-generate=${{ github.workspace }}/profdata"
4747

4848
- name: Gather pgo data
49-
run: pytest tests/benchmarks
49+
run: uv run pytest tests/benchmarks
5050

5151
- name: Prepare merged pgo data
5252
run: rustup run stable bash -c '$RUSTUP_HOME/toolchains/$RUSTUP_TOOLCHAIN/lib/rustlib/x86_64-unknown-linux-gnu/bin/llvm-profdata merge -o ${{ github.workspace }}/merged.profdata ${{ github.workspace }}/profdata'

pyproject.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,3 +153,8 @@ reportUnnecessaryTypeIgnoreComment = true
153153

154154
[tool.inline-snapshot.shortcuts]
155155
fix = ["create", "fix"]
156+
157+
[tool.uv]
158+
# this ensures that `uv run` doesn't actually build the package; a `make`
159+
# command is needed to build
160+
package = false

uv.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)