Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: traitecoevo/plant
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.2.0
Choose a base ref
...
head repository: traitecoevo/plant
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.2.1
Choose a head ref
  • 1 commit
  • 4 files changed
  • 1 contributor

Commits on Sep 19, 2019

  1. Update build to account for upstream changes

    - update Makefile to use `pkgbuild` instead of `devtools` for building dll ( because of upstream changes )
    - switching to using `remotes` instead of `devtools` for installing from github ( because of upstream changes )
    dfalster committed Sep 19, 2019
    Copy the full SHA
    be5ce6a View commit details
Showing with 27 additions and 11 deletions.
  1. +1 −1 DESCRIPTION
  2. +4 −1 Makefile
  3. +14 −1 NEWS.md
  4. +8 −8 README.md
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: plant
Title: A package for modelling forest trait ecology and evolution
Version: 1.2.0
Version: 1.2.1
Author: Daniel Falster [aut, cre], Rich FitzJohn [aut], John Wilshire [ctb]
Authors@R: c(
person("Daniel", "Falster", , "daniel.falster@unsw.edu.au", c("aut", "cre"),
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ RSCRIPT = Rscript --no-init-file
all: compile

compile: RcppR6
Rscript -e 'devtools::compile_dll()' \
Rscript -e 'pkgbuild::compile_dll()' \
make roxygen

test:
@@ -20,6 +20,9 @@ roxygen:
@mkdir -p man
Rscript -e "library(methods); devtools::document()"

benchmark:
Rscript scripts/benchmark.R

install:
R CMD INSTALL .

15 changes: 14 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
## Plant 1.2.1 Release Notes

v1.2.1 was released on 20/09/2019

### Major Changes

### Minor Changes

- update Makefile to use `pkgbuild` instead of `devtools` for building dll ( because of upstream changes )
- switching to using `remotes` instead of `devtools` for installing from github ( because of upstream changes )

A full account of changes from the previous version is available on Github: [v1.2.0...v1.2.1](https://github.com/traitecoevo/plant/compare/v1.2.0...v1.2.1)

## Plant 1.2.0 Release Notes

v1.2.0 was released on 20/03/2018
@@ -17,7 +30,7 @@ v1.2.0 was released on 20/03/2018

A full account of changes from the previous version is available on Github: [v1.1.0...v1.2.0](https://github.com/traitecoevo/plant/compare/v1.1.0...v1.2.0)

## Plant 1.1.0 Release Notes
## Plant 1.1.0 Release Notes

v1.1.0 was released on 2/02/2018

16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -30,26 +30,26 @@ You must be using R 3.3.0 or newer. At this stage the package is not on CRAN. Yo

Installation requires a C++11 compatible C compiler (OSX >= 10.10/Yosemite satisfies this, as do standard linux Ubuntu 12.04 and 14.04). On Windows machines you will need to install [Rtools](http://cran.r-project.org/bin/windows/Rtools/). When I tried this in [Rstudio](https://www.rstudio.com/), the program [automagically](https://en.oxforddictionaries.com/definition/automagically) sensed the absence of a compiler and asked if I wanted to install Rtools. Click `Yes`!

**Option 1, using `devtools::install_github`**
**Option 1, using `remotes::install_github`**

(install `devtools` with `install.packages("devtools")`)
(install `remotes` with `install.packages("remotes")`)

The `plant` package can be installed direct from github using the [`devtools`](https://cran.r-project.org/web/packages/devtools/index.html) package. `plant` also requires the packages `loggr` and `RcppR6` packages. Install those with
The `plant` package can be installed direct from github using the [`remotes`](https://cran.r-project.org/web/packages/remotes/index.html) package. `plant` also requires the packages `loggr` and `RcppR6` packages. Install those with

```r
devtools::install_github("smbache/loggr", dependencies=TRUE)
devtools::install_github("richfitz/RcppR6", dependencies=TRUE)
remotes::install_github("smbache/loggr", dependencies=TRUE)
remotes::install_github("richfitz/RcppR6", dependencies=TRUE)
```

Then install plant:

```r
devtools::install_github("traitecoevo/plant", dependencies=TRUE)
remotes::install_github("traitecoevo/plant", dependencies=TRUE)
```

**Option 2, download and install locally**

If installing locally you will still need to install the `loggr` and `RcppR6` packages. Install using `devtools::install_github` as above, or alternatively do as follows.
If installing locally you will still need to install the `loggr` and `RcppR6` packages. Install using `remotes::install_github` as above, or alternatively do as follows.

Additionally install other dependencies from CRAN:

@@ -72,7 +72,7 @@ where `path_to_package` is the folder for each package, e.g. `~/Downloads/plant-
To install a specific (older) release, decide for the version number that you want to install in https://github.com/traitecoevo/plant/releases e.g.

```r
devtools::install_github("traitecoevo/plant", ref = "v1.0.0", dependencies=TRUE)
remotes::install_github("traitecoevo/plant", ref = "v1.0.0", dependencies=TRUE)
```

with `"v1.0.0"` replaced by the appropriate version number.