Skip to content

Commit 57609c9

Browse files
committed
setup-uv all the things
1 parent 682410f commit 57609c9

3 files changed

Lines changed: 12 additions & 24 deletions

File tree

.github/workflows/ci.yml

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@ jobs:
215215
with:
216216
python-version: ${{ case(startsWith(matrix.python, 'pypy'), matrix.python, format('cpython-{0}', matrix.python)) }}-windows-${{ matrix.arch }}-none
217217
activate-environment: "true"
218-
- run: uv pip install pip
219218
- name: Run tests
220219
run: ./ci.sh
221220
shell: bash
@@ -275,12 +274,10 @@ jobs:
275274
with:
276275
persist-credentials: false
277276
- name: Setup Python
278-
uses: actions/setup-python@v6
277+
uses: astral-sh/setup-[email protected]
279278
with:
280-
python-version: '${{ matrix.python }}'
281-
cache: pip
282-
cache-dependency-path: test-requirements.txt
283-
allow-prereleases: true
279+
python-version: ${{ matrix.python }}
280+
activate-environment: "true"
284281
- name: Setup minimum Python version
285282
if: matrix.check_formatting == '1'
286283
uses: actions/setup-python@v6
@@ -292,13 +289,14 @@ jobs:
292289
- name: Check Formatting
293290
if: matrix.check_formatting == '1'
294291
run:
295-
python -m pip install tox &&
292+
uv pip install tox &&
296293
tox -m check
297294
- name: Install python3-apport
298295
if: matrix.check_formatting == '0'
299296
run: |
300-
sudo apt update
301-
sudo apt install -q python3-apport
297+
sudo apt update &&
298+
sudo apt install -q python3-apport &&
299+
python -c "import apport_python_hook" # double check it's installed!
302300
- name: Run tests
303301
if: matrix.check_formatting == '0'
304302
run: ./ci.sh
@@ -340,12 +338,10 @@ jobs:
340338
source-tarball-name: ${{ needs.build.outputs.sdist-artifact-name }}
341339
workflow-artifact-name: ${{ env.dists-artifact-name }}
342340
- name: Setup Python
343-
uses: actions/setup-python@v6
341+
uses: astral-sh/setup-[email protected]
344342
with:
345-
python-version: '${{ matrix.python }}'
346-
cache: pip
347-
cache-dependency-path: test-requirements.txt
348-
allow-prereleases: true
343+
python-version: ${{ matrix.python }}
344+
activate-environment: "true"
349345
- name: Run tests
350346
run: ./ci.sh
351347
- if: always()
@@ -383,7 +379,7 @@ jobs:
383379
run: python -m venv .venv
384380

385381
- name: Run tests
386-
run: source .venv/bin/activate && ./ci.sh
382+
run: source .venv/bin/activate && pip install uv && ./ci.sh
387383

388384
- name: Get Python version for codecov flag
389385
id: get-version

ci.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ python -c "import sys, struct, ssl; print('python:', sys.version); print('versio
3737
echo "::endgroup::"
3838

3939
echo "::group::Install dependencies"
40-
python -m pip install -U pip uv -c test-requirements.txt
41-
python -m pip --version
40+
uv pip install -U uv -c test-requirements.txt
4241
python -m uv --version
4342

4443
python -m uv pip install build

src/trio/_tests/test_exports.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -417,13 +417,6 @@ def lookup_symbol(symbol: str) -> dict[str, Any]: # type: ignore[misc, explicit
417417
# using .remove() instead of .delete() to get an error in case they start not
418418
# being missing
419419

420-
if (
421-
tool == "jedi"
422-
and BaseException in class_.__mro__
423-
and sys.version_info >= (3, 11)
424-
):
425-
missing.remove("add_note")
426-
427420
if (
428421
tool == "mypy"
429422
and BaseException in class_.__mro__

0 commit comments

Comments
 (0)