Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
achubaty committed Nov 15, 2017
2 parents 90e6f95 + f1f7d4d commit 8ab83b4
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 19 deletions.
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ 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-10-20
Date: 2017-10-21
Version: 0.2.10
URL: https://github.com/RevolutionAnalytics/miniCRAN
BugReports: https://github.com/RevolutionAnalytics/miniCRAN/issues
URL: https://github.com/andrie/miniCRAN
BugReports: https://github.com/andrie/miniCRAN/issues
SystemRequirements: Imports the `curl` and `XML` packages. These have system
requirements on `libxml2-devel`, `libcurl-devel` and `openssl-devel`.
Imports:
Expand Down
5 changes: 4 additions & 1 deletion NEWS
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
miniCRAN v0.2.10
miniCRAN v0.2.10 (Release date: 2017-10-21)
================

New features:
Expand All @@ -11,6 +11,9 @@ Other improvements:
* Fixed typos in vignettes (@ryanatanner PR#93 and PR#94)
* Added note on system requirements of curl and XML (#98)

Changed maintainer to [email protected] #103


miniCRAN v0.2.9 (Release date: 2017-07-20)
===============

Expand Down
4 changes: 2 additions & 2 deletions R/minicran-package.R
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@
#' @name miniCRAN-package
#' @aliases miniCRAN minicran
#' @docType package
#' @author Andrie de Vries \email{adevries@@microsoft.com} with contributions from Alex Chubaty \email{alex.chubaty@@gmail.com}
#' @author Andrie de Vries \email{apdevries@@gmail.com} with contributions from Alex Chubaty \email{alex.chubaty@@gmail.com}
#' @keywords package
#' @importFrom graphics legend par title
#' @importFrom graphics legend par title
#' @importFrom stats reshape setNames
#' @importFrom utils chooseCRANmirror compareVersion download.file flush.console installed.packages select.list
NULL
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
miniCRAN
========

[![Build Status](https://travis-ci.org/RevolutionAnalytics/miniCRAN.svg?branch=master)](https://travis-ci.org/RevolutionAnalytics/miniCRAN)
[![Build Status](https://travis-ci.org/RevolutionAnalytics/miniCRAN.svg?branch=dev)](https://travis-ci.org/RevolutionAnalytics/miniCRAN)
[![Build Status](https://travis-ci.org/andrie/miniCRAN.svg?branch=master)](https://travis-ci.org/andrie/miniCRAN)
[![Build Status](https://travis-ci.org/andrie/miniCRAN.svg?branch=dev)](https://travis-ci.org/andrie/miniCRAN)
[![](http://www.r-pkg.org/badges/version/miniCRAN)](http://www.r-pkg.org/pkg/miniCRAN)
[![CRAN RStudio mirror downloads](http://cranlogs.r-pkg.org/badges/miniCRAN)](http://www.r-pkg.org/pkg/miniCRAN)
[![Coverage Status](https://img.shields.io/codecov/c/github/RevolutionAnalytics/miniCRAN/master.svg)](https://codecov.io/github/RevolutionAnalytics/miniCRAN?branch=master)
[![Coverage Status](https://img.shields.io/codecov/c/github/andrie/miniCRAN/master.svg)](https://codecov.io/github/andrie/miniCRAN?branch=master)

Create a mini version of CRAN containing only selected packages

Expand Down Expand Up @@ -38,7 +38,7 @@ Get the latest stable development version from github:
```r
# Use `devtools` to install directly from github
library(devtools)
install_github("RevolutionAnalytics/miniCRAN")
install_github("andrie/miniCRAN")
```

### System requirements
Expand Down Expand Up @@ -68,6 +68,6 @@ pkgs <- c("ggplot2", "plyr", "reshape2")
makeRepo(pkgDep(pkgs), path=file.path(tempdir(), "miniCRAN"), download=TRUE)
```

## Code of conduct
## Supported by Microsoft

This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
I started this project while employed by Revolution Analytics and Microsoft. Microsoft has kindly agreed that I maintain the project individually, and retains copyright to all work on the project until October 2017.
4 changes: 2 additions & 2 deletions inst/doc/miniCRAN-dependency-graph.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<meta name="author" content="Andrie de Vries" />

<meta name="date" content="2017-10-20" />
<meta name="date" content="2017-10-21" />

<title>Using miniCRAN to identify package dependencies</title>

Expand Down Expand Up @@ -289,7 +289,7 @@

<h1 class="title toc-ignore">Using miniCRAN to identify package dependencies</h1>
<h4 class="author"><em>Andrie de Vries</em></h4>
<h4 class="date"><em>October 20, 2017</em></h4>
<h4 class="date"><em>October 21, 2017</em></h4>

</div>

Expand Down
4 changes: 2 additions & 2 deletions inst/doc/miniCRAN-introduction.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<meta name="author" content="Andrie de Vries and Alex Chubaty" />

<meta name="date" content="2017-10-20" />
<meta name="date" content="2017-10-21" />

<title>Using miniCRAN to create a local CRAN repository</title>

Expand Down Expand Up @@ -289,7 +289,7 @@

<h1 class="title toc-ignore">Using miniCRAN to create a local CRAN repository</h1>
<h4 class="author"><em>Andrie de Vries and Alex Chubaty</em></h4>
<h4 class="date"><em>October 20, 2017</em></h4>
<h4 class="date"><em>October 21, 2017</em></h4>

</div>

Expand Down
4 changes: 2 additions & 2 deletions inst/doc/miniCRAN-non-CRAN-repos.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<meta name="author" content="Andrie de Vries" />

<meta name="date" content="2017-10-20" />
<meta name="date" content="2017-10-21" />

<title>Using repositories other than CRAN with miniCRAN</title>

Expand Down Expand Up @@ -289,7 +289,7 @@

<h1 class="title toc-ignore">Using repositories other than CRAN with miniCRAN</h1>
<h4 class="author"><em>Andrie de Vries</em></h4>
<h4 class="date"><em>October 20, 2017</em></h4>
<h4 class="date"><em>October 21, 2017</em></h4>

</div>

Expand Down
2 changes: 1 addition & 1 deletion man/miniCRAN-package.Rd

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

0 comments on commit 8ab83b4

Please sign in to comment.