Skip to content

Commit 11039dd

Browse files
authored
[FIX] any tech debt causing tests to fail (#127)
* switch from m2r to m2r2 * update mac to latest * add more dependencies for error * trigger test workflow on forked pull request
1 parent 39f579d commit 11039dd

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

.github/workflows/testing.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,18 @@ on:
44
push:
55
branches:
66
- "master"
7-
pull_request:
7+
pull_request_target:
88
branches:
99
- "*"
1010
schedule:
1111
# Run tests every Sunday at 12am
1212
- cron: "0 0 * * 0"
1313

14+
permissions:
15+
contents: read
16+
checks: write
17+
pull-requests: write
18+
1419
concurrency:
1520
group: environment-${{ github.ref }}
1621
cancel-in-progress: true
@@ -38,7 +43,7 @@ jobs:
3843
strategy:
3944
fail-fast: false
4045
matrix:
41-
os: ["ubuntu-latest", "macos-12"]
46+
os: ["ubuntu-latest", "macos-latest"]
4247
python-version: ["3.8", "3.9", "3.10", "3.11"]
4348

4449
name: ${{ matrix.os }} with Python ${{ matrix.python-version }}

docs/conf.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from distutils.version import LooseVersion
2323

2424
import sphinx
25-
from m2r import MdInclude
25+
from m2r2 import MdInclude
2626

2727
sys.path.insert(0, os.path.abspath("sphinxext"))
2828
sys.path.insert(0, os.path.abspath(os.path.pardir))
@@ -214,6 +214,7 @@ def setup(app):
214214
app.add_config_value("m2r_parse_relative_links", False, "env")
215215
app.add_config_value("m2r_anonymous_references", False, "env")
216216
app.add_config_value("m2r_disable_inline_math", False, "env")
217+
app.add_config_value("m2r_use_mermaid", True, "env")
217218
app.add_directive("mdinclude", MdInclude)
218219

219220

setup.cfg

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ include_package_data = False
4747

4848
[options.extras_require]
4949
doc =
50-
m2r
50+
m2r2
5151
matplotlib
52-
mistune<2 # just temporary until m2r addresses this issue
52+
mistune
5353
numpydoc
5454
pillow
5555
recommonmark
@@ -60,6 +60,8 @@ doc =
6060
sphinx_gallery
6161
sphinx_rtd_theme
6262
sphinxcontrib-bibtex
63+
sphinxcontrib-mermaid
64+
docutils>=0.18.1,<0.21
6365
tests =
6466
codecov
6567
coverage

0 commit comments

Comments
 (0)