Merge branch 'development' for release 0.2.1

Conflicts:
	README.md

.Rbuildignore

@@ -3,3 +3,4 @@
 .travis.yml
 cran-comments.md
 LICENSE
+^revdep$

.travis.yml

@@ -2,9 +2,12 @@ language: r
 
 sudo: required
 
+cran: http://cran.rstudio.com/
+
 apt_packages:
   - curl
   - latex-xcolor
+  - libcurl4-openssl-dev
 
 r_github_packages:
   - jimhester/covr

DESCRIPTION

@@ -2,10 +2,10 @@ Package: fpCompare
 Type: Package
 Title: Reliable Comparison of Floating Point Numbers
 URL: https://github.com/PredictiveEcology/fpCompare
-Version: 0.2.0
-Date: 2015-05-15
+Version: 0.2.1
+Date: 2015-09-01
 Authors@R: c(
-    person(c("Alex", "M"), "Chubaty", email="achubaty@NRCan.gc.ca",
+    person(c("Alex", "M"), "Chubaty", email="alexander.chubaty@canada.ca",
     role=c("aut", "cre")),
     person("Her Majesty the Queen in Right of Canada, as represented by the Minister of Natural Resources Canada",
     role="cph")
@@ -22,6 +22,7 @@ Depends:
     R (>= 3.1.2)
 Suggests:
     knitr,
+    rmarkdown,
     testthat
 License: GPL-3
 VignetteBuilder: knitr

NEWS

@@ -1,5 +1,11 @@
 Known issues: https://github.com/PredictiveEcology/fpCompare/issues
 
+version 0.2.1
+=============
+* update maintainer's email address
+* use HTTPS for CRAN urls
+* improved vignette formatting (use `rmarkdown::render`)
+
 version 0.2.0
 =============
 * add `%<<%` and `%>>%` operators ('less than'; 'greater than')

README.md

@@ -1,4 +1,4 @@
-**Master Branch:** [![Build Status](https://travis-ci.org/PredictiveEcology/fpCompare.svg?branch=master)](https://travis-ci.org/PredictiveEcology/fpCompare) [![Coverage Status](https://coveralls.io/repos/PredictiveEcology/fpCompare/badge.svg?branch=master)](https://coveralls.io/r/PredictiveEcology/fpCompare?branch=master) [![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/fpCompare)](http://cran.r-project.org/web/packages/fpCompare) [![Downloads](http://cranlogs.r-pkg.org/badges/grand-total/fpCompare)](http://cran.rstudio.com/package=fpCompare)
+**Master Branch:** [![Build Status](https://travis-ci.org/PredictiveEcology/fpCompare.svg?branch=master)](https://travis-ci.org/PredictiveEcology/fpCompare) [![Coverage Status](https://coveralls.io/repos/PredictiveEcology/fpCompare/badge.svg?branch=master)](https://coveralls.io/r/PredictiveEcology/fpCompare?branch=master) [![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/fpCompare)](https://cran.rstudio.com/package=fpCompare) [![Downloads](http://cranlogs.r-pkg.org/badges/grand-total/fpCompare)](https://cran.rstudio.com/package=fpCompare)
 
 **Development Branch:** [![Build Status](https://travis-ci.org/PredictiveEcology/fpCompare.svg?branch=development)](https://travis-ci.org/PredictiveEcology/fpCompare) [![Coverage Status](https://coveralls.io/repos/PredictiveEcology/fpCompare/badge.svg?branch=development)](https://coveralls.io/r/PredictiveEcology/fpCompare?branch=development)
 

cran-comments.md

@@ -1,40 +1,47 @@
-## Resubmission
+## Maintenance release
 
-This is a resubmission. In this version I have:
+In this version I have:
 
-* added `%<<%` and `%>>%` operators ('less than'; 'greater than')
-* move `cph` to end of the author field so `aut` displays as first name on CRAN
-* fix bug report url in documentation
-* improved documentation and formatting
+* updated the maintainer's email address
+* switched to using `rmarkdown::render` for vignettes
 
 ## Test environments
 
 ### Previous R versions
-* Debian Wheezy           (local), R 3.1.2
 * Windows 7               (local), R 3.1.2
 * Windows 7               (local), R 3.1.3
+* Windows 7               (local), R 3.2.0
+* Windows 7               (local), R 3.2.1
 
 ### Current R versions
-* OS X Yosemite           (local), R 3.2.0
-* Ubuntu 12.04        (travis-ci), R 3.2.0
-* Windows 7               (local), R 3.2.0
-* Windows           (win-builder), R 3.2.0
+* OS X Yosemite           (local), R 3.2.2
+* Ubuntu 12.04        (travis-ci), R 3.2.2
+* Windows 7               (local), R 3.2.2
+* Windows           (win-builder), R 3.2.2
 
 ### Development R version
-* Debian:testing (rocker/r-devel), R 3.3.0 (2015-03-31 r68131)
-* Windows           (win-builder), R 3.3.0 (2015-05-14 r68368)
+* Debian:testing (rocker/r-devel), R 3.3.0 (2015-08-26 r69190)
+* Windows           (win-builder), R 3.3.0 (2015-09-01 r69241)
 
 ## R CMD check results
 
 There were no ERRORs or WARNINGs
 
 There was 1 NOTE:
 
-1. This is an update to an existing package.
+1. Maintainer's email address has changed.
 
-    * checking CRAN incoming feasibility ... Note_to_CRAN_maintainers
-    Maintainer: 'Alex M Chubaty <achubaty@NRCan.gc.ca>'
+    * checking CRAN incoming feasibility ... NOTE
+    Maintainer: 'Alex M Chubaty <alexander.chubaty@canada.ca>'
+
+    New maintainer:
+      Alex M Chubaty <alexander.chubaty@canada.ca>
+    Old maintainer(s):
+      Alex M Chubaty <achubaty@NRCan.gc.ca>
 
 ## Downstream dependencies
 
-There are currently no downstream dependencies of this package.
+I have run R CMD check on downstream dependencies of `fpCompare`, and all have passed.
+Summary at https://github.com/PredictiveEcology/fpCompare/blob/master/revdep/summary.md.
+
+* NOTE: `SpaDES` produces an error due to a non-CRAN package in Suggests, but passes once that dependency is installed.

revdep/.gitignore

@@ -0,0 +1 @@
+**/

revdep/check.R

@@ -0,0 +1,5 @@
+library("devtools")
+
+res <- revdep_check()
+revdep_check_save_summary(res)
+revdep_check_save_logs(res)

revdep/summary.md

@@ -0,0 +1,43 @@
+# Setup
+
+## Platform
+
+|setting  |value                        |
+|:--------|:----------------------------|
+|version  |R version 3.2.2 (2015-08-14) |
+|system   |x86_64, darwin13.4.0         |
+|ui       |RStudio (0.99.646)           |
+|language |(EN)                         |
+|collate  |en_CA.UTF-8                  |
+|tz       |America/Vancouver            |
+|date     |2015-09-01                   |
+
+## Packages
+
+|package |*  |version |date |source |
+|:-------|:--|:-------|:----|:------|
+
+# Check results
+1 checked out of 1 dependencies 
+
+## SpaDES (1.0.1)
+Maintainer: Alex M Chubaty <achubaty@NRCan.gc.ca>  
+Bug reports: https://github.com/PredictiveEcology/SpaDES/issues
+
+```
+checking package dependencies ... ERROR
+Package suggested but not available: ‘fastshp’
+
+The suggested packages are required for a complete check.
+Checking can be attempted without them by setting the environment
+variable _R_CHECK_FORCE_SUGGESTS_ to a false value.
+
+See section ‘The DESCRIPTION file’ in the ‘Writing R Extensions’
+manual.
+```
+```
+DONE
+Status: 1 ERROR
+```
+
+**Maintainer's note:** R CMD check for `SpaDES` passes after installing missing dependency.

tests/testthat/test-numerical-comparisons.R

@@ -1,8 +1,8 @@
 test_that("relational operators within tolerance", {
   x <- .5-.3
   y <- .3-.1
-  expect_that(x %==% y, testthat::equals(TRUE))
-  expect_that(x %!=% y, testthat::equals(FALSE))
+  expect_equal(x %==% y, TRUE)
+  expect_equal(x %!=% y, FALSE)
 
   set.seed(123L)
   a <- jitter(1:10, 1e-3)
@@ -13,8 +13,8 @@ test_that("relational operators within tolerance", {
   greater    <- a %>>% b
   equal      <- a %==% b
   notequal   <- a %!=% b
-  expect_that(less,     testthat::equals(!greater))
-  expect_that(notequal, testthat::equals(!equal))
+  expect_equal(less,     !greater)
+  expect_equal(notequal, !equal)
 
   a <- jitter(1:10, 1e-7)
   b <- jitter(1:10, 1e-7)
@@ -25,9 +25,9 @@ test_that("relational operators within tolerance", {
   equal      <- a %==% b
   notequal   <- a %!=% b
   ids <- c(5L,8L)
-  expect_that(less[ids],        testthat::equals(!greater[ids]))
-  expect_that(less[-ids],       testthat::equals(greater[-ids]))
-  expect_that(less.eq,          testthat::equals(!greater))
-  expect_that(all(!equal[ids]), testthat::equals(TRUE))
-  expect_that(all(equal[-ids]), testthat::equals(TRUE))
+  expect_equal(less[ids],        !greater[ids])
+  expect_equal(less[-ids],       greater[-ids])
+  expect_equal(less.eq,          !greater)
+  expect_equal(all(!equal[ids]), TRUE)
+  expect_equal(all(equal[-ids]), TRUE)
 })

vignettes/fpCompare.Rmd

@@ -1,7 +1,7 @@
 ---
-title:  "fpCompare"
+title: "fpCompare"
 author: "Alex M. Chubaty"
-date:   "May 15, 2015"
+date: '`r format(Sys.Date(), format="%B %d, %Y")`'
 output:
   pdf_document:
     number_sections: no
@@ -10,13 +10,13 @@ output:
     number_sections: no
     self_contained: yes
     toc: no
+bibliography: bibliography.bib
 vignette: >
-  %\VignetteEngine{knitr::knitr}
+  %\VignetteEngine{knitr::rmarkdown}
   %\VignetteIndexEntry{fpCompare: reliable comparison of floating point numbers}
   %\VignetteDepends{fpCompare}
-  %\VignetteKeyword{}
+  %\VignetteKeyword{floating point numbers, numerical comparisons}
   %\usepackage[utf8]{inputenc}
-bibliography: bibliography.bib
 ---
 
 # Reliable comparison of floating point numbers