Merge pull request #278 from maxim-belkin/fix264

Run lesson-fixme from within lesson-check

diff --git a/.gitignore b/.gitignore
index cf3b859e9a74035ba5f583a71418db2bff78b389..8b84b8e6a397550df92dbf785ddb519bb5beef6e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 .sass-cache
 __pycache__
 _site
+.Rproj.user

diff --git a/Makefile b/Makefile
index bf5d12ba20b3adc0bf22190bb3f43da5965c487f..e42e5bfdecead2be9e8544891641aa86651701c4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -93,11 +93,11 @@ lesson-check : lesson-fixme
 
 ## lesson-check-all : validate lesson Markdown, checking line lengths and trailing whitespace.
 lesson-check-all :
-       @bin/lesson_check.py -s . -p ${PARSER} -l -w --permissive
+       @bin/lesson_check.py -s . -p ${PARSER} -r _includes/links.md -l -w --permissive
 
 ## unittest         : run unit tests on checking tools.
 unittest :
-       python bin/test_lesson_check.py
+       @bin/test_lesson_check.py
 
 ## lesson-files     : show expected names of generated files for debugging.
 lesson-files :

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 82eb08e2dfd872a19f439bc83a07bcc9168b34f4..1f828e907c9e634ea9d3a820065f4b94ce62e0d2 100644 (file)
--- a/bin/boilerplate/_config.yml
+++ b/bin/boilerplate/_config.yml
@@ -79,7 +79,8 @@ defaults:
 # Files and directories that are not to be copied.
 exclude:
   - Makefile
-  - bin
+  - bin/
+  - .Rproj.user/
 
 # Turn on built-in syntax highlighting.
 highlighter: rouge

diff --git a/bin/lesson_check.py b/bin/lesson_check.py
index 5d8b9ddc7cadd7a8afd4100b4d3ca6da8ada20d9..616885e6113dd0bd91a8cbc662587deace5b7664 100755 (executable)
--- a/bin/lesson_check.py
+++ b/bin/lesson_check.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """
 Check lesson files and their contents.

diff --git a/bin/lesson_initialize.py b/bin/lesson_initialize.py
index 80cdebd750d2d88ac53decb4ed42932e641efd01..a5eb6d05c63df3ba1d757b00b920241db3907b30 100755 (executable)
--- a/bin/lesson_initialize.py
+++ b/bin/lesson_initialize.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """Initialize a newly-created repository."""
 

diff --git a/bin/repo_check.py b/bin/repo_check.py
index 770ccbb8a4917937fddaa54a7c9115ecb0989f09..af4b78235a7ce9e24ff69f8b3c5245410c063524 100755 (executable)
--- a/bin/repo_check.py
+++ b/bin/repo_check.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """
 Check repository settings.

diff --git a/bin/test_lesson_check.py b/bin/test_lesson_check.py
index 10048b1e8b78e92f522a00bb9260d2a47824564f..960059e8d6b0090c7ac8748ded69626fb4a9aefa 100755 (executable)
--- a/bin/test_lesson_check.py
+++ b/bin/test_lesson_check.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 import unittest
 
 import lesson_check

diff --git a/bin/util.py b/bin/util.py
index e1a03a21084240a4f1af7e741fee58eec3ac116d..522f5dfc6a00ff07cbcf64bb4c744745c47b02b5 100644 (file)
--- a/bin/util.py
+++ b/bin/util.py
@@ -1,4 +1,3 @@
-
 import sys
 import os
 import json

diff --git a/bin/workshop_check.py b/bin/workshop_check.py
index 67c086aa0bf4554e534941910fb1fa4041d08e0a..bd15210a93e844530b502d4867cac00f593d7897 100755 (executable)
--- a/bin/workshop_check.py
+++ b/bin/workshop_check.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 '''Check that a workshop's index.html metadata is valid.  See the
 docstrings on the checking functions for a summary of the checks.