diff --git a/.gitignore b/.gitignore index cf3b859..128437d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,7 @@ .sass-cache __pycache__ _site +.Rproj.user +.Rhistory +.RData + diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..c3b9669 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,11 @@ +--- +layout: page +title: "Contributor Code of Conduct" +--- +As contributors and maintainers of this project, +we pledge to follow the [Carpentry Code of Conduct][coc]. + +Instances of abusive, harassing, or otherwise unacceptable behavior +may be reported by following our [reporting guidelines][coc-reporting]. + +{% include links.md %} diff --git a/LICENSE.md b/LICENSE.md index 39131e4..e537827 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -71,10 +71,10 @@ CON EL SOFTWARE O EL USO U OTROS TRATOS EN EL SOFTWARE. ## Marca registrada "Software Carpentry" y "Data Carpentry" y sus respectivos logos -son marcas registradas de [NumFOCUS][numfocus]. +son marcas registradas de [Community Initiatives][ci]. [cc-por-humano]: https://creativecommons.org/licenses/by/4.0/ [cc-by-legal]: https://creativecommons.org/licenses/by/4.0/legalcode [mit-license]: https://opensource.org/licenses/mit-license.html -[numfocus]: https://numfocus.org/ +[ci]: http://communityin.org/ [osi]: https://opensource.org diff --git a/Makefile b/Makefile index df31f00..f0b73e6 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ # Settings MAKEFILES=Makefile $(wildcard *.mk) JEKYLL=jekyll +JEKYLL_VERSION=3.7.3 PARSER=bin/markdown_ast.rb DST=_site @@ -16,6 +17,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 @@ -63,7 +68,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 \ @@ -88,16 +93,16 @@ ${RMD_DST} : ${RMD_SRC} @bin/knit_lessons.sh ${RMD_SRC} ## lesson-check : validate lesson Markdown. -lesson-check : +lesson-check : lesson-fixme @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 + @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/_includes/favicons.html b/_includes/favicons.html new file mode 100644 index 0000000..4ea6742 --- /dev/null +++ b/_includes/favicons.html @@ -0,0 +1,33 @@ +{% assign favicon_url = site.baseurl | append: '/assets/favicons/' | append: site.carpentry | prepend: site.url %} + +{% if site.carpentry == 'swc' %} +{% assign carpentry = 'Software Carpentry' %} +{% elsif site.carpentry == 'dc' %} +{% assign carpentry = 'Data Carpentry' %} +{% elsif site.carpentry == 'lc' %} +{% assign carpentry = 'Library Carpentry' %} +{% elsif site.carpentry == 'cp' %} +{% assign carpentry = 'The Carpentries' %} +{% endif %} + + + + + + + + + + + + + + + + + + + + + + diff --git a/_includes/lc/intro.html b/_includes/lc/intro.html index 56aae5a..e49bac0 100644 --- a/_includes/lc/intro.html +++ b/_includes/lc/intro.html @@ -10,7 +10,6 @@

-     Library Carpentry te presenta los fundamentos de la informática y le proporciona una plataforma para un mayor aprendizaje autodirigido. Para obtener más información sobre lo que enseñamos y por qué consulte nuestro documento -      " Library Carpentry: software skills training for library professionals". + Library Carpentry te presenta los fundamentos de la informática y le proporciona una plataforma para un mayor aprendizaje autodirigido. Para obtener más información sobre lo que enseñamos y por qué consulte nuestro documento " Library Carpentry: software skills training for library professionals". -

\ No newline at end of file +

diff --git a/_includes/lesson_footer.html b/_includes/lesson_footer.html index 200068d..1d82a80 100644 --- a/_includes/lesson_footer.html +++ b/_includes/lesson_footer.html @@ -3,20 +3,28 @@ {% endcomment %} diff --git a/_includes/links.md b/_includes/links.md index 273d63e..e18ce63 100644 --- a/_includes/links.md +++ b/_includes/links.md @@ -1,12 +1,15 @@ [cc-by-human]: https://creativecommons.org/licenses/by/4.0/ [cc-by-legal]: https://creativecommons.org/licenses/by/4.0/legalcode +[ci]: http://communityin.org/ +[coc-reporting]: https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html#reporting-guidelines +[coc]: https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html [concept-maps]: https://carpentries.github.io/instructor-training/05-memory/ -[email]: mailto:lessons@software-carpentry.org [contrib-covenant]: https://contributor-covenant.org/ [contributing]: {{ site.github.repository_url }}/blob/gh-pages/CONTRIBUTING.md -[cran-checkpoint]: https://cran.r-project.org/web/packages/checkpoint/index.html -[cran-knitr]: https://cran.r-project.org/web/packages/knitr/index.html -[cran-stringr]: https://cran.r-project.org/web/packages/stringr/index.html +[cran-checkpoint]: https://cran.r-project.org/package=checkpoint +[cran-knitr]: https://cran.r-project.org/package=knitr +[cran-stringr]: https://cran.r-project.org/package=stringr +[email]: mailto:team@carpentries.org [github-importer]: https://import.github.com/ [importer]: https://github.com/new/import [jekyll-collection]: https://jekyllrb.com/docs/collections/ @@ -14,6 +17,7 @@ [jekyll-windows]: http://jekyll-windows.juthilo.com/ [jekyll]: https://jekyllrb.com/ [jupyter]: https://jupyter.org/ +[lesson-example]: https://carpentries.github.io/lesson-example/ [mit-license]: https://opensource.org/licenses/mit-license.html [morea]: https://morea-framework.github.io/ [numfocus]: https://numfocus.org/ @@ -22,15 +26,12 @@ [paper-now]: https://github.com/PeerJ/paper-now [python-gapminder]: https://swcarpentry.github.io/python-novice-gapminder/ [pyyaml]: https://pypi.python.org/pypi/PyYAML -[r-markdown]: http://rmarkdown.rstudio.com/ +[r-markdown]: https://rmarkdown.rstudio.com/ [rstudio]: https://www.rstudio.com/ [ruby-install-guide]: https://www.ruby-lang.org/en/downloads/ [ruby-installer]: https://rubyinstaller.org/ [rubygems]: https://rubygems.org/pages/download/ -[styles]: https://github.com/swcarpentry/styles/ -[training]: https://swcarpentry.github.io/instructor-training/ +[styles]: https://github.com/carpentries/styles/ +[swc-releases]: https://github.com/swcarpentry/swc-releases [workshop-repo]: {{ site.workshop_repo }} [yaml]: http://yaml.org/ -[coc]: https://software-carpentry.org/conduct/ -[coc-reporting]: https://software-carpentry.org/CoC-reporting/ -[lesson-example]: https://swcarpentry.github.io/lesson-example/ diff --git a/_includes/navbar.html b/_includes/navbar.html index e1f8acf..d7de8e9 100644 --- a/_includes/navbar.html +++ b/_includes/navbar.html @@ -11,18 +11,23 @@ + {% comment %} Seleccione qué logotipo mostrar. {% endcomment %} {% if page.carpentry == "swc" %} - {% elsif page.carpentry == "dc" %} + {% elsif site.carpentry == "dc" %} - {% elsif page.carpentry == "lc" %} + {% elsif site.carpentry == "lc" %} - + + + {% elsif site.carpentry == "cp" %} + + {% endif %} @@ -34,7 +39,7 @@