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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

massive documentation normalization and restructuring #849

Merged
merged 4 commits into from May 3, 2017

Conversation

sosey
Copy link
Member

@sosey sosey commented Apr 30, 2017

This is a large change. The whole doc package now builds as one.

  • removed the meta package formatted
  • attempted to normalize the package structures
  • added a new template with the ST branding
  • added sphinx-automodapi for API docs in all subpackages
  • updated travis build and RTD requirements (it should build there, but I haven't tried)
  • there are still warnings from malformed docstrings in the code repositories
  • there are still warnings from sphinx doc issues like duplicate labels

Otherwise, give this a go and see if it works for people other than me 馃幈
Also, give your own package a look and see if anything is glaringly wrong or missing.
Feel free to make it prettier, but lets merge this first if everyone agrees and then do that?

@hbushouse

@sosey sosey self-assigned this Apr 30, 2017
@sosey sosey added this to the Build 7.1 milestone Apr 30, 2017
Copy link
Collaborator

@jdavies-st jdavies-st left a comment

Choose a reason for hiding this comment

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

Looks great! @sosey is our hero!

One thing I notice is that the sphinx-automodapi package mangles the ConfigObject spec attributes in the various step classes, escaping the formatting.

docs/conf.py Outdated

# The name of an image file (relative to this directory) to place at the top of
# the title page.
latex_logo = '_static/wfc_logo.png'
Copy link
Collaborator

Choose a reason for hiding this comment

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

This wfc_logo.png file doesn't exist in the repository and causes the latexpdf build to barf. The stsci_pri_combo_mark_white.png one works as a replacement, but probably a different one with black text would be better for the pdf doc.

Copy link
Member Author

Choose a reason for hiding this comment

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

doh - found a jwst logo to use instead 馃槃

@jdavies-st
Copy link
Collaborator

Should update .gitignore to include

docs/_build/
docs/api/

@sosey
Copy link
Member Author

sosey commented May 1, 2017

  • added the sphinx.napoleon extension to parse the numpy style docstrings
  • fixed some rst errors in the docs
  • added a jwst logo for the pdf generation
  • updated the gitignore

asked @mdboom if he knew of a way to render the multi-line spec strings from the code with the linebreaks, it wasn't too apparent to me how to get that done.

@sosey
Copy link
Member Author

sosey commented May 1, 2017

I added sphinx-automodapi as a pip dependency on travis, baffled as to why the doc test keeps failing

.travis.yml Outdated
CONDA_DEPENDENCIES=$CONDA_JWST_DEPENDENCIES
PIP_DEPDENDENCIES='sphinx_rtd_theme sphinx-automodapi'
Copy link
Member

Choose a reason for hiding this comment

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

@sosey There's a typo here 馃槃 -> "PIP_DEPENDENCIES"

Copy link
Member Author

Choose a reason for hiding this comment

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

馃槷 !!

.gitignore Outdated
@@ -11,5 +11,7 @@ dist/
docs/*/source/*.txt.rst
docs/fits_generator/source/templates.rst
docs/jwst_git/
docs/_build/
doc/api/
Copy link
Collaborator

Choose a reason for hiding this comment

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

Typo here. Should be docs/api/.

@sosey
Copy link
Member Author

sosey commented May 3, 2017

@hbushouse @nden I have a squash commit waiting to push before the final merge, but all the tests are passing now, would be nice to merge this today before there are more doc changes 馃槃

@hbushouse
Copy link
Collaborator

I haven't been able to build and look at the results yet, but if you think things are to the point of them building correctly in the auto environment, then I say "go for it".

Copy link
Collaborator

@hbushouse hbushouse left a comment

Choose a reason for hiding this comment

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

馃憤

Copy link
Collaborator

@nden nden left a comment

Choose a reason for hiding this comment

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

It built and looks good. Thanks!

@nden
Copy link
Collaborator

nden commented May 3, 2017

We should come up with a common style for all packages. Also let's open issues for all packages which built with warnings.

@sosey sosey merged commit 768cf32 into spacetelescope:master May 3, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants