Skip to content

Commit 47b2e73

Browse files
authored
Merge branch 'main' into pre-commit-ci-update-config
2 parents e062a63 + b96eb22 commit 47b2e73

11 files changed

Lines changed: 20 additions & 50 deletions

File tree

.github/workflows/bump.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
app-id: ${{ secrets.APP_ID }}
2020
private-key: ${{ secrets.APP_PRIVATE_KEY }}
2121
- uses: actions/checkout@v5
22-
- uses: astral-sh/setup-uv@v6
22+
- uses: astral-sh/setup-uv@v7
2323
- run: uvx nox -s pc_bump
2424
env:
2525
GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/reusable-cookie.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
${{ matrix.python-version == '3.13' && runner.os == 'Windows' }}
4444
4545
- name: Setup uv
46-
uses: astral-sh/setup-uv@v6
46+
uses: astral-sh/setup-uv@v7
4747

4848
- name: Install nox
4949
run: uv tool install nox
@@ -110,7 +110,7 @@ jobs:
110110
allow-prereleases: true
111111

112112
- name: Setup uv
113-
uses: astral-sh/setup-uv@v6
113+
uses: astral-sh/setup-uv@v7
114114

115115
- name: Install nox
116116
run: uv tool install nox

.github/workflows/reusable-rr-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
python-version: ${{ matrix.python-version }}
2929
allow-prereleases: true
3030

31-
- uses: astral-sh/setup-uv@v6
31+
- uses: astral-sh/setup-uv@v7
3232

3333
- name: Test package
3434
run: uv run pytest -ra
@@ -58,7 +58,7 @@ jobs:
5858
with:
5959
python-version: "3.13"
6060

61-
- uses: astral-sh/setup-uv@v6
61+
- uses: astral-sh/setup-uv@v7
6262

6363
- name: Rerender README
6464
run: |
@@ -77,7 +77,7 @@ jobs:
7777
with:
7878
python-version: "3.13"
7979

80-
- uses: astral-sh/setup-uv@v6
80+
- uses: astral-sh/setup-uv@v7
8181

8282
- name: Run pylint
8383
run: uvx nox -s rr_pylint -- --output-format=github

docs/pages/guides/docs.md

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,10 @@ You can add the standard indices and tables at the end.
234234

235235
### pyproject.toml additions
236236

237-
Setting a `docs` extra looks like this:
237+
Setting a `docs` dependency group looks like this:
238238

239239
```toml
240-
[project.optional-dependencies]
240+
[dependency-groups]
241241
docs = [
242242
"furo",
243243
"myst_parser >=0.13",
@@ -247,19 +247,14 @@ docs = [
247247
]
248248
```
249249

250-
While there are other ways to specify docs, and you don't have to make the docs
251-
requirements an extra, this is a good idea as it forces docs building to always
252-
install the project, rather than being tempted to install only Sphinx and
253-
plugins and try to build against an uninstalled version of your project.
250+
You should use `--group=docs` when using uv or pip to install.
254251

255252
### .readthedocs.yaml
256253

257254
In order to use <https://readthedocs.org> to build, host, and preview your
258255
documentation, you must have a `.readthedocs.yaml` file {% rr RTD100 %} like
259256
this:
260257

261-
{% tabs %} {% tab uv-sphinx uv + Sphinx %}
262-
263258
<!-- [[[cog
264259
with code_fence("yaml"):
265260
print(readthedocs_yaml)
@@ -286,31 +281,6 @@ build:
286281
<!-- prettier-ignore-end -->
287282
<!-- [[[end]]] -->
288283
289-
{% endtab %} {% tab pip-sphinx pip + Sphinx %}
290-
291-
```yaml
292-
# Read the Docs configuration file
293-
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
294-
295-
version: 2
296-
297-
build:
298-
os: ubuntu-22.04
299-
tools:
300-
python: "3.12"
301-
sphinx:
302-
configuration: docs/conf.py
303-
304-
python:
305-
install:
306-
- method: pip
307-
path: .
308-
extra_requirements:
309-
- docs
310-
```
311-
312-
{% endtab %} {% endtabs %}
313-
314284
This sets the Read the Docs config version (2 is required) {% rr RTD101 %}.
315285
316286
The `build` table is the modern way to specify a runner. You need an `os` (a

docs/pages/guides/gha_basic.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ tests:
115115
allow-prereleases: true
116116
117117
- name: Download uv
118-
uses: astral-sh/setup-uv@v6
118+
uses: astral-sh/setup-uv@v7
119119
120120
- name: Test package
121121
run: uv run pytest

docs/pages/guides/gha_wheels.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ make_sdist:
8383
with:
8484
fetch-depth: 0 # Optional, use if you use setuptools_scm
8585
submodules: true # Optional, use if you have submodules
86-
- uses: astral-sh/setup-uv@v6
86+
- uses: astral-sh/setup-uv@v7
8787
8888
- name: Build SDist
8989
run: uv build --sdist
@@ -125,7 +125,7 @@ build_wheels:
125125
fetch-depth: 0
126126
submodules: true
127127
128-
- uses: astral-sh/setup-uv@v6
128+
- uses: astral-sh/setup-uv@v7
129129
130130
- uses: pypa/cibuildwheel@v3.2
131131

docs/pages/guides/style.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Here is the snippet to add the formatter to your `.pre-commit-config.yml`
111111

112112
```yaml
113113
- repo: https://github.com/astral-sh/ruff-pre-commit
114-
rev: "v0.13.2"
114+
rev: "v0.14.0"
115115
hooks:
116116
# id: ruff-check would go here if using both
117117
- id: ruff-format
@@ -201,7 +201,7 @@ pre-commit hook.
201201
202202
```yaml
203203
- repo: https://github.com/astral-sh/ruff-pre-commit
204-
rev: "v0.13.2"
204+
rev: "v0.14.0"
205205
hooks:
206206
- id: ruff-check
207207
args: ["--fix", "--show-fixes"]
@@ -464,7 +464,7 @@ pre-commit config will work:
464464

465465
```yaml
466466
- repo: https://github.com/PyCQA/isort
467-
rev: "6.0.1"
467+
rev: "6.1.0"
468468
hooks:
469469
- id: isort
470470
```

docs/pages/guides/tasks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ You can install `uv` with `pipx`, `brew`, etc. If you want to use uv in GitHub
315315
Actions, one way is to use this:
316316

317317
```yaml
318-
- uses: astral-sh/setup-uv@v6
318+
- uses: astral-sh/setup-uv@v7
319319
```
320320

321321
Check your jobs with `uv`; most things do not need to change. The main

{{cookiecutter.project_name}}/.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
with:
3030
python-version: "3.x"
3131

32-
- uses: astral-sh/setup-uv@v6
32+
- uses: astral-sh/setup-uv@v7
3333

3434
- uses: pre-commit/action@v3.0.1
3535
with:
@@ -68,7 +68,7 @@ jobs:
6868
{%- endraw %}
6969
{%- endif %}
7070

71-
- uses: astral-sh/setup-uv@v6
71+
- uses: astral-sh/setup-uv@v7
7272

7373
{%- if cookiecutter.backend == "mesonpy" %}
7474

{{cookiecutter.project_name}}/.github/workflows/{% if cookiecutter.__type=='compiled' %}cd.yml{% endif %}

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
with:
5555
fetch-depth: 0
5656

57-
- uses: astral-sh/setup-uv@v6
57+
- uses: astral-sh/setup-uv@v7
5858

5959
- uses: pypa/cibuildwheel@v3.2
6060

0 commit comments

Comments
 (0)