Skip to content

Commit 7ae8194

Browse files
CoolCat467CoolCat467
committed
Update dependencies & project
1 parent 1cfd020 commit 7ae8194

6 files changed

+101
-99
lines changed

‎.github/workflows/autodeps.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ jobs:
2020

2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v4
2423
with:
2524
persist-credentials: false
25+
uses: actions/checkout@v4
2626
- name: Setup python
2727
uses: actions/setup-python@v5
2828
with:
@@ -39,8 +39,8 @@ jobs:
3939
run: python -m pip install -r test-requirements.txt
4040

4141
# apply newer versions' formatting
42-
- name: Black
43-
run: black src/checkers
42+
- name: Pre-commit updates
43+
run: pre-commit run -a
4444

4545
- name: uv
4646
run: |

‎.github/workflows/ci.yml

+88-86
Original file line numberDiff line numberDiff line change
@@ -11,52 +11,52 @@ concurrency:
1111
cancel-in-progress: true
1212

1313
jobs:
14-
## Windows:
15-
## name: 'Windows (${{ matrix.python }}, ${{ matrix.arch }}${{ matrix.extra_name }})'
16-
## timeout-minutes: 20
17-
## runs-on: 'windows-latest'
18-
## strategy:
19-
## fail-fast: false
20-
## matrix:
21-
## python: ['3.10', '3.11', '3.12']
22-
## arch: ['x86', 'x64']
23-
## continue-on-error: >-
24-
## ${{
25-
## (
26-
## endsWith(matrix.python, '-dev')
27-
## || endsWith(matrix.python, '-nightly')
28-
## )
29-
## && true
30-
## || false
31-
## }}
32-
## steps:
33-
## - name: Checkout
34-
## uses: actions/checkout@v4
35-
## - name: Setup python
36-
## uses: actions/setup-python@v5
37-
## with:
38-
## # This allows the matrix to specify just the major.minor version while still
39-
## # expanding it to get the latest patch version including alpha releases.
40-
## # This avoids the need to update for each new alpha, beta, release candidate,
41-
## # and then finally an actual release version. actions/setup-python doesn't
42-
## # support this for PyPy presently so we get no help there.
43-
## #
44-
## # 'CPython' -> '3.9.0-alpha - 3.9.X'
45-
## # 'PyPy' -> 'pypy-3.9'
46-
## python-version: ${{ fromJSON(format('["{0}", "{1}"]', format('{0}.0-alpha - {0}.X', matrix.python), matrix.python))[startsWith(matrix.python, 'pypy')] }}
47-
## architecture: '${{ matrix.arch }}'
48-
## cache: pip
49-
## cache-dependency-path: test-requirements.txt
50-
## - name: Run tests
51-
## run: ./ci.sh
52-
## shell: bash
14+
Windows:
15+
name: 'Windows (${{ matrix.python }}, ${{ matrix.arch }}${{ matrix.extra_name }})'
16+
timeout-minutes: 20
17+
runs-on: 'windows-latest'
18+
strategy:
19+
fail-fast: false
20+
matrix:
21+
python: ['3.10', '3.11', '3.12']
22+
arch: ['x86', 'x64']
23+
continue-on-error: >-
24+
${{
25+
(
26+
endsWith(matrix.python, '-dev')
27+
|| endsWith(matrix.python, '-nightly')
28+
)
29+
&& true
30+
|| false
31+
}}
32+
steps:
33+
- name: Checkout
34+
uses: actions/checkout@v4
35+
with:
36+
persist-credentials: false
37+
- name: Setup python
38+
uses: actions/setup-python@v5
39+
with:
40+
# This allows the matrix to specify just the major.minor version while still
41+
# expanding it to get the latest patch version including alpha releases.
42+
# This avoids the need to update for each new alpha, beta, release candidate,
43+
# and then finally an actual release version. actions/setup-python doesn't
44+
# support this for PyPy presently so we get no help there.
45+
#
46+
# 'CPython' -> '3.9.0-alpha - 3.9.X'
47+
# 'PyPy' -> 'pypy-3.9'
48+
python-version: ${{ fromJSON(format('["{0}", "{1}"]', format('{0}.0-alpha - {0}.X', matrix.python), matrix.python))[startsWith(matrix.python, 'pypy')] }}
49+
architecture: '${{ matrix.arch }}'
50+
cache: pip
51+
cache-dependency-path: test-requirements.txt
52+
- name: Run tests
53+
run: ./ci.sh
54+
shell: bash
5355

5456
Ubuntu:
5557
name: 'Ubuntu (${{ matrix.python }}${{ matrix.extra_name }})'
5658
timeout-minutes: 10
5759
runs-on: 'ubuntu-latest'
58-
# Only run for PRs or pushes to main
59-
if: github.event_name == 'pull_request' || (github.event_name == 'push' && github.ref == 'refs/heads/main')
6060
strategy:
6161
fail-fast: false
6262
matrix:
@@ -98,49 +98,51 @@ jobs:
9898
env:
9999
CHECK_FORMATTING: '${{ matrix.check_formatting }}'
100100

101-
## macOS:
102-
## name: 'macOS (${{ matrix.python }})'
103-
## timeout-minutes: 15
104-
## runs-on: 'macos-latest'
105-
## strategy:
106-
## fail-fast: false
107-
## matrix:
108-
## python: ['3.10', '3.11', '3.12']
109-
## continue-on-error: >-
110-
## ${{
111-
## (
112-
## endsWith(matrix.python, '-dev')
113-
## || endsWith(matrix.python, '-nightly')
114-
## )
115-
## && true
116-
## || false
117-
## }}
118-
## steps:
119-
## - name: Checkout
120-
## uses: actions/checkout@v4
121-
## - name: Setup python
122-
## uses: actions/setup-python@v5
123-
## with:
124-
## python-version: ${{ fromJSON(format('["{0}", "{1}"]', format('{0}.0-alpha - {0}.X', matrix.python), matrix.python))[startsWith(matrix.python, 'pypy')] }}
125-
## cache: pip
126-
## cache-dependency-path: test-requirements.txt
127-
## - name: Run tests
128-
## run: ./ci.sh
101+
macOS:
102+
name: 'macOS (${{ matrix.python }})'
103+
timeout-minutes: 15
104+
runs-on: 'macos-latest'
105+
strategy:
106+
fail-fast: false
107+
matrix:
108+
python: ['3.10', '3.11', '3.12']
109+
continue-on-error: >-
110+
${{
111+
(
112+
endsWith(matrix.python, '-dev')
113+
|| endsWith(matrix.python, '-nightly')
114+
)
115+
&& true
116+
|| false
117+
}}
118+
steps:
119+
- name: Checkout
120+
uses: actions/checkout@v4
121+
with:
122+
persist-credentials: false
123+
- name: Setup python
124+
uses: actions/setup-python@v5
125+
with:
126+
python-version: ${{ fromJSON(format('["{0}", "{1}"]', format('{0}.0-alpha - {0}.X', matrix.python), matrix.python))[startsWith(matrix.python, 'pypy')] }}
127+
cache: pip
128+
cache-dependency-path: test-requirements.txt
129+
- name: Run tests
130+
run: ./ci.sh
131+
132+
# https://github.com/marketplace/actions/alls-green#why
133+
check: # This job does nothing and is only used for the branch protection
134+
135+
if: always()
136+
137+
needs:
138+
- Windows
139+
- Ubuntu
140+
- macOS
129141

130-
## # https://github.com/marketplace/actions/alls-green#why
131-
## check: # This job does nothing and is only used for the branch protection
132-
##
133-
## if: always()
134-
##
135-
## needs:
136-
## - Windows
137-
## - Ubuntu
138-
## - macOS
139-
##
140-
## runs-on: ubuntu-latest
141-
##
142-
## steps:
143-
## - name: Decide whether the needed jobs succeeded or failed
144-
## uses: re-actors/alls-green@release/v1
145-
## with:
146-
## jobs: ${{ toJSON(needs) }}
142+
runs-on: ubuntu-latest
143+
144+
steps:
145+
- name: Decide whether the needed jobs succeeded or failed
146+
uses: re-actors/alls-green@release/v1
147+
with:
148+
jobs: ${{ toJSON(needs) }}

‎.pre-commit-config.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ci:
22
autofix_prs: true
33
autoupdate_schedule: quarterly
44
submodules: false
5-
skip: [badgie, project-requirements]
5+
skip: [badgie]
66

77
repos:
88
- repo: https://github.com/pre-commit/pre-commit-hooks
@@ -50,7 +50,7 @@ repos:
5050
hooks:
5151
- id: project-requirements
5252
name: regenerate requirements.in
53-
language: system
54-
entry: python tools/project_requirements.py
53+
language: python
54+
entry: tools/project_requirements.py
5555
pass_filenames: false
5656
files: ^(test-requirements.in)|(pyproject.toml)$

‎pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ keywords = [
3232
"subtitle", "translation", "utility",
3333
]
3434
dependencies = [
35-
"trio~=0.27.0",
35+
"trio~=0.28.0",
3636
"httpx[http2]~=0.28.1",
3737
"beautifulsoup4~=4.12.3",
3838
"lxml>=5.3.0"

‎test-requirements.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ types-beautifulsoup4
2424
beautifulsoup4~=4.12.3
2525
httpx[http2]~=0.28.1
2626
lxml>=5.3.0
27-
trio~=0.27.0
27+
trio~=0.28.0
2828
#</TOML_DEPENDENCIES>

‎test-requirements.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ colorama==0.4.6 ; sys_platform == 'win32'
2424
# via
2525
# click
2626
# pytest
27-
coverage==7.6.9
27+
coverage==7.6.10
2828
# via
2929
# -r test-requirements.in
3030
# pytest-cov
@@ -54,14 +54,14 @@ iniconfig==2.0.0
5454
# via pytest
5555
lxml==5.3.0
5656
# via -r test-requirements.in
57-
mypy==1.14.0
57+
mypy==1.14.1
5858
# via -r test-requirements.in
5959
mypy-extensions==1.0.0
6060
# via
6161
# -r test-requirements.in
6262
# black
6363
# mypy
64-
orjson==3.10.12 ; implementation_name == 'cpython'
64+
orjson==3.10.13 ; implementation_name == 'cpython'
6565
# via -r test-requirements.in
6666
outcome==1.3.0.post0
6767
# via
@@ -104,7 +104,7 @@ tomli==2.2.1 ; python_full_version <= '3.11'
104104
# coverage
105105
# mypy
106106
# pytest
107-
trio==0.27.0
107+
trio==0.28.0
108108
# via
109109
# -r test-requirements.in
110110
# pytest-trio
@@ -118,5 +118,5 @@ typing-extensions==4.12.2
118118
# anyio
119119
# black
120120
# mypy
121-
uv==0.5.11
121+
uv==0.5.13
122122
# via -r test-requirements.in

0 commit comments

Comments
 (0)