Skip to content
This repository has been archived by the owner on Jan 3, 2018. It is now read-only.

Alternative build: still using Jekyll #347

Merged
merged 25 commits into from
Mar 12, 2014
Merged

Alternative build: still using Jekyll #347

merged 25 commits into from
Mar 12, 2014

Conversation

gvwilson
Copy link
Contributor

Please move discussion to #349.

This is an alternative to #342 - it uses Jekyll for all building, but requires users to translate files in non-Markdown/non-HTML formats (such as IPython Notebooks) into Markdown to store in the cached directory for building. Still doesn't deal with in/out/err formatting of pre blocks... :-(

…ls won't have to regenerate them.

2. Modifying .gitignore to reflect this.
3. Updating the Makefile to run Jekyll exactly once.
has a weird failure: in `novice/python/02-func.md`, where the word
"Examples" appears underlined in the `loadtxt` help, some text is cut
out and we're left in <pre> for the rest of the document.
*   Indenting error output cells
*   Removing explicit 'level' keys from Markdown files
*   Storing the generated files so that people who don't use those tools won't have to regenerate them.
*   Modifying .gitignore to reflect this.
*   Updating the Makefile to run Jekyll exactly once.
*   Command to install on the server
*   No longer worrying about making a page of images
*   Better (more guessable) name for the target that builds the website
*   Fixing image paths
*   Fixing up glossary entries
@gvwilson
Copy link
Contributor Author

Please move discussion to #349.

gvwilson pushed a commit that referenced this pull request Mar 12, 2014
Alternative build: still using Jekyll
@gvwilson gvwilson merged commit a42f07f into swcarpentry:master Mar 12, 2014
@wking
Copy link
Contributor

wking commented Mar 12, 2014

On Fri, Feb 28, 2014 at 04:52:04AM -0800, Greg Wilson wrote:

  • Merge branch 'sticking-with-jekyll' of github.com:gvwilson/bc into
    sticking-with-jekyll

Before it landed in master, this PR gained a few additional commits,
including 5d29354 (Modified build to generate Markdown files for
IPython Notebooks, 2014-03-03). It also adds Markdown versions of the
IPython notebooks to version control:

A cached/novice/python/01-numpy.md (709)
A cached/novice/python/02-func.md (850)
A cached/novice/python/03-loop.md (423)
A cached/novice/python/04-cond.md (698)
A cached/novice/python/05-defensive.md (420)
A cached/novice/python/06-cmdline.md (660)

I think that's a good idea for the gh-pages branch (so Jekyll can
render them), but not for the master branch (where the *.ipynb files
are the source, and the *.md versions are build artifacts. Was this
an intentional move for master, or should I submit a PR that removes
these auto-generated files?

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants