-
Notifications
You must be signed in to change notification settings - Fork 23
docs: fix documentation rendering with scikit-package
standards.
#64
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
Merged
+207
−49
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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 hidden or 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 hidden or 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 |
---|---|---|
@@ -1,3 +1,3 @@ | ||
{ | ||
"path": "../../../../examples/QPA-Quantitative phase analysis.ipynb" | ||
"path": "../../examples/QPA-Quantitative phase analysis.ipynb" | ||
} |
This file contains hidden or 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 |
---|---|---|
@@ -1,3 +1,3 @@ | ||
{ | ||
"path": "../../../../examples/crystal_3d_widget.ipynb" | ||
"path": "../../examples/crystal_3d_widget.ipynb" | ||
} |
File renamed without changes.
This file contains hidden or 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 |
---|---|---|
@@ -1,3 +1,3 @@ | ||
{ | ||
"path": "../../../../examples/structure-solution-multiprocessing.ipynb" | ||
"path": "../../examples/structure-solution-multiprocessing.ipynb" | ||
} |
2 changes: 1 addition & 1 deletion
2
docs/source/examples/structure-solution-powder-cimetidine.nblink
This file contains hidden or 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 |
---|---|---|
@@ -1,3 +1,3 @@ | ||
{ | ||
"path": "../../../../examples/structure-solution-powder-cimetidine.ipynb" | ||
"path": "../../examples/structure-solution-powder-cimetidine.ipynb" | ||
} |
This file contains hidden or 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 |
---|---|---|
@@ -1,3 +1,3 @@ | ||
{ | ||
"path": "../../../../examples/structure-solution-powder-pbso4.ipynb" | ||
"path": "../../examples/structure-solution-powder-pbso4.ipynb" | ||
} |
This file contains hidden or 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 |
---|---|---|
|
@@ -32,7 +32,7 @@ was developed by V. Favre-Nicolin as part of the development of the | |
Further developments including the ability to index and refine | ||
powder patterns, solve and display crystal structures, using the | ||
global optimisation and least squares algorithms (see the | ||
:doc:`examples/index`) are provided by Vincent Favre-Nicolin (ESRF). | ||
:doc:`examples/examples`) are provided by Vincent Favre-Nicolin (ESRF). | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
|
||
For a complete list of contributors, see | ||
https://github.com/diffpy/pyobjcryst/graphs/contributors and | ||
|
@@ -63,15 +63,15 @@ Usage & notebooks | |
* etc.. | ||
|
||
The functionality is similar to what is available in `Fox <http://fox.vincefn.net>`_. | ||
See the :doc:`examples/index`: | ||
See the :doc:`examples/examples`: | ||
|
||
* :doc:`3D Crystal structure display <examples/crystal_3d_widget>` | ||
* :doc:`Solving the cimetidine structure from its powder pattern <examples/structure-solution-powder-cimetidine>` | ||
* :doc:`Solving the PbSO4 structure from its X and N powder patterns <examples/structure-solution-powder-pbso4>` | ||
* :doc:`Meta-structure solution using multi-processing <examples/structure-solution-multiprocessing>` | ||
* :doc:`Quantitative phase analysis (QPA) <examples/Quantitative-phase-analysis>` | ||
|
||
The **API documentation** can be found in :doc:`api/modules`. | ||
The **API documentation** can be found in :doc:`api/pyobjcryst`. | ||
|
||
You can also read the | ||
`documentation of the underlying ObjCryst++ library <https://vincefn.net/ObjCryst/annotated.html>`_. | ||
|
@@ -89,11 +89,11 @@ Table of contents | |
:maxdepth: 2 | ||
|
||
getting-started | ||
Examples <examples/examples> | ||
Package API <api/pyobjcryst> | ||
release | ||
license | ||
|
||
======= | ||
Indices | ||
======= | ||
|
||
|
This file contains hidden or 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 |
---|---|---|
@@ -1,5 +1,7 @@ | ||
sphinx | ||
sphinx_rtd_theme | ||
sphinx-copybutton | ||
nbsphinx | ||
nbsphinx-link | ||
doctr | ||
m2r |
Oops, something went wrong.
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.
Examples with
.ipynb
files are moved from the top-level directory into thedocs
directory, as otherdiffpy
packages do.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.
I think these should be in the top level tbh. These are examples for users, not source for docs so it doesn't make so much sense to me to put them into docs/source. It kind of depends whether the examples are just going to appear in the rst or whether we expect users to be able to import and run them. They won't get bundled in the release, but at least they are more accessible (in
docs/examples
in the repo)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.
wait, scratch my comment. As long as it is
docs/examples
I am happy...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.
Well, actualy, thinking again, this change we may want to run by @vincefn to see his preference. I could also see examples at the top level making them more discoverable. I think if it were my choice I would do
docs/examples
but let's give @vincefn a chance to puah back before we merge this.