Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minimal changes to produce passing travis build #142

Merged
merged 27 commits into from Jun 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
4060dd9
Merge pull request #1 from hadley/master
djnavarro Jun 14, 2019
a17919a
Fixes the method dispatch error for "select" using conflict rules rat…
djnavarro Jun 14, 2019
a46a7bd
Named arguments to handle API changes to scales package
djnavarro Jun 14, 2019
c487d62
Add an explicit conflict rule for tidyr::extract
djnavarro Jun 14, 2019
34e7324
Use tools::file_path_sans_ext instead of (now removed) internal funct…
djnavarro Jun 14, 2019
29f39e3
Fixes the issue with deprecated pandoc argument (from https://github.…
djnavarro Jun 14, 2019
e460fbd
Name suffix argument to scales::unit_format
djnavarro Jun 14, 2019
76a2f8a
Use new palette names from wesanderson package
djnavarro Jun 14, 2019
d770285
USAboundaries now returns an sf object
djnavarro Jun 14, 2019
352856b
remove output files that were previously committed
djnavarro Jun 14, 2019
56f0a5a
dummy commit to trigger travis build
djnavarro Jun 14, 2019
89e7db7
add conflicted and sf to dependencies
djnavarro Jun 14, 2019
531c04f
dependency on conflicted package requires libudunits2
djnavarro Jun 14, 2019
aec7b65
sf package depends on rgdal
djnavarro Jun 14, 2019
60565be
Added dependency on mapproj
djnavarro Jun 14, 2019
ee7c8d1
install the USA boundaries data package from github remote
djnavarro Jun 14, 2019
aa166c0
additional sf dependencies in travis
djnavarro Jun 14, 2019
fe2e49e
add ubuntugis to sources for travis build
djnavarro Jun 14, 2019
6962c84
added comma. sigh
djnavarro Jun 14, 2019
76297b6
specify ropensci package repository to find USAboundariesData
djnavarro Jun 14, 2019
5ce260b
specify USAboundariesData as a dependency
djnavarro Jun 14, 2019
6524b49
added sp as a dependency
djnavarro Jun 14, 2019
276dc1b
tidy whitespace
djnavarro Jun 14, 2019
9b0c355
Insert definitions for commands used by newer versions of pandoc
djnavarro Jun 14, 2019
48562e7
remove accidental commits
djnavarro Jun 14, 2019
cedcd60
suppress warning message from coord_trans about NaN values
djnavarro Jun 14, 2019
78e71ec
remove spurious log file
djnavarro Jun 14, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions .travis.yml
Expand Up @@ -3,10 +3,20 @@ cache:
packages: true
directories: ["book/tex", "_figures", "_cache"]

repos:
CRAN: https://cloud.r-project.org
ropensci: http://packages.ropensci.org

addons:
apt:
sources:
- sourceline: 'ppa:ubuntugis/ppa'
packages:
- optipng
- libudunits2-dev
- libgdal-dev
- libgeos-dev
- libproj-dev

before_script:
- tlmgr install index
Expand Down
5 changes: 5 additions & 0 deletions DESCRIPTION
Expand Up @@ -8,6 +8,7 @@ URL: https://github.com/hadley/ggplot2-book
Imports:
babynames,
broom,
conflicted,
devtools,
directlabels,
dplyr,
Expand All @@ -19,14 +20,18 @@ Imports:
Lahman,
lubridate,
magrittr,
mapproj,
maps,
nlme,
plyr,
readr,
rmarkdown,
rvest,
sf,
sp,
tidyr,
USAboundaries,
USAboundariesData,
wesanderson,
xtable
SystemRequirements: pandoc (>= 1.12.3) - http://johnmacfarlane.net/pandoc
Expand Down
3 changes: 3 additions & 0 deletions book/ggplot2-book.tex
Expand Up @@ -29,6 +29,9 @@
\newcommand{\FunctionTok}[1]{\textcolor[rgb]{0.02,0.16,0.49}{{#1}}}
\newcommand{\ErrorTok} [1]{\textcolor[rgb]{1.00,0.00,0.00}{{#1}}}
\newcommand{\NormalTok} [1]{{#1}}

\newcommand{\OperatorTok} [1]{{#1}}
\newcommand{\ControlFlowTok} [1]{{#1}}
%
\usepackage{longtable}
\usepackage{booktabs}
Expand Down
19 changes: 17 additions & 2 deletions book/render-tex.R
@@ -1,14 +1,29 @@
library("methods") # avoids weird broom error
library("rmarkdown")

tex_chapter <- function (chapter = NULL, latex_engine = c("xelatex", "pdflatex",
"lualatex"), code_width = 65) {
options(digits = 3)
set.seed(1014)
latex_engine <- match.arg(latex_engine)
rmarkdown::output_format(rmarkdown::knitr_options("html", chapter),
rmarkdown::pandoc_options(to = "latex",
from = "markdown_style",
ext = ".tex",
args = c("--top-level-division=chapter",
rmarkdown::pandoc_latex_engine_args(latex_engine))
),
clean_supporting = FALSE)
}

path <- commandArgs(trailingOnly = TRUE)
# command line args should contain just one chapter name
if (length(path) == 0) {
message("No input supplied")
} else {
base <- oldbookdown::tex_chapter()
base <- tex_chapter()
base$knitr$opts_knit$width <- 67
base$pandoc$from <- "markdown"

rmarkdown::render(path, base, output_dir = "book/tex", envir = globalenv(), quiet = TRUE)
}
}