Merge pull request #379 from maxim-belkin/lesson-links

links.md: lesson-specific links

diff --git a/_includes/links.md b/_includes/links.md
index 63cf6be9bc06b43be324d630ffe339c1c6e2a144..2e4b67a8988f858ce4d426f07563ae84eb979ef5 100644 (file)
--- a/_includes/links.md
+++ b/_includes/links.md
@@ -18,6 +18,7 @@
 [jekyll-windows]: http://jekyll-windows.juthilo.com/
 [jekyll]: https://jekyllrb.com/
 [jupyter]: https://jupyter.org/
+[kramdown]: https://kramdown.gettalong.org/
 [lc-lessons]: https://librarycarpentry.org/lessons/
 [lesson-aio]: {{ relative_root_path }}{% link aio.md %}
 [lesson-coc]: {{ relative_root_path }}{% link CODE_OF_CONDUCT.md %}
@@ -42,5 +43,6 @@
 [styles]: https://github.com/carpentries/styles/
 [swc-lessons]: https://software-carpentry.org/lessons/
 [swc-releases]: https://github.com/swcarpentry/swc-releases
+[training]: https://carpentries.github.io/instructor-training/
 [workshop-repo]: {{ site.workshop_repo }}
 [yaml]: http://yaml.org/

diff --git a/_layouts/workshop.html b/_layouts/workshop.html
index cf57cdf4963c526c7b546fe8bbf2d4b938dc1fd2..2d28a6f692354ae13e90dda425a1c33efc5b175d 100644 (file)
--- a/_layouts/workshop.html
+++ b/_layouts/workshop.html
@@ -20,6 +20,7 @@
     <meta name="instructor" content="{{page.instructor|join:'|'}}" />
     <meta name="helper" content="{{page.helper|join:'|'}}" />
     <meta name="contact" content="{{page.email}}" />
+    <meta name="carpentry" content="{{site.carpentry}}"
     {% if page.redirect %}
     <meta http-equiv="refresh" content="0; url={{page.redirect}}" />
     {% endif %}

diff --git a/bin/boilerplate/.travis.yml b/bin/boilerplate/.travis.yml
index d30f78a4fff74de828eabd1f8a055f7c1d40f44c..de304acaf4ba584a279007ec6529e41329f92c5a 100644 (file)
--- a/bin/boilerplate/.travis.yml
+++ b/bin/boilerplate/.travis.yml
@@ -1,6 +1,6 @@
 # dist: trusty  # Ubuntu 14.04
 language: python
-python: 3.6
+python: 3.7
 branches:
   only:
   - gh-pages

diff --git a/bin/boilerplate/CONTRIBUTING.md b/bin/boilerplate/CONTRIBUTING.md
index 96e815828a701d008c2551b510c0b15c22f8b02a..7925ceff47aedfa779858c88ed9f751329741061 100644 (file)
--- a/bin/boilerplate/CONTRIBUTING.md
+++ b/bin/boilerplate/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Contributing
 
-[The Carpentries][c-site]([Software Carpentry][swc-site], [Data Carpentry][dc-site], and [Library Carpentry][lc-site]) are open source projects,
+[The Carpentries][c-site] ([Software Carpentry][swc-site], [Data Carpentry][dc-site], and [Library Carpentry][lc-site]) are open source projects,
 and we welcome contributions of all kinds:
 new lessons,
 fixes to existing material,
@@ -14,7 +14,7 @@ you agree that we may redistribute your work under [our license](LICENSE.md).
 In exchange,
 we will address your issues and/or assess your change proposal as promptly as we can,
 and help you become a member of our community.
-Everyone involved in [The Carpentries][c-site]([Software Carpentry][swc-site], [Data Carpentry][dc-site], and [Library Carpentry][lc-site]) 
+Everyone involved in [The Carpentries][c-site]
 agrees to abide by our [code of conduct](CODE_OF_CONDUCT.md).
 
 ## How to Contribute
@@ -149,4 +149,3 @@ You can also [reach us by email][email].
 [c-site]: https://carpentries.org/
 [lc-site]: https://librarycarpentry.org/
 [lc-issues]: https://github.com/issues?q=user%3Alibrarycarpentry
-

diff --git a/bin/knit_lessons.sh b/bin/knit_lessons.sh
index 194f12421a6d1fd64a7ee2b367bbcf776953da05..141c136adce04042732d19eb416bc915e57e2717 100755 (executable)
--- a/bin/knit_lessons.sh
+++ b/bin/knit_lessons.sh
@@ -3,6 +3,6 @@
 # Only try running R to translate files if there are some files present.
 # The Makefile passes in the names of files.
 
-if [ $# -ne 0 ] ; then
+if [ $# -eq 2 ] ; then
     Rscript -e "source('bin/generate_md_episodes.R')" "$@"
 fi

diff --git a/bin/lesson_check.py b/bin/lesson_check.py
index 84c28f37c5300fea1e065f1be06196b60cc4db7f..78d78b2dfbf5f013da7ed074379f0a5d83ca5f86 100755 (executable)
--- a/bin/lesson_check.py
+++ b/bin/lesson_check.py
@@ -35,6 +35,7 @@ REQUIRED_FILES = {
     '%/README.md': False,
     '%/_extras/discuss.md': True,
     '%/_extras/guide.md': True,
+    '%/_config.yml': True,
     '%/index.md': True,
     '%/reference.md': True,
     '%/setup.md': True,