Merging updates to lesson template

gvwilson · gvwilson · commit 4de5ac3f6560 · 2015-11-21T07:42:00.000Z
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1,5 @@
+Andy Boughton <abought@gmail.com> <pchemist@gmail.com>
+Greg Wilson <gvwilson@software-carpentry.org> <gvwilson@third-bit.com>
+Abigail Cabunoc <abigail.cabunoc@oicr.on.ca> <abigail.cabunoc@gmail.com>
+Francois Michonneau <francois.michonneau@gmail.com> <francois.michonneau@gmail.Com>
+Raniere Silva <raniere@ime.unicamp.br> <ra092767@ime.unicamp.br>
diff --git a/.nojekyll b/.nojekyll
diff --git a/.update-copyright.conf b/.update-copyright.conf
@@ -0,0 +1,6 @@
+[project]
+vcs: Git
+
+[files]
+authors: yes
+files: no
diff --git a/01-basics.html b/01-basics.html
@@ -26,9 +26,9 @@
       <article>
       <div class="row">
         <div class="col-md-10 col-md-offset-1">
-          <h1 class="title">Testing</h1>
+                    <a href="index.html"><h1 class="title">Testing</h1></a>
           <h2 class="subtitle">Basics of testing</h2>
-<section class="objectives panel panel-warning">
+          <section class="objectives panel panel-warning">
 <div class="panel-heading">
 <h2><span class="glyphicon glyphicon-certificate"></span>Learning Objectives</h2>
 </div>
@@ -77,7 +77,7 @@ <h2>Key Points</h2>
       </article>
       <div class="footer">
         <a class="label swc-blue-bg" href="http://software-carpentry.org">Software Carpentry</a>
-        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/git-novice">Source</a>
+        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/lesson-template">Source</a>
         <a class="label swc-blue-bg" href="mailto:admin@software-carpentry.org">Contact</a>
         <a class="label swc-blue-bg" href="LICENSE.html">License</a>
       </div>
diff --git a/02-assertions.html b/02-assertions.html
@@ -26,9 +26,9 @@
       <article>
       <div class="row">
         <div class="col-md-10 col-md-offset-1">
-          <h1 class="title">Testing</h1>
+                    <a href="index.html"><h1 class="title">Testing</h1></a>
           <h2 class="subtitle">Assertions</h2>
-<section class="objectives panel panel-warning">
+          <section class="objectives panel panel-warning">
 <div class="panel-heading">
 <h2><span class="glyphicon glyphicon-certificate"></span>Learning Objectives</h2>
 </div>
@@ -113,7 +113,7 @@ <h2>Key Points</h2>
       </article>
       <div class="footer">
         <a class="label swc-blue-bg" href="http://software-carpentry.org">Software Carpentry</a>
-        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/git-novice">Source</a>
+        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/lesson-template">Source</a>
         <a class="label swc-blue-bg" href="mailto:admin@software-carpentry.org">Contact</a>
         <a class="label swc-blue-bg" href="LICENSE.html">License</a>
       </div>
diff --git a/03-exceptions.html b/03-exceptions.html
@@ -26,9 +26,9 @@
       <article>
       <div class="row">
         <div class="col-md-10 col-md-offset-1">
-          <h1 class="title">Testing</h1>
+                    <a href="index.html"><h1 class="title">Testing</h1></a>
           <h2 class="subtitle">Exceptions</h2>
-<section class="objectives panel panel-warning">
+          <section class="objectives panel panel-warning">
 <div class="panel-heading">
 <h2><span class="glyphicon glyphicon-certificate"></span>Learning Objectives</h2>
 </div>
@@ -104,7 +104,7 @@ <h2>Key Points</h2>
       </article>
       <div class="footer">
         <a class="label swc-blue-bg" href="http://software-carpentry.org">Software Carpentry</a>
-        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/git-novice">Source</a>
+        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/lesson-template">Source</a>
         <a class="label swc-blue-bg" href="mailto:admin@software-carpentry.org">Contact</a>
         <a class="label swc-blue-bg" href="LICENSE.html">License</a>
       </div>
diff --git a/04-units.html b/04-units.html
@@ -26,9 +26,9 @@
       <article>
       <div class="row">
         <div class="col-md-10 col-md-offset-1">
-          <h1 class="title">Testing</h1>
+                    <a href="index.html"><h1 class="title">Testing</h1></a>
           <h2 class="subtitle">Unit Tests</h2>
-<section class="objectives panel panel-warning">
+          <section class="objectives panel panel-warning">
 <div class="panel-heading">
 <h2><span class="glyphicon glyphicon-certificate"></span>Learning Objectives</h2>
 </div>
@@ -127,7 +127,7 @@ <h2>Key Points</h2>
       </article>
       <div class="footer">
         <a class="label swc-blue-bg" href="http://software-carpentry.org">Software Carpentry</a>
-        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/git-novice">Source</a>
+        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/lesson-template">Source</a>
         <a class="label swc-blue-bg" href="mailto:admin@software-carpentry.org">Contact</a>
         <a class="label swc-blue-bg" href="LICENSE.html">License</a>
       </div>
diff --git a/05-nose.html b/05-nose.html
@@ -26,9 +26,9 @@
       <article>
       <div class="row">
         <div class="col-md-10 col-md-offset-1">
-          <h1 class="title">Testing</h1>
+                    <a href="index.html"><h1 class="title">Testing</h1></a>
           <h2 class="subtitle">Running Tests with Nose</h2>
-<section class="objectives panel panel-warning">
+          <section class="objectives panel panel-warning">
 <div class="panel-heading">
 <h2><span class="glyphicon glyphicon-certificate"></span>Learning Objectives</h2>
 </div>
@@ -126,7 +126,7 @@ <h2>Key Points</h2>
       </article>
       <div class="footer">
         <a class="label swc-blue-bg" href="http://software-carpentry.org">Software Carpentry</a>
-        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/git-novice">Source</a>
+        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/lesson-template">Source</a>
         <a class="label swc-blue-bg" href="mailto:admin@software-carpentry.org">Contact</a>
         <a class="label swc-blue-bg" href="LICENSE.html">License</a>
       </div>
diff --git a/06-edges.html b/06-edges.html
@@ -26,9 +26,9 @@
       <article>
       <div class="row">
         <div class="col-md-10 col-md-offset-1">
-          <h1 class="title">Testing</h1>
+                    <a href="index.html"><h1 class="title">Testing</h1></a>
           <h2 class="subtitle">Edge and Corner Cases</h2>
-<section class="objectives panel panel-warning">
+          <section class="objectives panel panel-warning">
 <div class="panel-heading">
 <h2><span class="glyphicon glyphicon-certificate"></span>Learning Objectives</h2>
 </div>
@@ -158,7 +158,7 @@ <h2>Key Points</h2>
       </article>
       <div class="footer">
         <a class="label swc-blue-bg" href="http://software-carpentry.org">Software Carpentry</a>
-        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/git-novice">Source</a>
+        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/lesson-template">Source</a>
         <a class="label swc-blue-bg" href="mailto:admin@software-carpentry.org">Contact</a>
         <a class="label swc-blue-bg" href="LICENSE.html">License</a>
       </div>
diff --git a/07-integration.html b/07-integration.html
@@ -26,9 +26,9 @@
       <article>
       <div class="row">
         <div class="col-md-10 col-md-offset-1">
-          <h1 class="title">Testing</h1>
+                    <a href="index.html"><h1 class="title">Testing</h1></a>
           <h2 class="subtitle">Integration and Regression Tests</h2>
-<section class="objectives panel panel-warning">
+          <section class="objectives panel panel-warning">
 <div class="panel-heading">
 <h2><span class="glyphicon glyphicon-certificate"></span>Learning Objectives</h2>
 </div>
@@ -101,7 +101,7 @@ <h2>Key Points</h2>
       </article>
       <div class="footer">
         <a class="label swc-blue-bg" href="http://software-carpentry.org">Software Carpentry</a>
-        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/git-novice">Source</a>
+        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/lesson-template">Source</a>
         <a class="label swc-blue-bg" href="mailto:admin@software-carpentry.org">Contact</a>
         <a class="label swc-blue-bg" href="LICENSE.html">License</a>
       </div>
diff --git a/08-ci.html b/08-ci.html
@@ -26,9 +26,9 @@
       <article>
       <div class="row">
         <div class="col-md-10 col-md-offset-1">
-          <h1 class="title">Testing</h1>
+                    <a href="index.html"><h1 class="title">Testing</h1></a>
           <h2 class="subtitle">Continuous Integration</h2>
-<section class="objectives panel panel-warning">
+          <section class="objectives panel panel-warning">
 <div class="panel-heading">
 <h2><span class="glyphicon glyphicon-certificate"></span>Learning Objectives</h2>
 </div>
@@ -160,7 +160,7 @@ <h2>Key Points</h2>
       </article>
       <div class="footer">
         <a class="label swc-blue-bg" href="http://software-carpentry.org">Software Carpentry</a>
-        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/git-novice">Source</a>
+        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/lesson-template">Source</a>
         <a class="label swc-blue-bg" href="mailto:admin@software-carpentry.org">Contact</a>
         <a class="label swc-blue-bg" href="LICENSE.html">License</a>
       </div>
diff --git a/09-tdd.html b/09-tdd.html
@@ -26,9 +26,9 @@
       <article>
       <div class="row">
         <div class="col-md-10 col-md-offset-1">
-          <h1 class="title">Testing</h1>
+                    <a href="index.html"><h1 class="title">Testing</h1></a>
           <h2 class="subtitle">Test Driven Development</h2>
-<section class="objectives panel panel-warning">
+          <section class="objectives panel panel-warning">
 <div class="panel-heading">
 <h2><span class="glyphicon glyphicon-certificate"></span>Learning Objectives</h2>
 </div>
@@ -156,7 +156,7 @@ <h2>Key Points</h2>
       </article>
       <div class="footer">
         <a class="label swc-blue-bg" href="http://software-carpentry.org">Software Carpentry</a>
-        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/git-novice">Source</a>
+        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/lesson-template">Source</a>
         <a class="label swc-blue-bg" href="mailto:admin@software-carpentry.org">Contact</a>
         <a class="label swc-blue-bg" href="LICENSE.html">License</a>
       </div>
diff --git a/10-fixtures.html b/10-fixtures.html
@@ -26,9 +26,9 @@
       <article>
       <div class="row">
         <div class="col-md-10 col-md-offset-1">
-          <h1 class="title">Testing</h1>
+                    <a href="index.html"><h1 class="title">Testing</h1></a>
           <h2 class="subtitle">Fixtures</h2>
-<section class="objectives panel panel-warning">
+          <section class="objectives panel panel-warning">
 <div class="panel-heading">
 <h2><span class="glyphicon glyphicon-certificate"></span>Learning Objectives</h2>
 </div>
@@ -93,7 +93,7 @@ <h2>Key Points</h2>
       </article>
       <div class="footer">
         <a class="label swc-blue-bg" href="http://software-carpentry.org">Software Carpentry</a>
-        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/git-novice">Source</a>
+        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/lesson-template">Source</a>
         <a class="label swc-blue-bg" href="mailto:admin@software-carpentry.org">Contact</a>
         <a class="label swc-blue-bg" href="LICENSE.html">License</a>
       </div>
diff --git a/AUTHORS b/AUTHORS
@@ -1,54 +1,2 @@
-git-novice was written by:
-Aaron O'Leary <aaron.oleary@gmail.com>
-Abigail Cabunoc <abigail.cabunoc@oicr.on.ca>
-Amy Brown <amyrhoda@gmail.com>
-Andy Boughton <abought@gmail.com>
-Aron Ahmadia <aron@ahmadia.net>
-Belinda Weaver <b.weaver@uq.edu.au>
-BernhardKonrad <bernhard.konrad@gmail.com>
-Bill Mills <mills.wj@gmail.com>
-Brenna <info@brennaobrien.com>
-Christian Jacobs <c.jacobs10@imperial.ac.uk>
-Daisie Huang <daisieh@gmail.com>
-Daniel Chen <Maveri2k@yahoo.com>
-David Jones <dave@dkjones.org>
-David LeBauer <dlebauer@gmail.com>
-David Rio Deiros <driodeiros@gmail.com>
-Doug Latornell <djl@douglatornell.ca>
-Ethan White <ethan@weecology.org>
-Francois Michonneau <francois.michonneau@gmail.com>
-Greg Wilson <gvwilson@software-carpentry.org>
-Hilmar Lapp <hlapp@drycafe.net>
-Ivan Gonzalez <iglpdc@gmail.com>
-James Allen <jamesallen0108@gmail.com>
-John Blischak <jdblischak@gmail.com>
-Jon Borrelli <borrejj@gmail.com>
-Jon Pipitone <jon.pipitone@utoronto.ca>
-Kate <kl167@le.ac.uk>
-Konrad Förstner <konrad@foerstner.org>
-Konrad Hinsen <konrad.hinsen@fastmail.net>
-Luke W Johnston <lwjohnst@gmail.com>
-Matt Davis <jiffyclub@gmail.com>
-Michael Hansen <hansen.mike@gmail.com>
-Natalie <n.robinson@colorado.edu>
-Nicholas Hannah <nicholash@users.noreply.github.com>
-Pauline Barmby <pbarmby@uwo.ca>
-Pete Bachant <petebachant@gmail.com>
-Peter Steinbach <steinbach@scionics.de>
-Piotr Banaszkiewicz <piotr@banaszkiewicz.org>
-Raniere Silva <raniere@ime.unicamp.br>
-Ruth Collings <contact@ruthcollings.ca>
-Rémi Emonet <remi.emonet@reverse--com.heeere>
-Stefan Pfenninger <stefan@pfenninger.org>
-Thomas Kluyver <takowl@gmail.com>
-Timothy Rice <t.rice@ms.unimelb.edu.au>
-Timothée Poisot <tim@poisotlab.io>
-Trevor Bekolay <tbekolay@gmail.com>
-W. Trevor King <wking@tremily.us>
-Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
-arohl <a.rohl@curtin.edu.au>
-daisie_local <daisieh@gmail.com>
-dtrap <dtrapezoid@gmail.com>
-efarsarakis <farsarakis@epcc.ed.ac.uk>
-janepipistrelle <janepipistrelle@gmail.com>
-ttimbers <tiffany.timbers@gmail.com>
+python-testing was written by:
+Katy Huff <katyhuff@gmail.com>
diff --git a/LICENSE.html b/LICENSE.html
@@ -26,9 +26,8 @@
       <article>
       <div class="row">
         <div class="col-md-10 col-md-offset-1">
-          <h1 class="title">Licenses</h1>
-          
-<h2 id="instructional-material">Instructional Material</h2>
+                    <h1 class="title">Licenses</h1>
+          <h2 id="instructional-material">Instructional Material</h2>
 <p>All Software Carpentry instructional material is made available under the <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution license</a>. The following is a human-readable summary of (and not a substitute for) the <a href="https://creativecommons.org/licenses/by/4.0/legalcode">full legal text of the CC BY 4.0 license</a>.</p>
 <p>You are free:</p>
 <ul>
@@ -59,7 +58,7 @@ <h2 id="trademark">Trademark</h2>
       </article>
       <div class="footer">
         <a class="label swc-blue-bg" href="http://software-carpentry.org">Software Carpentry</a>
-        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/git-novice">Source</a>
+        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/lesson-template">Source</a>
         <a class="label swc-blue-bg" href="mailto:admin@software-carpentry.org">Contact</a>
         <a class="label swc-blue-bg" href="LICENSE.html">License</a>
       </div>
diff --git a/Makefile b/Makefile
@@ -44,13 +44,6 @@ clean :
 ## preview  : Build website locally for checking.
 preview : $(DST_ALL)
 
-# Pattern for slides (different parameters and template).
-motivation.html : motivation.md _layouts/slides.revealjs Makefile
-	${PANDOC} -s -t revealjs --slide-level 2 \
-	    ${PANDOC_FLAGS} \
-	    --template=_layouts/slides \
-	    -o $@ $<
-
 # Pattern to build a generic page.
 %.html : %.md _layouts/page.html $(FILTERS)
 	${PANDOC} -s -t html \
@@ -62,7 +55,8 @@ motivation.html : motivation.md _layouts/slides.revealjs Makefile
 	    -o $@ $<
 
 # Pattern to convert R Markdown to Markdown.
-%.md: %.Rmd $(R_CHUNK_OPTS)
+%.md: %.Rmd $(R_CHUNK_OPTS) tools/check_knitr_version.R
+	Rscript -e "source('tools/check_knitr_version.R')"
 	Rscript -e "knitr::knit('$$(basename $<)', output = '$$(basename $@)')"
 
 ## commands : Display available commands.
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,6 +1,6 @@
 <div class="footer">
   <a class="label swc-blue-bg" href="http://software-carpentry.org">Software Carpentry</a>
-  <a class="label swc-blue-bg" href="https://github.com/swcarpentry/git-novice">Source</a>
+  <a class="label swc-blue-bg" href="https://github.com/swcarpentry/lesson-template">Source</a>
   <a class="label swc-blue-bg" href="mailto:admin@software-carpentry.org">Contact</a>
   <a class="label swc-blue-bg" href="LICENSE.html">License</a>
 </div>
diff --git a/_layouts/page.html b/_layouts/page.html
@@ -12,8 +12,12 @@
       <article>
       <div class="row">
         <div class="col-md-10 col-md-offset-1">
+          $if(subtitle)$
+          <a href="index.html"><h1 class="title">$title$</h1></a>
+          <h2 class="subtitle">$subtitle$</h2>
+          $else$
           <h1 class="title">$title$</h1>
-          $if(subtitle)$<h2 class="subtitle">$subtitle$</h2>$endif$
+          $endif$
 $body$
         </div>
       </div>
diff --git a/discussion.html b/discussion.html
@@ -26,16 +26,16 @@
       <article>
       <div class="row">
         <div class="col-md-10 col-md-offset-1">
-          <h1 class="title">Testing</h1>
+                    <a href="index.html"><h1 class="title">Testing</h1></a>
           <h2 class="subtitle">Discussion</h2>
-<h2 id="frequently-asked-questions">Frequently Asked Questions</h2>
+          <h2 id="frequently-asked-questions">Frequently Asked Questions</h2>
 <p>?</p>
         </div>
       </div>
       </article>
       <div class="footer">
         <a class="label swc-blue-bg" href="http://software-carpentry.org">Software Carpentry</a>
-        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/git-novice">Source</a>
+        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/lesson-template">Source</a>
         <a class="label swc-blue-bg" href="mailto:admin@software-carpentry.org">Contact</a>
         <a class="label swc-blue-bg" href="LICENSE.html">License</a>
       </div>
diff --git a/index.html b/index.html
@@ -26,9 +26,8 @@
       <article>
       <div class="row">
         <div class="col-md-10 col-md-offset-1">
-          <h1 class="title">Testing</h1>
-          
-<section class="prereq panel panel-warning">
+                    <h1 class="title">Testing</h1>
+          <section class="prereq panel panel-warning">
 <div class="panel-heading">
 <h2><span class="glyphicon glyphicon-education"></span>Prerequisites</h2>
 </div>
@@ -105,7 +104,7 @@ <h2 id="other-resources">Other Resources</h2>
       </article>
       <div class="footer">
         <a class="label swc-blue-bg" href="http://software-carpentry.org">Software Carpentry</a>
-        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/git-novice">Source</a>
+        <a class="label swc-blue-bg" href="https://github.com/swcarpentry/lesson-template">Source</a>
         <a class="label swc-blue-bg" href="mailto:admin@software-carpentry.org">Contact</a>
         <a class="label swc-blue-bg" href="LICENSE.html">License</a>
       </div>
diff --git a/instructors.html b/instructors.html
diff --git a/reference.html b/reference.html
diff --git a/tools/check.py b/tools/check.py
diff --git a/tools/check_knitr_version.R b/tools/check_knitr_version.R
diff --git a/tools/chunk-options.R b/tools/chunk-options.R
diff --git a/tools/test_check.py b/tools/test_check.py

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +Andy Boughton <[email protected]> <[email protected]>
 +Greg Wilson <[email protected]> <[email protected]>
 +Abigail Cabunoc <[email protected]> <[email protected]>
 +Francois Michonneau <[email protected]> <[email protected]>
 +Raniere Silva <[email protected]> <[email protected]>