Skip to content

Commit

Permalink
Merge pull request #96 from quist00/updatePandocMarchitecture
Browse files Browse the repository at this point in the history
Update pandoc version to 3.1.2 min required by M architecture
  • Loading branch information
tobyhodges authored Jul 26, 2024
2 parents 1d90790 + 69815f5 commit b0d918a
Show file tree
Hide file tree
Showing 51 changed files with 53 additions and 53 deletions.
2 changes: 1 addition & 1 deletion add-lesson.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if [[ ${FILE} != "empty" && ! -e "${FILE}.R" ]]; then
echo '#' >> "${FILE}.R"
echo '# library("fs")' >> "${FILE}.R"
echo '# library("xml2")' >> "${FILE}.R"
echo '# pandoc::pandoc_activate("2.19.2")' >> "${FILE}.R"
echo '# pandoc::pandoc_activate("3.1.2")' >> "${FILE}.R"
echo '# source("functions.R")' >> "${FILE}.R"
echo "# old <- '${FILE}'" >> "${FILE}.R"
echo "# new <- 'sandpaper/${FILE}'" >> "${FILE}.R"
Expand Down
2 changes: 1 addition & 1 deletion carpentries-incubator/good-enough-practices.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'carpentries-incubator/good-enough-practices'
# new <- 'sandpaper/carpentries-incubator/good-enough-practices'
Expand Down
2 changes: 1 addition & 1 deletion carpentries/instructor-training-bonus-modules.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'carpentries/instructor-training-bonus-modules'
# new <- 'sandpaper/carpentries/instructor-training-bonus-modules'
Expand Down
2 changes: 1 addition & 1 deletion datacarpentry/astronomy-python.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'datacarpentry/astronomy-python'
# new <- 'sandpaper/datacarpentry/astronomy-python'
Expand Down
2 changes: 1 addition & 1 deletion datacarpentry/cloud-genomics.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'datacarpentry/cloud-genomics'
# new <- 'sandpaper/datacarpentry/cloud-genomics'
Expand Down
2 changes: 1 addition & 1 deletion datacarpentry/ecology-workshop.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'datacarpentry/ecology-workshop'
# new <- 'sandpaper/datacarpentry/ecology-workshop'
Expand Down
2 changes: 1 addition & 1 deletion datacarpentry/genomics-r-intro.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'datacarpentry/genomics-r-intro'
# new <- 'sandpaper/datacarpentry/genomics-r-intro'
Expand Down
2 changes: 1 addition & 1 deletion datacarpentry/genomics-workshop.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'datacarpentry/genomics-workshop'
# new <- 'sandpaper/datacarpentry/genomics-workshop'
Expand Down
2 changes: 1 addition & 1 deletion datacarpentry/geospatial-workshop.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'datacarpentry/geospatial-workshop'
# new <- 'sandpaper/datacarpentry/geospatial-workshop'
Expand Down
2 changes: 1 addition & 1 deletion datacarpentry/image-processing.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'datacarpentry/image-processing'
# new <- 'sandpaper/datacarpentry/image-processing'
Expand Down
2 changes: 1 addition & 1 deletion datacarpentry/openrefine-socialsci.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'datacarpentry/openrefine-socialsci'
# new <- 'sandpaper/datacarpentry/openrefine-socialsci'
Expand Down
2 changes: 1 addition & 1 deletion datacarpentry/organization-genomics.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'datacarpentry/organization-genomics'
# new <- 'sandpaper/datacarpentry/organization-genomics'
Expand Down
2 changes: 1 addition & 1 deletion datacarpentry/organization-geospatial.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'datacarpentry/organization-geospatial'
# new <- 'sandpaper/datacarpentry/organization-geospatial'
Expand Down
2 changes: 1 addition & 1 deletion datacarpentry/python-ecology-lesson.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'datacarpentry/python-ecology-lesson'
# new <- 'sandpaper/datacarpentry/python-ecology-lesson'
Expand Down
2 changes: 1 addition & 1 deletion datacarpentry/python-socialsci.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'datacarpentry/python-socialsci'
# new <- 'sandpaper/datacarpentry/python-socialsci'
Expand Down
2 changes: 1 addition & 1 deletion datacarpentry/r-intro-geospatial.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'datacarpentry/r-intro-geospatial'
# new <- 'sandpaper/datacarpentry/r-intro-geospatial'
Expand Down
2 changes: 1 addition & 1 deletion datacarpentry/shell-genomics.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'datacarpentry/shell-genomics'
# new <- 'sandpaper/datacarpentry/shell-genomics'
Expand Down
2 changes: 1 addition & 1 deletion datacarpentry/socialsci-workshop.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'datacarpentry/socialsci-workshop'
# new <- 'sandpaper/datacarpentry/socialsci-workshop'
Expand Down
2 changes: 1 addition & 1 deletion datacarpentry/spreadsheet-ecology-lesson.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'datacarpentry/spreadsheet-ecology-lesson'
# new <- 'sandpaper/datacarpentry/spreadsheet-ecology-lesson'
Expand Down
2 changes: 1 addition & 1 deletion datacarpentry/spreadsheets-socialsci.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'datacarpentry/spreadsheets-socialsci'
# new <- 'sandpaper/datacarpentry/spreadsheets-socialsci'
Expand Down
2 changes: 1 addition & 1 deletion datacarpentry/sql-ecology-lesson.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'datacarpentry/sql-ecology-lesson'
# new <- 'sandpaper/datacarpentry/sql-ecology-lesson'
Expand Down
2 changes: 1 addition & 1 deletion datacarpentry/sql-socialsci.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'datacarpentry/sql-socialsci'
# new <- 'sandpaper/datacarpentry/sql-socialsci'
Expand Down
2 changes: 1 addition & 1 deletion datacarpentry/wrangling-genomics.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'datacarpentry/wrangling-genomics'
# new <- 'sandpaper/datacarpentry/wrangling-genomics'
Expand Down
6 changes: 3 additions & 3 deletions establish-template.R
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ file_delete(to("README.md"))
dir_delete(to(".git"))
dir_delete(to("renv/profiles/lesson-requirements/renv"))
cli::cli_alert_info("Provisioning pandoc")
if (!pandoc_is_installed("2.19.2")) {
pandoc_install("2.19.2")
if (!pandoc_is_installed("3.1.2")) {
pandoc_install("3.1.2")
}
pandoc_activate("2.19.2")
pandoc_activate("3.1.2")
for (line in pandoc_run("--version")) {
cli::cli_text(cli::col_cyan("\t{.emph {line}}"))
}
2 changes: 1 addition & 1 deletion librarycarpentry/lc-data-intro-archives.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'librarycarpentry/lc-data-intro-archives'
# new <- 'sandpaper/librarycarpentry/lc-data-intro-archives'
Expand Down
2 changes: 1 addition & 1 deletion librarycarpentry/lc-data-intro.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'librarycarpentry/lc-data-intro'
# new <- 'sandpaper/librarycarpentry/lc-data-intro'
Expand Down
2 changes: 1 addition & 1 deletion librarycarpentry/lc-dig-pres.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'librarycarpentry/lc-dig-pres'
# new <- 'sandpaper/librarycarpentry/lc-dig-pres'
Expand Down
2 changes: 1 addition & 1 deletion librarycarpentry/lc-git.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'librarycarpentry/lc-git'
# new <- 'sandpaper/librarycarpentry/lc-git'
Expand Down
2 changes: 1 addition & 1 deletion librarycarpentry/lc-marcedit.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'librarycarpentry/lc-marcedit'
# new <- 'sandpaper/librarycarpentry/lc-marcedit'
Expand Down
2 changes: 1 addition & 1 deletion librarycarpentry/lc-open-refine.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'librarycarpentry/lc-open-refine'
# new <- 'sandpaper/librarycarpentry/lc-open-refine'
Expand Down
2 changes: 1 addition & 1 deletion librarycarpentry/lc-overview.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'librarycarpentry/lc-overview'
# new <- 'sandpaper/librarycarpentry/lc-overview'
Expand Down
2 changes: 1 addition & 1 deletion librarycarpentry/lc-python-intro.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'librarycarpentry/lc-python-intro'
# new <- 'sandpaper/librarycarpentry/lc-python-intro'
Expand Down
2 changes: 1 addition & 1 deletion librarycarpentry/lc-shell.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'librarycarpentry/lc-shell'
# new <- 'sandpaper/librarycarpentry/lc-shell'
Expand Down
2 changes: 1 addition & 1 deletion librarycarpentry/lc-spreadsheets.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'librarycarpentry/lc-spreadsheets'
# new <- 'sandpaper/librarycarpentry/lc-spreadsheets'
Expand Down
2 changes: 1 addition & 1 deletion librarycarpentry/lc-sql.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'librarycarpentry/lc-sql'
# new <- 'sandpaper/librarycarpentry/lc-sql'
Expand Down
2 changes: 1 addition & 1 deletion librarycarpentry/lc-wikidata.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'librarycarpentry/lc-wikidata'
# new <- 'sandpaper/librarycarpentry/lc-wikidata'
Expand Down
2 changes: 1 addition & 1 deletion swcarpentry/git-novice-es.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'swcarpentry/git-novice-es'
# new <- 'sandpaper/swcarpentry/git-novice-es'
Expand Down
2 changes: 1 addition & 1 deletion swcarpentry/git-novice.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'swcarpentry/git-novice'
# new <- 'sandpaper/swcarpentry/git-novice'
Expand Down
2 changes: 1 addition & 1 deletion swcarpentry/hg-novice.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'swcarpentry/hg-novice'
# new <- 'sandpaper/swcarpentry/hg-novice'
Expand Down
2 changes: 1 addition & 1 deletion swcarpentry/hpc-novice.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'swcarpentry/hpc-novice'
# new <- 'sandpaper/swcarpentry/hpc-novice'
Expand Down
2 changes: 1 addition & 1 deletion swcarpentry/make-novice.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'swcarpentry/make-novice'
# new <- 'sandpaper/swcarpentry/make-novice'
Expand Down
2 changes: 1 addition & 1 deletion swcarpentry/matlab-novice-inflammation.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'swcarpentry/matlab-novice-inflammation'
# new <- 'sandpaper/swcarpentry/matlab-novice-inflammation'
Expand Down
2 changes: 1 addition & 1 deletion swcarpentry/python-novice-gapminder.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# library("fs")
# library("xml2")
# pandoc::pandoc_activate("2.19.2")
# pandoc::pandoc_activate("3.1.2")
# source("functions.R")
# old <- 'swcarpentry/python-novice-gapminder'
# new <- 'sandpaper/swcarpentry/python-novice-gapminder'
Expand Down
Loading

0 comments on commit b0d918a

Please sign in to comment.