Silenced output of PYTHON calls

[rnaseq-cwl-training.git] / Makefile

diff --git a/Makefile b/Makefile
index df31f00cfc7ad62b0afc849061a287392998f06c..89a310569e0ba9c0b31a7acf4088d5edd8bbb34e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,10 @@
 # Settings
 MAKEFILES=Makefile $(wildcard *.mk)
 JEKYLL=jekyll
+JEKYLL_VERSION=3.8.5
 PARSER=bin/markdown_ast.rb
 DST=_site
+PYTHON=python3
 
 # Controls
 .PHONY : commands clean files
@@ -16,6 +18,10 @@ all : commands
 commands :
        @grep -h -E '^##' ${MAKEFILES} | sed -e 's/## //g'
 
+## docker-serve     : use docker to build the site
+docker-serve :
+       docker run --rm -it -v ${PWD}:/srv/jekyll -p 127.0.0.1:4000:4000 jekyll/jekyll:${JEKYLL_VERSION} make serve
+
 ## serve            : run a local server.
 serve : lesson-md
        ${JEKYLL} serve
@@ -38,7 +44,7 @@ clean :
        @find . -name '*.pyc' -exec rm {} \;
 
 ## clean-rmd        : clean intermediate R files (that need to be committed to the repo).
-clear-rmd :
+clean-rmd :
        @rm -rf ${RMD_DST}
        @rm -rf fig/rmd-*
 
@@ -49,7 +55,7 @@ clear-rmd :
 
 ## workshop-check   : check workshop homepage.
 workshop-check :
-       @bin/workshop_check.py .
+       @${PYTHON} bin/workshop_check.py .
 
 ## ----------------------------------------
 ## Commands specific to lesson websites.
@@ -63,7 +69,7 @@ RMD_DST = $(patsubst _episodes_rmd/%.Rmd,_episodes/%.md,$(RMD_SRC))
 # Lesson source files in the order they appear in the navigation menu.
 MARKDOWN_SRC = \
   index.md \
-  CONDUCT.md \
+  CODE_OF_CONDUCT.md \
   setup.md \
   $(sort $(wildcard _episodes/*.md)) \
   reference.md \
@@ -83,21 +89,20 @@ HTML_DST = \
 ## lesson-md        : convert Rmarkdown files to markdown
 lesson-md : ${RMD_DST}
 
-# Use of .NOTPARALLEL makes rule execute only once
-${RMD_DST} : ${RMD_SRC}
-       @bin/knit_lessons.sh ${RMD_SRC}
+_episodes/%.md: _episodes_rmd/%.Rmd
+       @bin/knit_lessons.sh $< $@
 
 ## lesson-check     : validate lesson Markdown.
-lesson-check :
-       @bin/lesson_check.py -s . -p ${PARSER} -r _includes/links.md
+lesson-check : lesson-fixme
+       @${PYTHON} bin/lesson_check.py -s . -p ${PARSER} -r _includes/links.md
 
 ## lesson-check-all : validate lesson Markdown, checking line lengths and trailing whitespace.
 lesson-check-all :
-       @bin/lesson_check.py -s . -p ${PARSER} -l -w
+       @${PYTHON} 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
+       @${PYTHON} bin/test_lesson_check.py
 
 ## lesson-files     : show expected names of generated files for debugging.
 lesson-files :