Skip to content

Commit 00c1ee8

Browse files
authored
Merge branch 'main' into experiments/nicer-run_process-shell
2 parents ee0cd25 + 0124394 commit 00c1ee8

File tree

92 files changed

+1931
-1293
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+1931
-1293
lines changed

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# For files generated by trio/_tools/gen_exports.py
1+
# For files generated by trio/_tools/gen_exports.py or trio/_tools/windows_ffi_build.py
22
trio/_core/_generated* linguist-generated=true
33
# Treat generated files as binary in git diff
44
trio/_core/_generated* -diff

.github/workflows/autodeps.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,21 @@ jobs:
2626
- name: Setup python
2727
uses: actions/setup-python@v5
2828
with:
29-
python-version: "3.9"
29+
python-version: "3.10"
3030

3131
- name: Bump dependencies
3232
run: |
3333
python -m pip install -U pip pre-commit
3434
python -m pip install -r test-requirements.txt
35-
uv pip compile --universal --python-version=3.9 --upgrade test-requirements.in -o test-requirements.txt
35+
uv pip compile --universal --python-version=3.10 --upgrade test-requirements.in -o test-requirements.txt
3636
uv pip compile --universal --python-version=3.11 --upgrade docs-requirements.in -o docs-requirements.txt
3737
pre-commit autoupdate --jobs 0
3838
3939
- name: Install new requirements
4040
run: python -m pip install -r test-requirements.txt
4141

42-
# apply newer versions' formatting
43-
- name: Black
44-
run: black src/trio
45-
46-
- name: uv
47-
run: |
48-
uv pip compile --universal --python-version=3.9 test-requirements.in -o test-requirements.txt
49-
uv pip compile --universal --python-version=3.11 docs-requirements.in -o docs-requirements.txt
42+
- name: Pre-commit fixes
43+
run: pre-commit run -a || true
5044

5145
- name: Commit changes and create automerge PR
5246
env:

0 commit comments

Comments
 (0)