-
Notifications
You must be signed in to change notification settings - Fork 83
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
⬆️ UPGRADE: Upgrade to support sphinx4, remove support for sphinx2 #356
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
ada2b91
Upgrade to support sphinx4, remove support for sphinx2
mmcky 9460257
update github action tests setup
mmcky 7d68b54
reconfigure to include major tests on sphinx3 and sphinx4
mmcky c6833b0
add back in python=3.6, add in osx-latest for py39-sphinx4
mmcky 853685c
FIX: fix specific test runs not to include range
mmcky 632c51e
Upgrade docutils pin to include 0.17
mmcky 9aecefb
restore testing all major python versions against sphinx3 and sphinx4
mmcky File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,169 @@ | ||
| <document source="with_glue"> | ||
| <section classes="tex2jax_ignore mathjax_ignore" ids="glue-tests" names="glue\ tests"> | ||
| <title> | ||
| Glue Tests | ||
| <CellNode cell_type="code" classes="cell"> | ||
| <CellInputNode classes="cell_input"> | ||
| <literal_block language="ipython3" linenos="False" xml:space="preserve"> | ||
| from myst_nb import glue | ||
| <CellNode cell_type="code" classes="cell"> | ||
| <CellInputNode classes="cell_input"> | ||
| <literal_block language="ipython3" linenos="False" xml:space="preserve"> | ||
| glue("key_text1", "text1") | ||
| glue("key_float", 3.14159) | ||
| <CellOutputNode classes="cell_output"> | ||
| <literal_block classes="output text_plain" language="myst-ansi" linenos="False" xml:space="preserve"> | ||
| 'text1' | ||
| <literal_block classes="output text_plain" language="myst-ansi" linenos="False" xml:space="preserve"> | ||
| 3.14159 | ||
| <CellNode cell_type="code" classes="cell"> | ||
| <CellInputNode classes="cell_input"> | ||
| <literal_block language="ipython3" linenos="False" xml:space="preserve"> | ||
| glue("key_undisplayed", "undisplayed", display=False) | ||
| <CellOutputNode classes="cell_output"> | ||
| <CellNode cell_type="code" classes="cell"> | ||
| <CellInputNode classes="cell_input"> | ||
| <literal_block language="ipython3" linenos="False" xml:space="preserve"> | ||
| import pandas as pd | ||
| df = pd.DataFrame({"header": [1, 2, 3]}) | ||
| glue("key_df", df) | ||
| <CellOutputNode classes="cell_output"> | ||
| <raw classes="output text_html" format="html" xml:space="preserve"> | ||
| <div> | ||
| <style scoped> | ||
| .dataframe tbody tr th:only-of-type { | ||
| vertical-align: middle; | ||
| } | ||
|
|
||
| .dataframe tbody tr th { | ||
| vertical-align: top; | ||
| } | ||
|
|
||
| .dataframe thead th { | ||
| text-align: right; | ||
| } | ||
| </style> | ||
| <table border="1" class="dataframe"> | ||
| <thead> | ||
| <tr style="text-align: right;"> | ||
| <th></th> | ||
| <th>header</th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| <tr> | ||
| <th>0</th> | ||
| <td>1</td> | ||
| </tr> | ||
| <tr> | ||
| <th>1</th> | ||
| <td>2</td> | ||
| </tr> | ||
| <tr> | ||
| <th>2</th> | ||
| <td>3</td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| </div> | ||
| <CellNode cell_type="code" classes="cell"> | ||
| <CellInputNode classes="cell_input"> | ||
| <literal_block language="ipython3" linenos="False" xml:space="preserve"> | ||
| import matplotlib.pyplot as plt | ||
| plt.plot([1, 2, 3]) | ||
| glue("key_plt", plt.gcf(), display=False) | ||
| <CellOutputNode classes="cell_output"> | ||
| <image candidates="{'*': '_build/jupyter_execute/with_glue_5_1.png'}" uri="_build/jupyter_execute/with_glue_5_1.png"> | ||
| <section ids="referencing-the-figs" names="referencing\ the\ figs"> | ||
| <title> | ||
| Referencing the figs | ||
| <paragraph> | ||
| <inline classes="pasted-inline"> | ||
| <literal classes="output text_plain" language="none"> | ||
| 'text1' | ||
| , | ||
| <inline classes="pasted-inline"> | ||
| <image candidates="{'*': '_build/jupyter_execute/with_glue_5_0.png'}" uri="_build/jupyter_execute/with_glue_5_0.png"> | ||
| <CellOutputNode classes="cell_output"> | ||
| <raw classes="output text_html" format="html" xml:space="preserve"> | ||
| <div> | ||
| <style scoped> | ||
| .dataframe tbody tr th:only-of-type { | ||
| vertical-align: middle; | ||
| } | ||
|
|
||
| .dataframe tbody tr th { | ||
| vertical-align: top; | ||
| } | ||
|
|
||
| .dataframe thead th { | ||
| text-align: right; | ||
| } | ||
| </style> | ||
| <table border="1" class="dataframe"> | ||
| <thead> | ||
| <tr style="text-align: right;"> | ||
| <th></th> | ||
| <th>header</th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| <tr> | ||
| <th>0</th> | ||
| <td>1</td> | ||
| </tr> | ||
| <tr> | ||
| <th>1</th> | ||
| <td>2</td> | ||
| </tr> | ||
| <tr> | ||
| <th>2</th> | ||
| <td>3</td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| </div> | ||
| <paragraph> | ||
| and | ||
| <inline classes="pasted-text"> | ||
| text1 | ||
| inline… | ||
| <paragraph> | ||
| and formatted | ||
| <inline classes="pasted-text"> | ||
| 3.14 | ||
| <CellOutputNode classes="cell_output"> | ||
| <image candidates="{'*': '_build/jupyter_execute/with_glue_5_0.png'}" uri="_build/jupyter_execute/with_glue_5_0.png"> | ||
| <paragraph> | ||
| and | ||
| <inline classes="pasted-text"> | ||
| undisplayed | ||
| inline… | ||
| <figure ids="abc" names="abc"> | ||
| <CellOutputNode classes="cell_output"> | ||
| <image candidates="{'*': '_build/jupyter_execute/with_glue_5_0.png'}" uri="_build/jupyter_execute/with_glue_5_0.png"> | ||
| <caption> | ||
| A caption…. | ||
|
|
||
| ```## A test title | ||
| <inline classes="pasted-inline"> | ||
| <literal classes="output text_plain" language="none"> | ||
| 'text1' | ||
| <section ids="math" names="math"> | ||
| <title> | ||
| Math | ||
| <CellNode cell_type="code" classes="cell"> | ||
| <CellInputNode classes="cell_input"> | ||
| <literal_block language="ipython3" linenos="False" xml:space="preserve"> | ||
| import sympy as sym | ||
| f = sym.Function('f') | ||
| y = sym.Function('y') | ||
| n = sym.symbols(r'\alpha') | ||
| f = y(n)-2*y(n-1/sym.pi)-5*y(n-2) | ||
| glue("sym_eq", sym.rsolve(f,y(n),[1,4])) | ||
| <CellOutputNode classes="cell_output"> | ||
| <math_block classes="output text_latex" nowrap="False" number="True" xml:space="preserve"> | ||
| \displaystyle \left(\sqrt{5} i\right)^{\alpha} \left(\frac{1}{2} - \frac{2 \sqrt{5} i}{5}\right) + \left(- \sqrt{5} i\right)^{\alpha} \left(\frac{1}{2} + \frac{2 \sqrt{5} i}{5}\right) | ||
| <target refid="equation-eq-sym"> | ||
| <math_block classes="pasted-math" docname="with_glue" ids="equation-eq-sym" label="eq-sym" nowrap="False" number="1" xml:space="preserve"> | ||
| \displaystyle \left(\sqrt{5} i\right)^{\alpha} \left(\frac{1}{2} - \frac{2 \sqrt{5} i}{5}\right) + \left(- \sqrt{5} i\right)^{\alpha} \left(\frac{1}{2} + \frac{2 \sqrt{5} i}{5}\right) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we now expect a new one of these files for every major version of Sphinx that we support?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@choldgraf the
sphinx3is the same as the old fixture file. There is a minor difference in what sphinx includes in the xml "align='default'" is no longer specified insphinx4