Skip to content

Commit 4c4845a

Browse files
committed
Merge remote-tracking branch 'upstream/main' into more-indexes-2
2 parents 4c0a016 + 5780e97 commit 4c4845a

23 files changed

+1641
-192
lines changed

.git-blame-ignore-revs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1d7b1abd152e4cb5e6a46e52e6b7e3bf8d366486

.pre-commit-config.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.4.0
3+
rev: v4.5.0
44
hooks:
55
- id: check-added-large-files
66
- id: check-case-conflict
@@ -31,3 +31,9 @@ repos:
3131
- id: rst-backticks
3232
- id: rst-directive-colons
3333
- id: rst-inline-touching-normal
34+
35+
- repo: https://github.com/astral-sh/ruff-pre-commit
36+
rev: v0.1.4
37+
hooks:
38+
- id: ruff
39+
- id: ruff-format

noxfile.py

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# Attribution-ShareAlike license:
44
# http://creativecommons.org/licenses/by-sa/3.0.
55

6-
import shutil
76

87
import nox
98

@@ -19,10 +18,12 @@ def translation(session):
1918
target_dir = "locales"
2019
session.run(
2120
"sphinx-build",
22-
"-b", "gettext", # build gettext-style message catalogs (.pot file)
23-
"-d", session.cache_dir / ".doctrees", # path to put the cache
21+
"-b",
22+
"gettext", # build gettext-style message catalogs (.pot file)
23+
"-d",
24+
session.cache_dir / ".doctrees", # path to put the cache
2425
"source/", # where the rst files are located
25-
target_dir, # where to put the .pot file
26+
target_dir, # where to put the .pot file
2627
)
2728

2829

@@ -45,10 +46,14 @@ def build(session, autobuild=False):
4546
)
4647

4748
session.run(
48-
command, *extra_args,
49-
"-j", "auto", # parallelize the build
50-
"-b", "html", # use HTML builder
51-
"-d", session.cache_dir / ".doctrees", # path to put the cache
49+
command,
50+
*extra_args,
51+
"-j",
52+
"auto", # parallelize the build
53+
"-b",
54+
"html", # use HTML builder
55+
"-d",
56+
session.cache_dir / ".doctrees", # path to put the cache
5257
"-n", # nitpicky warn about all missing references
5358
"-W", # Treat warnings as errors.
5459
*session.posargs,
@@ -74,12 +79,16 @@ def linkcheck(session):
7479
session.install("-r", "requirements.txt")
7580
session.run(
7681
"sphinx-build",
77-
"-b", "linkcheck", # use linkcheck builder
78-
"-d", session.cache_dir / ".doctrees", # path to put the cache
82+
"-b",
83+
"linkcheck", # use linkcheck builder
84+
"-d",
85+
session.cache_dir / ".doctrees", # path to put the cache
7986
"--color",
80-
"-n", "-W", "--keep-going", # be strict
81-
"source", # where the rst files are located
82-
"build", # where to put the check output
87+
"-n",
88+
"-W",
89+
"--keep-going", # be strict
90+
"source", # where the rst files are located
91+
"build", # where to put the check output
8392
)
8493

8594

0 commit comments

Comments
 (0)