From 59b5386f92f54241d0036e0726e93b4086970e03 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2024 10:59:30 +0200 Subject: [PATCH 1/5] [pre-commit.ci] pre-commit autoupdate (#976) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ee47c5c6..9c66b009 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -13,7 +13,7 @@ exclude: > repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 + rev: v5.0.0 hooks: - id: check-json - id: check-yaml @@ -21,7 +21,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.6.4 + rev: v0.6.9 hooks: - id: ruff args: [--fix] From 9fe724ebf1d02fd979632d82387f802c91e0d6f6 Mon Sep 17 00:00:00 2001 From: Chris Sewell Date: Sun, 27 Oct 2024 14:29:14 +0100 Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=A7=AA=20Fix=20tests=20for=20latest?= =?UTF-8?q?=20sphinx=20(#993)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_sphinx/conftest.py | 4 ++++ tests/test_sphinx/test_sphinx_builds.py | 2 ++ .../test_references_singlehtml.html | 16 ++++++++-------- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/tests/test_sphinx/conftest.py b/tests/test_sphinx/conftest.py index ab7611a5..cdb2d999 100644 --- a/tests/test_sphinx/conftest.py +++ b/tests/test_sphinx/conftest.py @@ -79,6 +79,10 @@ def read( # pygments 2.11.0 introduces a whitespace tag for pygment_whitespace in doc_div.select("pre > span.w"): pygment_whitespace.replace_with(pygment_whitespace.text) + # something changed in sphinx 8 (or new docutils) to introduce this, although I couldn't find the actual commit, + # but in any case, it's not important for the regression test + for clearer_div in doc_div.findAll("div", {"class": "clearer"}): + clearer_div.decompose() text = doc_div.prettify() # changed in sphinx 7.2 text = text.replace('"Link to this', '"Permalink to this') diff --git a/tests/test_sphinx/test_sphinx_builds.py b/tests/test_sphinx/test_sphinx_builds.py index 12db6c9f..8beb8748 100644 --- a/tests/test_sphinx/test_sphinx_builds.py +++ b/tests/test_sphinx/test_sphinx_builds.py @@ -178,6 +178,8 @@ def test_references_singlehtml( # changed in sphinx 7.3 '="#document-index': '="index.html#document-index', '="#document-other': '="index.html#document-other', + # change in sphinx 8 + 'href="index.html#': 'href="#', }, ) diff --git a/tests/test_sphinx/test_sphinx_builds/test_references_singlehtml.html b/tests/test_sphinx/test_sphinx_builds/test_references_singlehtml.html index 643e868d..ac9ec0b7 100644 --- a/tests/test_sphinx/test_sphinx_builds/test_references_singlehtml.html +++ b/tests/test_sphinx/test_sphinx_builds/test_references_singlehtml.html @@ -29,28 +29,28 @@

- + Other 2 Title

- + Other 2 Title

- + Other 2 Title

- + Title @@ -71,21 +71,21 @@

- + Other Title

- + Other Title

- + Other Title @@ -99,7 +99,7 @@

- + Other Title From bc3579430f9974770ddb428ad395457e10055097 Mon Sep 17 00:00:00 2001 From: Kun Jinkao <45487685+Snoopy1866@users.noreply.github.com> Date: Sun, 27 Oct 2024 21:37:16 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=93=9A=20remove=20redundant=20paragra?= =?UTF-8?q?ph=20(#987)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Chris Sewell --- docs/syntax/roles-and-directives.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/syntax/roles-and-directives.md b/docs/syntax/roles-and-directives.md index a15a896b..6cd90f7e 100644 --- a/docs/syntax/roles-and-directives.md +++ b/docs/syntax/roles-and-directives.md @@ -253,9 +253,6 @@ Euler's identity, equation {math:numref}`euler`, was elected one of the most beautiful mathematical formulas. ::: -Euler's identity, equation {math:numref}`euler`, was elected one of the -most beautiful mathematical formulas. - #### How roles parse content The content of roles is parsed differently depending on the role that you've used. From 14ea197b79466bf0ab2204a7cfa05e9cc9619051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=B6k=C3=A7e=20Aydos?= <18174744+goekce@users.noreply.github.com> Date: Sun, 27 Oct 2024 14:55:21 +0100 Subject: [PATCH 4/5] =?UTF-8?q?=F0=9F=93=9A=20Minor=20typo=20in=20`cross-r?= =?UTF-8?q?eferencing.md`=20(#990)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Chris Sewell --- docs/syntax/cross-referencing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/syntax/cross-referencing.md b/docs/syntax/cross-referencing.md index 8fd0370f..e30e57ef 100644 --- a/docs/syntax/cross-referencing.md +++ b/docs/syntax/cross-referencing.md @@ -338,7 +338,7 @@ you can then reference inventory objects by prefixing the `inv` schema to the de `key`, `domain` and `type` are optional, e.g. for `inv:#name`, all inventories, domains and types will be searched, with a [warning emitted](myst-warnings) if multiple matches are found. -Additionally, `*` is a wildcard which matches zero or characters, e.g. `inv:*:std:doc#a*` will match all `std:doc` objects in all inventories, with a `name` beginning with `a`. +Additionally, `*` is a wildcard which matches zero or more characters, e.g. `inv:*:std:doc#a*` will match all `std:doc` objects in all inventories, with a `name` beginning with `a`. Note, to match to a literal `*` use `\*`. Here are some examples: From f62025fc7d29fd37c3dc46d15a19a62fe6158a16 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 27 Oct 2024 15:05:34 +0100 Subject: [PATCH 5/5] [pre-commit.ci] pre-commit autoupdate (#986) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Chris Sewell --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9c66b009..2163f325 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -21,14 +21,14 @@ repos: - id: trailing-whitespace - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.6.9 + rev: v0.7.0 hooks: - id: ruff args: [--fix] - id: ruff-format - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.11.2 + rev: v1.12.1 hooks: - id: mypy args: [--config-file=pyproject.toml]