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

Build documentation #66

Merged
merged 17 commits into from
Feb 4, 2021
Merged

Build documentation #66

merged 17 commits into from
Feb 4, 2021

Conversation

pierrepo
Copy link
Collaborator

@pierrepo pierrepo commented Feb 1, 2021

This PR aims at building documentation with Sphinx.

This is a prerequisite to automatically build documentation at ReadTheDocs.

This should fix #35

To try this PR, you need to update your conda dev environement:

conda env update -f binder/environment.yml

Then activate the buildh conda env:

conda activate buildh

Eventually, you can build the documentation:

make docs

And open docs at docs/_build/html/index.html

Copy link
Collaborator

@HubLot HubLot left a comment

Choose a reason for hiding this comment

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

Great work @pierrepo!
I just have a couple of questions

.github/workflows/docs.yml Show resolved Hide resolved
- -r file:../requirements.txt
- nbsphinx-link
- recommonmark
- sphinx-git

Copy link
Collaborator

Choose a reason for hiding this comment

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

why those packages are installed through pip?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I don't know. It was a legacy from the initial version of the repo. It contains buildH own dependencies:

numpy
pandas
MDAnalysis

To you want me to merge this into binder/environment.yml?

Copy link
Collaborator

Choose a reason for hiding this comment

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

No I meant those 3:

    - nbsphinx-link
    - recommonmark
    - sphinx-git

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Because they were not available in conda some times ago. But now, only sphinx-git is not available in conda. I'll fix this. Thanks!

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

By the way, I will remove sphinx-git. This extension includes in the documentation the last commits. It is not very useful in our cases given we have CHANGELOG.md that can be imported in documentation.

docs/buildh.md Outdated
- `order_parameter_definitions_MODEL_Berger_POPC.def` (option `-d`, present in this repo).

The program needs one mandatory file (present in this repo):
- `order_parameter_definitions_MODEL_Berger_POPC.def` (option `-d`).


#### dic_lipids.py
Copy link
Collaborator

Choose a reason for hiding this comment

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

could be removed

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Should I remove these 2 lines?

The program needs one mandatory file (present in this repo):
- `order_parameter_definitions_MODEL_Berger_POPC.def` (option `-d`).

Copy link
Collaborator

Choose a reason for hiding this comment

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

The interest peak is confusing. I meant : "#### dic_lipids.py"

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

OK. I'll remove the corresponding paragraph.

docs/conf.py Outdated Show resolved Hide resolved
@pierrepo
Copy link
Collaborator Author

pierrepo commented Feb 2, 2021

The content of the documentation itself may be a bit rough. We should work on it and add more consistency later.

@pierrepo pierrepo requested a review from HubLot February 2, 2021 08:57
Copy link
Collaborator

@HubLot HubLot left a comment

Choose a reason for hiding this comment

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

I agree. Now, with architecture set up, we can start to improve it.

@pierrepo
Copy link
Collaborator Author

pierrepo commented Feb 2, 2021

Thanks @HubLot

Copy link
Owner

@patrickfuchs patrickfuchs left a comment

Choose a reason for hiding this comment

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

Nice work, thanks @pierrepo. We only have to remember to replace the removed comment on dic_lipipds.py by something about the json files. To me it's fine for the merge 😄 !

@HubLot
Copy link
Collaborator

HubLot commented Feb 4, 2021

I created an issue about it

@pierrepo pierrepo changed the title [WIP] Build documentation Build documentation Feb 4, 2021
@pierrepo
Copy link
Collaborator Author

pierrepo commented Feb 4, 2021

OK thanks @HubLot & @patrickfuchs !
I merge.

@pierrepo pierrepo merged commit 1000b53 into patrickfuchs:master Feb 4, 2021
@pierrepo pierrepo deleted the build-doc branch February 4, 2021 09:51
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.

Create doc
3 participants