Skip to content
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

Documentation: proteus-doc -> proteus #1041

Merged
merged 12 commits into from
Jan 11, 2020
Merged

Documentation: proteus-doc -> proteus #1041

merged 12 commits into from
Jan 11, 2020

Conversation

tridelat
Copy link
Member

@tridelat tridelat commented Dec 18, 2019

This PR brings the changes to documentation from proteus-doc to proteus, keeping commit authorship (but could not keep the date/time of changes due to some conflicts).

The reason for bringing back the documentation here is that it seems easier to have an automatic way to build it if it is centralised on this repo, see #1040

This should not be squashed and merged (regular merge)

@tridelat tridelat requested a review from cekees December 18, 2019 20:37
@codecov
Copy link

codecov bot commented Dec 18, 2019

Codecov Report

Merging #1041 into master will increase coverage by <.01%.
The diff coverage is 19.29%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1041      +/-   ##
==========================================
+ Coverage   48.89%    48.9%   +<.01%     
==========================================
  Files         514      514              
  Lines      100018   100021       +3     
==========================================
+ Hits        48907    48911       +4     
+ Misses      51111    51110       -1
Impacted Files Coverage Δ
proteus/mprans/BoundaryConditions.py 0% <0%> (ø) ⬆️
proteus/BoundaryConditions.py 0% <0%> (ø) ⬆️
proteus/tests/test_boundaryconditions.py 97.33% <100%> (-0.25%) ⬇️
proteus/Comm.py 81.17% <100%> (+0.22%) ⬆️
proteus/NumericalFlux.py 38.55% <100%> (+0.18%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 738f837...9ae3070. Read the comment docs.

Copy link
Member

@cekees cekees left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Can you fix the class hierarchy graphs? https://erdc.github.io/proteus-doc/api/proteus.LinearSolvers.html versus https://proteustoolkit.org/api/proteus.LinearSolvers.html

Also, on the Python API doc's, we might want to put the submodules before the sub-packages, or at least limit the depth of the subpackage table of contents so the subpackage section is brief. https://erdc.github.io/proteus-doc/api/proteus.html

* Add templates for sphinx autodoc [WIP]

* Makefile point to _templates/apidoc for sphinx templates

* APIDOC: ignore *.so files, toctree depth to 1, clean capi

* DOC: doc -> docs (standard for readthedocs)
@tridelat
Copy link
Member Author

tridelat commented Jan 6, 2020

@cekees this is ready to be reviewed/merged (not squashed and merged so that people keep authorship of the documentation they modified).
It will not change the documentation website, just update the files so that the next time we update the docs, we get something like this: https://tridelat.github.io/proteus/
(I pushed the website generated from this branch on my fork)

@tridelat
Copy link
Member Author

tridelat commented Jan 6, 2020

@cekees as a side note, clicking on "Python API" leads you to this page: https://tridelat.github.io/proteus/api/modules.html, where you need to click on "proteus package" to actually access the API doc. This can be bypassed to access the proteus doc directly, although having it this way is "safer" if one day an extra package is installed side-by-side with proteus, as it would appear on that intermediate page.

@cekees
Copy link
Member

cekees commented Jan 7, 2020

Found a few more issues: 1) the readthedocs template is not scaling the inheritance graphs properly, 2) the C++ docs are not showing ineritance graphs at all, and 3) the C++ docs aren't including the mathematical formulas that have been formatted for doxygen.

@tridelat
Copy link
Member Author

tridelat commented Jan 7, 2020

@cekees for 1) I will need to dig a little bit,
for 2) and 3) it looks like the only way is to switch back to doxygen only, and not use breathe.
I think it might be best to just use doxygen, the only drawback is that it would be a "separate" API documentation, with a different template after clicking on "C/C++ API".
Breathe is supposed to link doxygen and sphinx nicely but it looks like it cannot reproduce the hierarchy graphs produced from doxygen.

@tridelat
Copy link
Member Author

tridelat commented Jan 8, 2020

@cekees for 3) the mathematical formulas actually seem to render, for example here: https://tridelat.github.io/proteus/capi/classDensityRelation.html#exhale-class-classdensityrelation
For the hierarchy/dot graphs, I don't think it is possible with breathe (yet at least), see breathe-doc/breathe#45
We can point directly to the doxygen html pages instead of using breathe if we want to inlcude the C++ graphs. It would look similar to the current https://proteustoolkit.org/capi/html/hierarchy.html (with no link back to https://proteustoolkit.org/)

* DOC: correct warnings/errors

* DOC: disable breathe and exhale

* DOC: ./build directory, doxygen first, remove exhale

* DOC: add link in toc to doxygen doc and sphinx doc

* DOC: update copyright
@tridelat tridelat merged commit 68be280 into master Jan 11, 2020
@tridelat tridelat deleted the tridelat/docs_mod branch January 13, 2020 04:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants