Merge pull request #276 from rgaiacs/274

Make Jekyll ignore .Rproj

diff --git a/bin/boilerplate/.travis.yml b/bin/boilerplate/.travis.yml
index d7626ae0b601bf9dcd1c5140e201b1e94a86e5f4..d30f78a4fff74de828eabd1f8a055f7c1d40f44c 100644 (file)
--- a/bin/boilerplate/.travis.yml
+++ b/bin/boilerplate/.travis.yml
@@ -1,3 +1,4 @@
+# dist: trusty  # Ubuntu 14.04
 language: python
 python: 3.6
 branches:
@@ -5,10 +6,18 @@ branches:
   - gh-pages
   - /.*/
 before_install:
+  - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E084DAB9
+  - echo "deb https://cran.rstudio.com/bin/linux/ubuntu trusty/" | sudo tee -a /etc/apt/sources.list
+  - sudo apt-get update -y
+  - sudo apt-get install -y r-base
+  - sudo Rscript -e "install.packages('knitr', repos = 'https://', dependencies = TRUE)"
+  - sudo Rscript -e "install.packages('stringr', repos = 'https://cran.rstudio.com', dependencies = TRUE)"
+  - sudo Rscript -e "install.packages('checkpoint', repos = 'https://cran.rstudio.com', dependencies = TRUE)"
+  - sudo Rscript -e "install.packages('ggplot2', repos = 'https://cran.rstudio.com', dependencies = TRUE)"
   - rvm default
-  - gem install json kramdown
+  - gem install json kramdown jekyll
 install:
   - pip install pyyaml
 script:
-  - make lesson-check
   - make lesson-check-all
+  - make --always-make site

diff --git a/bin/boilerplate/_config.yml b/bin/boilerplate/_config.yml
index 25d480879947e13994bdd41ee15061cbe1654f83..1f828e907c9e634ea9d3a820065f4b94ce62e0d2 100644 (file)
--- a/bin/boilerplate/_config.yml
+++ b/bin/boilerplate/_config.yml
@@ -61,12 +61,20 @@ collections:
 # Set the default layout for things in the episodes collection.
 defaults:
   - values:
-      root: ..
+      root: .
+      layout: page
   - scope:
       path: ""
       type: episodes
     values:
+      root: ..
       layout: episode
+  - scope:
+      path: ""
+      type: extras
+    values:
+      root: ..
+      layout: page
 
 # Files and directories that are not to be copied.
 exclude:

diff --git a/bin/boilerplate/_extras/about.md b/bin/boilerplate/_extras/about.md
index b6ad26b801964b7776eec7fc3b7d538986676e4f..3008972c01c7d401bcdc5b244f2c79734876d72b 100644 (file)
--- a/bin/boilerplate/_extras/about.md
+++ b/bin/boilerplate/_extras/about.md
@@ -1,5 +1,4 @@
 ---
-layout: page
 title: About
 ---
-{% include carpentries.html %}
\ No newline at end of file
+{% include carpentries.html %}

diff --git a/bin/boilerplate/_extras/discuss.md b/bin/boilerplate/_extras/discuss.md
index 0a45a0f9be59dfa863411e5f971ac92c4cf7e424..524440acb26794f53da33b097967adce752f35de 100644 (file)
--- a/bin/boilerplate/_extras/discuss.md
+++ b/bin/boilerplate/_extras/discuss.md
@@ -1,5 +1,4 @@
 ---
-layout: page
 title: Discussion
 ---
-FIXME
\ No newline at end of file
+FIXME

diff --git a/bin/boilerplate/_extras/figures.md b/bin/boilerplate/_extras/figures.md
index fd540ed579f5bb3d52d6def5fc39f446533d4137..b807e484d61632e3b93a5f6b9a3d2120b4f46541 100644 (file)
--- a/bin/boilerplate/_extras/figures.md
+++ b/bin/boilerplate/_extras/figures.md
@@ -1,5 +1,4 @@
 ---
-layout: page
 title: Figures
 ---
 <script>
@@ -36,4 +35,4 @@ Create anchor for each one of the episodes.
 {% endcomment %}
 {% for episode in site.episodes %}
 <article id="{{ episode.url }}"></article>
-{% endfor %}
\ No newline at end of file
+{% endfor %}

diff --git a/bin/boilerplate/_extras/guide.md b/bin/boilerplate/_extras/guide.md
index 28caf722249fcb03ec3990e2786b41d28205d2e8..da9be3781a2eb337381b38d857a9cac4f7b519e6 100644 (file)
--- a/bin/boilerplate/_extras/guide.md
+++ b/bin/boilerplate/_extras/guide.md
@@ -1,5 +1,4 @@
 ---
-layout: page
 title: "Instructor Notes"
 ---
-FIXME
\ No newline at end of file
+FIXME

diff --git a/bin/boilerplate/aio.md b/bin/boilerplate/aio.md
index 172b670a5aaafb73e85afa912dbcb58556e34d01..a418f3b45ee2c3a59950a49e5f5434cbd7dada46 100644 (file)
--- a/bin/boilerplate/aio.md
+++ b/bin/boilerplate/aio.md
@@ -1,6 +1,4 @@
 ---
-layout: page
-root: .
 ---
 <script>
   window.onload = function() {
@@ -33,4 +31,4 @@ Create anchor for each one of the episodes.
 {% endcomment %}
 {% for episode in site.episodes %}
 <article id="{{ episode.url }}"></article>
-{% endfor %}
\ No newline at end of file
+{% endfor %}

diff --git a/bin/boilerplate/index.md b/bin/boilerplate/index.md
index 925b239b34edc9f4a7a9b01f096f8c6351f59732..2809a1bfe6c83c70c7785c9de9e3fe30081c1326 100644 (file)
--- a/bin/boilerplate/index.md
+++ b/bin/boilerplate/index.md
@@ -1,6 +1,6 @@
 ---
 layout: lesson
-root: .
+root: .  # Is the only page that don't follow the partner /:path/index.html
 permalink: index.html  # Is the only page that don't follow the partner /:path/index.html
 ---
 FIXME: home page introduction
@@ -8,4 +8,4 @@ FIXME: home page introduction
 > ## Prerequisites
 >
 > FIXME
-{: .prereq}
\ No newline at end of file
+{: .prereq}

diff --git a/bin/boilerplate/reference.md b/bin/boilerplate/reference.md
index 0436d06234764b5a4b8013e1231a7fc2b1d7a460..8138fe9f7719d9a8dffac2a0199a492be3c08581 100644 (file)
--- a/bin/boilerplate/reference.md
+++ b/bin/boilerplate/reference.md
@@ -1,8 +1,7 @@
 ---
 layout: reference
-root: .
 ---
 
 ## Glossary
 
-FIXME
\ No newline at end of file
+FIXME

diff --git a/bin/boilerplate/setup.md b/bin/boilerplate/setup.md
index ba8e8f59de8c07e0ab2d62ec4ef95d1bd71b012b..b5792e643caba9e58422378e29740ab2ba52a591 100644 (file)
--- a/bin/boilerplate/setup.md
+++ b/bin/boilerplate/setup.md
@@ -1,6 +1,4 @@
 ---
-layout: page
 title: Setup
-root: .
 ---
-FIXME
\ No newline at end of file
+FIXME

diff --git a/bin/util.py b/bin/util.py
index 0fe55b6305a90a2b49a5f4f40581e25c975224b3..e1a03a21084240a4f1af7e741fee58eec3ac116d 100644 (file)
--- a/bin/util.py
+++ b/bin/util.py
@@ -35,8 +35,6 @@ class Reporter:
 
     def __init__(self):
         """Constructor."""
-
-        super(Reporter, self).__init__()
         self.messages = []
 
     def check_field(self, filename, name, values, key, expected=REPORTER_NOT_SET):