Commit df68ee4c authored by Greg Wilson's avatar Greg Wilson
Browse files

Merge branch 'gh-pages' of github.com:swcarpentry/styles into gh-pages

parents 27015c43 5f116cdd

bin/extract_figures.py

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ import glob 
from optparse import OptionParser



from util import Reporter, read_markdown, IMAGE_FILE_SUFFIX



from __future__ import print_function



def main():

    """Main driver."""

bin/generate_md_episodes.R

+18 −5
Original line number Diff line number Diff line 
generate_md_episodes <- function() {



    if (require("knitr")) {

        if (packageVersion("knitr") < '1.9.19') {

    if (require("knitr") && packageVersion("knitr") < '1.9.19')

        stop("knitr must be version 1.9.20 or higher")

        }

    } else stop("knitr 1.9.20 or above is needed to build the lessons.")



    if (!require("stringr"))

        stop("The package stringr is required for generating the lessons.")



    if (require("checkpoint")) {

        required_pkgs <-

            checkpoint:::projectScanPackages(project = "_episodes_rmd",

                                             verbose=FALSE, use.knitr = TRUE)$pkgs

    } else {

        stop("The checkpoint package is required to build the lessons.")

    }



    missing_pkgs <- required_pkgs[!(required_pkgs %in% rownames(installed.packages()))]



    if (length(missing_pkgs)) {

        message("Installing missing required packages: ",

                paste(missing_pkgs, collapse=", "))

        install.packages(missing_pkgs)

    }



    ## find all the Rmd files, and generates the paths for their respective outputs

    src_rmd <- list.files(pattern = "??-*.Rmd$", path = "_episodes_rmd", full.names = TRUE)

    dest_md <- file.path("_episodes", gsub("Rmd$", "md", basename(src_rmd)))

bin/lesson_initialize.py

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


import sys

import os



from __future__ import print_function



ROOT_AUTHORS = '''\

FIXME: list authors' names and email addresses.

bin/repo_check.py

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ import re 
from optparse import OptionParser



from util import Reporter, load_yaml, require

from __future__ import print_function



# Import this way to produce a more useful error message.

try:

bin/util.py

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ import sys 
import os

import json

from subprocess import Popen, PIPE

from __future__ import print_function



# Import this way to produce a more useful error message.

try: