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

Creating a lesson on syndicating web data #513

Merged
merged 28 commits into from
Oct 1, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
bd3c40f
* Touch up readme info graphics
kreuvf Mar 23, 2014
8743254
* Update repo cloning graphics to reflect changes in SVG file; optipn…
kreuvf Mar 23, 2014
86c1d4f
* Fix newline problems in repo cloning graphics SVG
kreuvf Mar 23, 2014
c3a7f69
Merge pull request #388 from stevenkoenig/fix-readme-info-gfx
Mar 25, 2014
5367015
Add link to older installers for Git for OS X
ethanwhite Apr 7, 2014
f90179b
Merging work done on master branch since November 2013 tag
gvwilson Apr 25, 2014
aeb37fb
Merge pull request #460 from gvwilson/gh-pages
Apr 25, 2014
3e8b265
The filename `aux` was reserved in the days of DOS, and that proscrip…
gvwilson Apr 27, 2014
f6ab445
Merge pull request #465 from gvwilson/gh-pages
Apr 27, 2014
11eb963
Relocating first episode of lecture on web data syndication
gvwilson May 26, 2014
ea94a53
Putting files and directories in alphabetical order
gvwilson May 29, 2014
5768759
New lesson on producing and syndicating data
gvwilson May 29, 2014
68f908e
Putting file/directory names in alphabetical order
gvwilson May 29, 2014
bf02dc0
Starting to work on the HTML portion of the lesson
gvwilson Jun 2, 2014
3572ad3
* Simplified Makefile and added documentation.
gvwilson Jun 6, 2014
1fefc1e
Merge pull request #530 from gvwilson/gh-pages
Jun 7, 2014
8b2c9c6
* Add small changes to README.md
kreuvf Jun 15, 2014
8b7e434
* Add clarifications to CONTRIBUTING.md
kreuvf Jun 15, 2014
4170062
* Remove superfluous newline
kreuvf Jun 15, 2014
800a86e
* Remove superfluous <br />s
kreuvf Jun 17, 2014
3bac198
Merge pull request #543 from stevenkoenig/readme-and-contributing-cha…
Jun 18, 2014
84e7a2e
Added novice reference page on recognising shell, Python and editors …
Jun 20, 2014
14f90b0
Merge pull request #551 from mikej888/prompts
Jun 20, 2014
f97c0e7
Update to reflect correct jekyll arg order
naupaka Sep 10, 2014
2b9974c
Merge pull request #706 from naupaka/gh-pages
Sep 10, 2014
99a4c11
Merging from master
Sep 30, 2014
db94d3b
Merge branch 'master' of github.com:swcarpentry/bc into gh-pages
Oct 1, 2014
7d92cf0
Pulling in latest changes in gh-pages
Oct 1, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 55 additions & 37 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ and then open an issue of your own to get feedback on your ideas and coordinate

* [Topic Maintainers](#topic-maintainers)
* [Working With GitHub](#working-with-github)
* [Locations](#locations)
* [Formats](#formats)
* [Previewing](#previewing)
* [Locations and Formats](#locations-and-formats)
* [Sample Files](#sample-files)
* [Labels](#labels)
* [FAQ](#faq)
Expand Down Expand Up @@ -55,6 +56,15 @@ the topic name links to that repository.
Working With GitHub
-------------------

In general, we are using Git and GitHub for almost everything.
But if it is easier for you to send your contributions to us some other way,
please mail us at
[admin@software-carpentry.org](mailto:admin@software-carpentry.org).
Given a choice between you creating content or wrestling with Git,
we'd rather have you doing the former.

The GitHub workflow looks like this:

1. Fork the `swcarpentry/bc` repository on GitHub.

2. Clone that repository to your own machine.
Expand All @@ -74,6 +84,45 @@ please mail us at
Given a choice between you creating content or wrestling with Git,
we'd rather have you doing the former.

Locations
---------

Every subject has a sub-directory of its own,
while individual topics are files in that directory.
For example,
the `novice/git` directory holding our introduction to Git for newcomers
contains the files
`00-intro.md`,
`01-backup.md`,
and so on.
(We use two digits followed by a one-word topic key
to ensure files appear in the right order when listed.)

Formats
-------

We are using [Jekyll](https://en.wikipedia.org/wiki/Jekyll_%28software%29)
to convert lessons in [Markdown](https://en.wikipedia.org/wiki/Markdown)
to [HTML](https://en.wikipedia.org/wiki/HTML).
Therefore, we require every lesson to be available in Markdown.
But this does not mean that you have to write it in Markdown as well.

The following list contains more detailed instructions for different formats:

* Markdown: Nothing to do.
* IPython Notebook: Generate and provide a Markdown version in addition
to the IPython Notebook.
Look at our existing files to get an idea how the IPython Notebook
should look like.
* Other formats: Generate and provide a Markdown version in addition
to the file in the original format.
In order to be able to recreate the Markdown from source,
include the conversion from this other format to Markdown
in the `Makefile` as well. This ensures that people who *aren't* familiar
with some format don't have to install the tools needed to work with it
(e.g., R programmers don't have to install the IPython Notebook).
**Please check with us if you plan to do this.**

Previewing
----------

Expand All @@ -82,7 +131,6 @@ run the command `make site`.
This runs Jekyll with the same flags that GitHub uses when things are committed to the `gh-pages` branch
and puts the results in a directory called `_site`.


You should also run `make check` before pushing changes to your `index.html` home page
to your repository.
If you don't have Make installed,
Expand All @@ -109,40 +157,6 @@ and ensure that the main Makefile only does what Jekyll on GitHub will do.
To re-do conversion of notebooks to Markdown files,
use `make ipynb`.

Locations and Formats
---------------------

Every subject has a sub-directory of its own,
while individual topics are files in that directory.
For example,
the `novice/git` directory holding our introduction to Git for newcomers
contains the files
`00-intro.md`,
`01-backup.md`,
and so on.
(We use two digits followed by a one-word topic key
to ensure files appear in the right order when listed.)

Lessons may be written in Markdown,
as IPython Notebooks,
or in other formats.
However,
as explained in [the README file](README.md),
Jekyll (the tool GitHub uses to create websites)
only knows how to handle Markdown and HTML.
if some other format is used,
the author of the lesson must
add the generated Markdown to the repository.
This ensures that people who *aren't* familiar with some format
don't have to install the tools needed to work with it
(e.g.,
R programmers don't have to install the IPython Notebook).

> If a lesson is in a format we don't already handle,
> the author must also add something to the Makefile
> to re-create the Markdown from the source.
> Please check with us if you plan to do this.

Sample Files
------------

Expand Down Expand Up @@ -188,11 +202,15 @@ FAQ
---

* *Where can I get help?*
<br/>
Mail us at [admin@software-carpentry.org](mailto:admin@software-carpentry.org),
come chat with us on [our IRC channel](irc://moznet/sciencelab),
or join our [discussion list](http://software-carpentry.org/pages/discuss.html)
and ask for help there.

* *Is there a list of open issues to tackle?*
The [open issues for the bc repository](https://github.com/swcarpentry/bc/issues)
and also the [related projects](http://www.software-carpentry.org/pages/create.html#related)
listed on the create page are a good starting point.

[windows-installer]: https://github.com/swcarpentry/windows-installer
[installation-test]: http://git.tremily.us/?p=swc-setup-installation-test.git
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ ALL_SRC = \
$(wildcard intermediate/regex/*.md) \
$(wildcard intermediate/python/*.md) \
$(wildcard intermediate/doit/*.md) \
$(wildcard intermediate/webdata/*.md) \
$(wildcard slides/*.html) \
$(MOST_SRC)

Expand Down
28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ and so on.

**Table of Contents**

* [Background](#background)
* [Getting Started](#getting-started)
* [Previewing the Site](#previewing-the-site)
* [Variables](#variables)
* [Website Content](#website-content)
* [Lesson Material](#lesson-material)
* [Building Things](#building-things)
* [Site Map](#site-map)
* [Background](#background)
* [Getting Started](#getting-started)
* [Previewing the Site](#previewing-the-site)
* [Variables](#variables)
* [Website Content](#website-content)
* [Lesson Material](#lesson-material)
* [Building Things](#building-things)
* [Site Map](#site-map)
* [FAQ](#faq)

Background
Expand Down Expand Up @@ -108,15 +108,15 @@ rather than Git itself.

then GitHub doesn't just copy the file over verbatim.
Instead,
it runs the file through a translator called Jekyll
it runs the file through a translator called [Jekyll](https://en.wikipedia.org/wiki/Jekyll_%28software%29)
that looks for specially-formatted commands embedded in the file.

6. Commands can be embedded in the body of a page.
One is {% raw %}{% include something.html %}{% endraw %},
which tells Jekyll to copy the contents of `something.html` into the file being translated;
this is used to create standard headers and footers for pages.
Another is `{{variable}}`:
when Jekyll see this,
when Jekyll sees this,
it replaces it with the value of `variable`.
This is used to insert things like a contact email address and the URL for our Twitter account.

Expand Down Expand Up @@ -403,7 +403,7 @@ Lesson Material
in directories under `intermediate`.
3. Our old lesson material
is in the `lessons` directory.
We plan to retire it in Spring 2014,
We plan to retire it in Spring 2014.

As explained [below](#building-things),
you can use `make` to compile this material in the way that GitHub does
Expand Down Expand Up @@ -455,7 +455,7 @@ The most important files and directories are **highlighted**.
* _layouts/ - Jekyll page layouts.
* **_site/** - output directory (created when building the site locally).
* _templates/ - template files for conversion of IPython Notebooks to Markdown.
Templates for other conversion systems (e.g., Pandoc) should go here too.
Templates for other conversion systems (e.g., Pandoc) should go here, too.
* bib.md - bibliography.
* bin/ - miscellaneous tools used in building the site.
* book.md - generated when compiling the website locally.
Expand Down Expand Up @@ -535,7 +535,7 @@ FAQ
Uninstall pygments.rb 0.5.1 or 0.5.2, install 0.5.0. For example, here's how you would
uninstall pygments 0.5.2 and restore version 0.5.0:

~~~
~~~
$ gem uninstall pygments.rb --version "=0.5.2"
$ gem install pygments.rb --version "=0.5.0"
~~~
Expand All @@ -544,7 +544,7 @@ FAQ
<br/>
The output of `make check` looks like this:

~~~
~~~
WARNING: Unrecognized alias: 'output', it will probably have no effect.[TerminalIPythonApp] File not found: u'nbconvert'
cp tmp/python/novice/01-numpy.html _site/python/novice/01-numpy.html
cp: cannot stat ‘tmp/python/novice/01-numpy.html’: No such file or directory
Expand Down
Loading