Merge branch 'master' into patch-2

executablebooks · Apr 13, 2022 · 2436c5b · 2436c5b
2 parents 50e0c5d + 5916392
commit 2436c5b
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 15 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -23,14 +23,16 @@ jobs:
   tests:
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["3.7", "3.8", "3.9", "3.10"]
         sphinx: [">=4,<5"]
         os: [ubuntu-latest]
         include:
-          - os: ubuntu-latest
-            python-version: "3.8"
-            sphinx: ">=3,<4"
+          # fails because of: https://github.com/sphinx-doc/sphinx/issues/10291
+          # - os: ubuntu-latest
+          #   python-version: "3.8"
+          #   sphinx: ">=3,<4"
           - os: windows-latest
             python-version: "3.8"
             sphinx: ">=4,<5"

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -12,15 +12,15 @@ exclude: >
 repos:
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v4.2.0
     hooks:
     - id: check-json
     - id: check-yaml
     - id: end-of-file-fixer
     - id: trailing-whitespace
 
   - repo: https://github.com/mgedmin/check-manifest
-    rev: "0.47"
+    rev: "0.48"
     hooks:
     - id: check-manifest
       args: [--no-build-isolation]
@@ -32,7 +32,7 @@ repos:
     - id: isort
 
   - repo: https://github.com/psf/black
-    rev: 21.11b1
+    rev: 22.3.0
     hooks:
     - id: black
 
@@ -46,7 +46,7 @@ repos:
         # - flake8-self~=0.2.2
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.910-1
+    rev: v0.942
     hooks:
     - id: mypy
       args: [--config-file=setup.cfg]

diff --git a/myst_parser/parse_html.py b/myst_parser/parse_html.py
@@ -179,7 +179,7 @@ def find(
         if include_self:
             iterator = itertools.chain([self], iterator)
         if inspect.isclass(identifier):
-            test_func = lambda c: isinstance(c, identifier)  # type: ignore[arg-type] # noqa: E731,E501
+            test_func = lambda c: isinstance(c, identifier)  # noqa: E731
         else:
             test_func = lambda c: c.name == identifier  # noqa: E731
         classes = set(classes) if classes is not None else classes

diff --git a/setup.cfg b/setup.cfg
@@ -66,12 +66,12 @@ linkify =
 # Note: This is only required for internal use
 rtd =
     ipython
-    sphinx-book-theme~=0.1.0
-    sphinx-panels~=0.5.2
-    sphinxcontrib-bibtex~=2.1
-    sphinxext-rediraffe~=0.2
-    sphinxcontrib.mermaid~=0.6.3
-    sphinxext-opengraph~=0.4.2
+    sphinx-book-theme
+    sphinx-panels
+    sphinxcontrib-bibtex~=2.4
+    sphinxext-rediraffe~=0.2.7
+    sphinxcontrib.mermaid~=0.7.1
+    sphinxext-opengraph~=0.6.3
 testing =
     beautifulsoup4
     coverage

diff --git a/tests/test_renderers/fixtures/sphinx_roles.md b/tests/test_renderers/fixtures/sphinx_roles.md
@@ -514,7 +514,7 @@ pep (`sphinx.roles.PEP`):
     <paragraph>
         <index entries="('single',\ 'Python\ Enhancement\ Proposals;\ PEP\ 1',\ 'index-0',\ '',\ None)">
         <target ids="index-0">
-        <reference classes="pep" internal="False" refuri="http://www.python.org/dev/peps/pep-0001">
+        <reference classes="pep" internal="False" refuri="http://www.python.org/dev/peps/pep-0001/">
             <strong>
                 PEP 1
 .

diff --git a/tests/test_renderers/test_fixtures_sphinx.py b/tests/test_renderers/test_fixtures_sphinx.py
@@ -63,6 +63,12 @@ def test_sphinx_roles(file_params):
     actual = document.pformat()
     # sphinx 3 adds a parent key
     actual = re.sub('cpp:parent_key="[^"]*"', 'cpp:parent_key=""', actual)
+    # sphinx >= 4.5.0 adds a trailing slash to PEP URLs,
+    # see https://github.com/sphinx-doc/sphinx/commit/658689433eacc9eb
+    actual = actual.replace(
+        ' refuri="http://www.python.org/dev/peps/pep-0001">',
+        ' refuri="http://www.python.org/dev/peps/pep-0001/">',
+    )
     file_params.assert_expected(actual, rstrip_lines=True)