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

generate docs without conversion #773

Merged
merged 21 commits into from
Nov 6, 2016
Merged

generate docs without conversion #773

merged 21 commits into from
Nov 6, 2016

Conversation

jcb91
Copy link
Member

@jcb91 jcb91 commented Oct 19, 2016

  • generate docs directly from repo markdown rather than rst converted via pypandoc
  • get nbconvert_support docs directly from (improved) docstrings
  • minor fixes to readme heading levels to fix RTD layout
  • fix some docs syntax issues remaining from md -> rst conversion
  • other minor readme tweaks

@juhasch
Copy link
Member

juhasch commented Nov 1, 2016

Very nice!
I am busy with other things currently.

Is it ready to merge ?

@jcb91
Copy link
Member Author

jcb91 commented Nov 1, 2016

not quite, it required a bit of path-wrangling to get it working on readthedocs as well as locally, and a few fixes to markdown docs to deal with limitations of commonmark (e.g. no support for tables!). I think I've mainly fixed them, but haven't merged them into this docs branch/pr yet. Will try to fix it all up now.

jcb91 added 20 commits November 1, 2016 23:25
should help RTD layout be a little more sensible
[skip CI]
Using markdown makes for easier comparison with the main README.md as well,
as mentioned in ipython-contrib#776
[skip CI]
for ease of comparison with main readme, where we're not using features of rst
- add conda-forge badge
- remove pypi downloads badges, which never get updated anyway
 * build docs through tox environment
 * build docs on travis. Travis build checks that we haven't broken docs which would get pushed to rtd
 * generate docs directly from repo markdown using recommonmark, rather than converting into new files with pandoc
 * unpin recommonmark version
 * remove redundant makefiles, rely on tox to do our docs building (we don't really reliably support anything bar html/json generation anyway)
 * remove redundant conda `docs/environment.yml`
 * fix docs version using `.bumpversion.cfg`
 * update docs readme
since commonmark (and hence recommonmark, which we use to generate our docs) doesn't support them.
since CommonMark disallows setext headings from being composed of text which would otherwise constitue a list item, see http://spec.commonmark.org/0.26/#setext-heading
primarily replacing html entities unsupported by commonmark
since commonmark doesn't do autolinking like gfm does
[skip CI]
@jcb91 jcb91 merged commit b6563a7 into ipython-contrib:master Nov 6, 2016
@jcb91 jcb91 deleted the docs branch November 6, 2016 13:13
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