From 5075147ff97138372bbdc07e63c470f0eed3cb7e Mon Sep 17 00:00:00 2001 From: Andrie de Vries Date: Mon, 15 Jan 2018 17:40:40 +0530 Subject: [PATCH] Bump version to 0.2.11 --- DESCRIPTION | 6 +++--- NEWS | 9 +++++++-- vignettes/miniCRAN-introduction.R | 2 +- vignettes/miniCRAN-introduction.html | 6 +++--- vignettes/miniCRAN-non-CRAN-repos.R | 12 ++++++------ vignettes/miniCRAN-non-CRAN-repos.html | 6 +++--- 6 files changed, 23 insertions(+), 18 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 412d473..cb35d08 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,9 +1,11 @@ Package: miniCRAN +Date: 2018-01-15 +Version: 0.2.11 Authors@R: c(person("Microsoft Corporation", role="cph"), person("Andrie", "de Vries", role=c("aut", "cre", "cph"), email="apdevries@gmail.com"), person("Alex", "Chubaty", role="ctb", email="alex.chubaty@gmail.com")) License: GPL-2 -Copyright: Microsoft Corporation +Copyright: Microsoft Corporation, Andrie de Vries Title: Create a Mini Version of CRAN Containing Only Selected Packages Description: Makes it possible to create an internally consistent repository consisting of selected packages from CRAN-like repositories. @@ -12,8 +14,6 @@ Description: Makes it possible to create an internally consistent subset. The user can then install packages from this repository directly, rather than from CRAN. This is useful in production settings, e.g. server behind a firewall, or remote locations with slow (or zero) Internet access. -Date: 2017-12-27 -Version: 0.2.11.9000 URL: https://github.com/andrie/miniCRAN BugReports: https://github.com/andrie/miniCRAN/issues SystemRequirements: Imports the `curl` and `XML` packages. These have system diff --git a/NEWS b/NEWS index ee43d11..4304518 100644 --- a/NEWS +++ b/NEWS @@ -1,9 +1,14 @@ -miniCRAN v0.2.11.9000 (Release date: in development) +miniCRAN v0.2.11 (Release date: in development) ================ New features: -* Used `pkgdown` to build documentation site +* None + +Other changes: + +* Use `pkgdown` to build documentation site +* Speed up unit testing by mocking internal functions miniCRAN v0.2.10.9000 diff --git a/vignettes/miniCRAN-introduction.R b/vignettes/miniCRAN-introduction.R index 1a7a05d..5aa9e32 100644 --- a/vignettes/miniCRAN-introduction.R +++ b/vignettes/miniCRAN-introduction.R @@ -15,7 +15,7 @@ pkgList # dir.create(pth <- file.path(tempdir(), "miniCRAN")) # # # Make repo for source and win.binary -# makeRepo(pkgList, path=pth, repos=revolution, type=c("source", "win.binary")) +# makeRepo(pkgList, path = pth, repos = revolution, type = c("source", "win.binary")) ## ----make-repo-3, eval=FALSE--------------------------------------------- # # List all files in miniCRAN diff --git a/vignettes/miniCRAN-introduction.html b/vignettes/miniCRAN-introduction.html index 9f1f9cf..bdf9e6d 100644 --- a/vignettes/miniCRAN-introduction.html +++ b/vignettes/miniCRAN-introduction.html @@ -12,7 +12,7 @@ - + Using miniCRAN to create a local CRAN repository @@ -70,7 +70,7 @@

Using miniCRAN to create a local CRAN repository

Andrie de Vries and Alex Chubaty

-

December 26, 2017

+

January 15, 2018

@@ -93,7 +93,7 @@

December 26, 2017

dir.create(pth <- file.path(tempdir(), "miniCRAN")) # Make repo for source and win.binary -makeRepo(pkgList, path=pth, repos=revolution, type=c("source", "win.binary")) +makeRepo(pkgList, path = pth, repos = revolution, type = c("source", "win.binary"))

Investigate the repository file structure:

# List all files in miniCRAN
 list.files(pth, recursive = TRUE, full.names = FALSE)
diff --git a/vignettes/miniCRAN-non-CRAN-repos.R b/vignettes/miniCRAN-non-CRAN-repos.R index 890db35..ff158b6 100644 --- a/vignettes/miniCRAN-non-CRAN-repos.R +++ b/vignettes/miniCRAN-non-CRAN-repos.R @@ -1,12 +1,12 @@ ## ----setup--------------------------------------------------------------- # Wrapper around available.packages --------------------------------------- - + index <- function(url, type = "source", filters = NULL, head = 5, cols = c("Package", "Version")) { contribUrl <- contrib.url(url, type = type) p <- available.packages(contribUrl, type = type, filters = filters) p[1:head, cols] } - + ## ----CRAN, eval=FALSE---------------------------------------------------- # CRAN <- "http://cran.r-project.org" @@ -15,7 +15,7 @@ index <- function(url, type = "source", filters = NULL, head = 5, cols = c("Pack ## ----revo, eval=FALSE---------------------------------------------------- # revoStable <- "http://packages.revolutionanalytics.com/cran/3.1/stable" # index(revoStable) -# +# # revoMirror <- "http://cran.revolutionanalytics.com" # index(revoMirror) @@ -30,10 +30,10 @@ index <- function(url, type = "source", filters = NULL, head = 5, cols = c("Pack # evalq(source("http://bioconductor.org/biocLite.R", local = TRUE), env) # biocinstallRepos() # }) -# +# # bioc # bioc[grep("BioC", names(bioc))] -# -# +# +# # index(bioc["BioCsoft"]) diff --git a/vignettes/miniCRAN-non-CRAN-repos.html b/vignettes/miniCRAN-non-CRAN-repos.html index 5d595d6..437ffed 100644 --- a/vignettes/miniCRAN-non-CRAN-repos.html +++ b/vignettes/miniCRAN-non-CRAN-repos.html @@ -12,7 +12,7 @@ - + Using repositories other than CRAN with miniCRAN @@ -70,7 +70,7 @@

Using repositories other than CRAN with miniCRAN

Andrie de Vries

-

December 26, 2017

+

January 15, 2018

@@ -79,7 +79,7 @@

December 26, 2017

To simplify the code to show the salient features, we use a little helper function, index() that is a simple wrapper around available.packages():

# Wrapper around available.packages ---------------------------------------
  
-index <- function(url, type = "source", filters = NULL, head = 5, cols = c("Package", "Version")){
+index <- function(url, type = "source", filters = NULL, head = 5, cols = c("Package", "Version")) {
   contribUrl <- contrib.url(url, type = type)
   p <- available.packages(contribUrl, type = type, filters = filters)
   p[1:head, cols]