Skip to content

Commit

Permalink
General tidy:
Browse files Browse the repository at this point in the history
- Add Encoding UTF-8 required by roxygen2
- Remove R CMD INSTALL output from Utilities.R that was causing problems
  for roxygen.
- Regenerate documentation.
  • Loading branch information
vobencha committed Aug 6, 2019
1 parent 540e890 commit 295bf75
Showing 5 changed files with 12 additions and 25 deletions.
5 changes: 3 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
Package: GRANBase
Type: Package
Title: Creating Continuously Integrated Package Repositories from Manifests
Version: 2.6.12
Version: 2.6.13
Encoding: UTF-8
Author: Gabriel Becker[aut,cre], Cory Barr [cre,ctb], Dinakar Kulkarni [aut,ctb]
Maintainer: Gabriel Becker <[email protected]>
Copyright: Genentech Inc
@@ -36,4 +37,4 @@ VignetteBuilder: knitr
SystemRequirements: svn, git
URL: https://github.com/gmbecker/gRAN
BugReports: https://github.com/gmbecker/gRAN/issues
RoxygenNote: 6.0.1
RoxygenNote: 6.1.1
19 changes: 2 additions & 17 deletions R/Utilities.R
Original file line number Diff line number Diff line change
@@ -120,23 +120,8 @@ install.packages2 <- function(pkgs, repos, lib, ..., param = SwitchrParam(),
tmp = readLines(fil)
## for some reason this isn't always the last line, e.g. from histry 0.2.1


## * installing *source* package ‘histry’ ...
## ** R
## ** inst
## ** preparing package for lazy loading
## Warning: replacing previous import ‘graph::addNode’ by ‘XML::addNode’ when loading ‘CodeDepends’
## Warning: replacing previous import ‘graph::plot’ by ‘graphics::plot’ when loading ‘CodeDepends’
## ** help
## *** installing help indices
## ** building package indices
## ** installing vignettes
## ** testing if installed package can be loaded
## Warning: replacing previous import ‘graph::addNode’ by ‘XML::addNode’ when loading ‘CodeDepends’
## Warning: replacing previous import ‘graph::plot’ by ‘graphics::plot’ when loading ‘CodeDepends’
## * DONE (histry)
## Loading required package: histry

## NOTE: Removed R CMD INSTALL output for histry 0.2.1 that was here.
## Asterisks in the output were causing problems for roxygen.

## outcome = tmp[length(tmp)]
donemsg = paste0("* DONE (", p, ")")
4 changes: 2 additions & 2 deletions man/buildBranchesInRepo.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions man/createMeta.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions man/makerepo.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 295bf75

Please sign in to comment.