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

DOC: Deploy docs to gh-pages from CircleCI - with versioning #65

Merged
merged 67 commits into from
Oct 11, 2019

Conversation

rwblair
Copy link
Contributor

@rwblair rwblair commented Mar 25, 2019

Closes #46.

@effigies
Copy link
Member

@rwblair What's the status of this? Should we try to get this merged today for a 0.3.0 release, or push off for now?

@oesteban
Copy link
Member

@rwblair, they finally migrated sphinx-versioning to sphinx-contrib

See sphinx-contrib/sphinxcontrib-versioning#46 (comment)

@effigies
Copy link
Member

I think moving on to upgrading fMRIPrep's dependencies is probably more important than squeezing this in now. Sorry for the short turnaround question at lunch time.

@rwblair
Copy link
Contributor Author

rwblair commented Aug 27, 2019

Ok I think this is ready. Documentation is being saved as an artifact so we can review it there. Once this gets merged and a new version tagged, we will need to blacklist this branch from sphinx-versioning so it doesn't show up in the side menu.

@oesteban
Copy link
Member

oesteban commented Aug 27, 2019 via email

@rwblair
Copy link
Contributor Author

rwblair commented Aug 27, 2019

"doc_test" in the left hand column is a tag I made on the ci_doc_deploy branch to test new tags. This is where the versions that have documentation will show up in the future.

Copy link
Member

@oesteban oesteban left a comment

Choose a reason for hiding this comment

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

Good job! I left a few comments.

.circleci/config.yml Outdated Show resolved Hide resolved
.circleci/config.yml Outdated Show resolved Hide resolved
docs/Makefile Outdated Show resolved Hide resolved
docs/conf.py Outdated Show resolved Hide resolved
docs/conf.py Outdated Show resolved Hide resolved
docs_requirements.txt Outdated Show resolved Hide resolved
docs/api/smriprep.rst Outdated Show resolved Hide resolved
docs/api/smriprep.rst Outdated Show resolved Hide resolved
docs/api/smriprep.rst Outdated Show resolved Hide resolved
Subpackages
-----------

.. toctree::
Copy link
Member

Choose a reason for hiding this comment

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

maybe this toctree should be moved to the docstring of smriprep/__init__.py replacing the description that is written currently, and removed from here. Then this block would only have (no sections):

.. automodule:: smriprep
   :members:
   :undoc-members:
   :show-inheritance:

Copy link
Contributor Author

Choose a reason for hiding this comment

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

So this file is automatically generated by sphinx-apidoc, changes to it are overwritten.

Looks like in sphinx 2.2 you can overwrite the templates used in its generation with -t:
https://www.sphinx-doc.org/en/master/man/sphinx-apidoc.html

I'll try and get the base templates used and try modifying those.

Copy link
Member

Choose a reason for hiding this comment

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

Is this really automatically generated by apidocs? That surprises me.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The toctree itself is being pulled from smriprep/init.py. I got the template dir setting to work with apidoc and removed a few things from the packages.rst_t template to clean it up.

Maybe we push fine tweaking it into an aesthetic fixes PR.

rwblair and others added 5 commits August 28, 2019 09:03
Co-Authored-By: Oscar Esteban <code@oscaresteban.es>
Co-Authored-By: Oscar Esteban <code@oscaresteban.es>
Co-Authored-By: Oscar Esteban <code@oscaresteban.es>
Co-Authored-By: Oscar Esteban <code@oscaresteban.es>
Move docs requirements to docs directory
pin sphinxcontrib-versioning to a tag
remove subsection header in api/smriprep.rst
Have versions in docs/conf.py match fmriprep
Try moving subpacge toctree to smriprep/__init__.py
@rwblair
Copy link
Contributor Author

rwblair commented Oct 2, 2019

Tests look fixed. Any objections to merging @oesteban? Once this is merged I'll open up another PR that removes the doc_test_* tags and removes the ci_doc_deploy branch from being built via sphinxcontrib-versioning.

@oesteban
Copy link
Member

oesteban commented Oct 2, 2019

I'll have a last look later today 👍 . Thanks very much for figuring this out.

Copy link
Member

@oesteban oesteban left a comment

Choose a reason for hiding this comment

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

Added a couple of comments and got cut again. Will keep on later.

.circleci/config.yml Show resolved Hide resolved
.circleci/config.yml Show resolved Hide resolved
.circleci/config.yml Outdated Show resolved Hide resolved
Copy link
Member

@oesteban oesteban left a comment

Choose a reason for hiding this comment

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

Minimal additional comments. This is almost ready, only the Makefile question is really relevant.

docs/_templates/apidoc/package.rst_t.bak Outdated Show resolved Hide resolved
docs/requirements.txt Outdated Show resolved Hide resolved
smriprep/workflows/anatomical.py Outdated Show resolved Hide resolved
@@ -0,0 +1,4 @@
Sphinx>=2.1.2
Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

A useful tool we could include here, to keep things synced: https://github.com/nipy/nibabel/blob/master/tools/update_requirements.py

We could update it to also write out to docs/requirements.txt.

@effigies effigies mentioned this pull request Oct 7, 2019
@effigies
Copy link
Member

Looks like you need pybids ~= 0.9.4

@oesteban
Copy link
Member

READY????

@oesteban oesteban merged commit 3fb82a9 into master Oct 11, 2019
@oesteban oesteban deleted the ci_doc_deploy branch October 11, 2019 22:46
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.

Build documentation
3 participants