Merge branch 'development'

.Rbuildignore

@@ -17,3 +17,4 @@ cran-comments\.md
 ^travis_wait_.*\.log$
 vignettes/.*_cache$
 vignettes/.*\.log$
+^revdep$

.gitignore

@@ -10,6 +10,7 @@ figure/
 man/spadesEnv.Rd
 myModule.md
 output/
+revdep/.cache.rds
 src/*.o
 src/*.so
 src/*.dll
@@ -24,7 +25,6 @@ vignettes/*.R
 
 #################
 ## LaTeX
-#################
 *.acn
 *.acr
 *.alg

.travis.yml

@@ -7,6 +7,42 @@ env:
   - secure: 3BXzHYdDU0aCDB88S0JFTgV2Z4prE1j7asKSO8FGrQazvja6Cx0sStfuDa6SRjcAm4BWkP7Feixr6yGqL57ep4UC3Z+BcHvxFBdgfL5FAzdbnuMwEn7DJ11uXZPJampbORLgS8WniVgeRiEcHtZm+z2HHWf5fo0aJXEFEXGYLqU=
 matrix:
   include:
+  - os: linux
+    dist: trusty
+    r: 3.3.0
+    addons:
+      apt:
+        sources:
+        - sourceline: 'ppa:ubuntugis/ubuntugis-unstable'
+        packages:
+        - libgdal-dev
+        - libgdal1-dev
+        - libgeos-dev
+        - libnlopt-dev
+        - libproj-dev
+        - libudunits2-dev
+        - gdal-bin
+    before_install:
+    - export DISPLAY=:99.0
+    - sh -e /etc/init.d/xvfb start
+  - os: linux
+    dist: trusty
+    r: 3.4.0
+    addons:
+      apt:
+        sources:
+        - sourceline: 'ppa:ubuntugis/ubuntugis-unstable'
+        packages:
+        - libgdal-dev
+        - libgdal1-dev
+        - libgeos-dev
+        - libnlopt-dev
+        - libproj-dev
+        - libudunits2-dev
+        - gdal-bin
+    before_install:
+    - export DISPLAY=:99.0
+    - sh -e /etc/init.d/xvfb start
   - os: linux
     dist: trusty
     r: oldrel
@@ -48,6 +84,8 @@ matrix:
     after_success:
     - Rscript -e 'covr::coveralls(package_coverage(type = "all", quiet = FALSE)))'
     - Rscript -e 'lintr::lint_package()'
+    r_packages:
+    - devtools
   - os: linux
     dist: trusty
     r: devel

DESCRIPTION

@@ -15,10 +15,10 @@ Description: Metapackage for implementing a variety of event-based models, with
 URL:
     http://spades.predictiveecology.org,
     https://github.com/PredictiveEcology/SpaDES
-Date: 2018-01-31
-Version: 2.0.1
+Date: 2018-06-12
+Version: 2.0.2
 Authors@R: c(
-    person("Alex M", "Chubaty", email = "alexander.chubaty@canada.ca",
+    person("Alex M", "Chubaty", email = "alex.chubaty@gmail.com",
     role = c("aut", "cre")),
     person("Eliot J B", "McIntire", email = "[email protected]",
     role = c("aut")),
@@ -41,6 +41,8 @@ Imports:
     utils
 Suggests:
     archivist,
+    devtools,
+    hunspell,
     igraph,
     knitr,
     raster,

NEWS.md

@@ -1,6 +1,14 @@
 Known issues: https://github.com/PredictiveEcology/SpaDES/issues
 
-version 2.0.1 
+version 2.0.2
+============= 
+
+* change maintainer email address.
+* update LandWeb app URL in README.
+* update cache vignette.
+* update package dependencies to include those used in tests.
+
+version 2.0.1
 ============= 
 
 * minor bugfix concerning imports 

README.md

@@ -23,7 +23,9 @@ Additional functionality is provided by the [`SpaDES.addins`](http://spades-addi
 ## Getting started
 
 - [Getting started guide](https://github.com/PredictiveEcology/SpaDES/wiki/Getting-Started-Guide)
-- ['`SpaDES` 4 Dummies' guide](https://github.com/CeresBarros/SpaDES4Dummies)
+- [LCC2005 tutorial](https://github.com/PredictiveEcology/SpaDES-modules/blob/master/modules/LCC2005/LCC2005.Rmd)
+- ['SpaDES 4 Dummies' guide](https://github.com/CeresBarros/SpaDES4Dummies)
+- [SpaDES users group](https://groups.google.com/d/forum/spades-users)
 - [Vignettes](https://github.com/PredictiveEcology/SpaDES/wiki/Help-Vignettes)
 - [Wiki](https://github.com/PredictiveEcology/SpaDES/wiki)
 
@@ -48,7 +50,7 @@ Additional functionality is provided by the [`SpaDES.addins`](http://spades-addi
 
 **Canadian Forest Service Adaptation Toolkit:** [http://www.nrcan.gc.ca/forests/climate-change/tools-resources/17770](http://www.nrcan.gc.ca/forests/climate-change/tools-resources/17770)
 
-**LandWeb Demonstration App:** [http://landweb.predictiveecology.org/Demo/](http://landweb.predictiveecology.org/Demo/)
+**LandWeb Demonstration App:** [http://landweb.ca](http://landweb.ca/)
 
 **Examples for R-savvy users:**
 
@@ -106,12 +108,16 @@ install_github("PredictiveEcology/SpaDES", ref = "development", dependencies = T
 
 ## Getting help
 
+Q&A forum is available on the SpaDES Users Google Group.
+This is the place to ask for help on setting up and running simulations, as well as module development.
+Please do not file bug reports here.
+
 - [Q&A Forum](https://groups.google.com/forum/#!forum/spades-users)
 
 ## Reporting bugs
 
 The `SpaDES` metapackage simply loads a number of other packages from the `SpaDES` ecosystem.
-Bug reports should be reported to the specific package in question rather than the metapackage.
+Bug reports should be reported to the specific package in question rather than the metapackage, and should contain a concise [reproducible example](https://stackoverflow.com/q/5963269/1380598).
 Contact us via the package's GitHub site:
 
 - [quickPlot](https://github.com/PredictiveEcology/quickPlot/issues)
@@ -123,4 +129,4 @@ Contact us via the package's GitHub site:
 
 -----
 
-Copyright (C) 2017 Her Majesty the Queen in Right of Canada, as represented by the Minister of Natural Resources Canada
+Copyright (C) 2018 Her Majesty the Queen in Right of Canada, as represented by the Minister of Natural Resources Canada

SpaDES.Rproj

@@ -22,3 +22,5 @@ PackageBuildArgs: --md5
 PackageBuildBinaryArgs: --byte-compile
 PackageCheckArgs: --as-cran
 PackageRoxygenize: rd,collate,namespace,vignette
+
+QuitChildProcessesOnExit: Yes

appveyor.yml

@@ -29,9 +29,12 @@ environment:
   - R_VERSION: release
 
   - R_VERSION: oldrel
-    RTOOLS_VERSION: 33
+    RTOOLS_VERSION: 34
+
+  - R_VERSION: 3.4.0
+    RTOOLS_VERSION: 34
 
-  - R_VERSION: 3.3.3
+  - R_VERSION: 3.3.0
     RTOOLS_VERSION: 33
 
 branches:
@@ -46,7 +49,9 @@ branches:
 clone_depth: 5
 
 build_script:
+  - Rscript -e "install.packages(c('DEoptim', 'igraph'), repos = 'https://cran.rstudio.com', type = 'source')"
   - Rscript -e "install.packages('SpaDES.core', dependencies = TRUE, repos = 'https://cran.rstudio.com')"
+  - Rscript -e "install.packages(c('quickPlot', 'reproducible', 'SpaDES.addins', 'SpaDES.core', 'SpaDES.tools'), repos = 'https://cran.rstudio.com', type = 'source')"
   - travis-tool.sh install_deps
 
 test_script:

cran-comments.md

@@ -1,40 +1,52 @@
 ## Updated release
 
-This package remains a metapackage. The main purpose of this updated release is to address CRAN concerns about package declarations for vignettes.
+This release fixes CRAN concerns about package declarations for tests and vignettes.
+
+The maintainer email address has changed, about which I notified CRAN on March 28, 2018 and sent followup on June 12, 2018 (in response to `fpCompare` submission).
 
 Since this is a metapackage, we have not included any examples as these are better suited for their respective packages.
 
 ## Test environments
 
 ### Previous R versions
 * Ubuntu 14.04        (travis-ci), R 3.3.0
-* Ubuntu 14.04        (travis-ci), R 3.3.3
-* Windows              (appveyor), R 3.3.3
-* Windows 7               (local), R 3.3.3
+* Ubuntu 14.04        (travis-ci), R 3.4.0
+* Windows              (appveyor), R 3.3.0
+* Windows              (appveyor), R 3.4.0
+* Windows 7               (local), R 3.4.4
 
 ### Current R versions
-* macOS High Sierra    (local), R 3.4.3
-* OS X El Capitan  (travis-ci), R 3.4.3
-* Ubuntu 14.04     (travis-ci), R 3.4.3
-* Ubuntu 16.04         (local), R 3.4.3
-* Windows           (appveyor), R 3.4.3
-* Windows        (win-builder), R 3.4.3
-* Windows 7            (local), R 3.4.3
+* macOS High Sierra    (local), R 3.5.0
+* OS X El Capitan  (travis-ci), R 3.5.0
+* Ubuntu 14.04     (travis-ci), R 3.5.0
+* Ubuntu 18.04         (local), R 3.5.0
+* Windows           (appveyor), R 3.5.0
+* Windows        (win-builder), R 3.5.0
+* Windows 7            (local), R 3.5.0
 
 ### Development R version
-* Debian:testing  (rocker/drd), R 3.5.0 (2017-08-29 r73156)
-* Ubuntu 14.04     (travis-ci), R 3.5.0 (2018-01-31 r74187)
-* Ubuntu 16.04         (local), R 3.5.0 (2018-01-31 r74187)
-* Windows           (appveyor), R 3.5.0 (2018-01-26 r74169)
-* Windows        (win-builder), R 3.5.0 (2018-01-30 r74185)
+* Ubuntu 14.04     (travis-ci), R 3.6.0 (2018-06-11 r74885)
+* Ubuntu 18.04         (local), R 3.6.0 (2018-06-11 r74889)
+* Windows           (appveyor), R 3.6.0 (2018-06-11 r74889)
+* Windows        (win-builder), R 3.6.0 (2018-06-11 r74889)
 
 ## R CMD check results
 
 There were no ERRORs or WARNINGs
 
-There was 1 NOTE:
+There were 2 NOTEs:
+
+1. Maintainer's email address has changed (notified CRAN 2018-05-28 and 2018-06-12).
+
+    * checking CRAN incoming feasibility ... NOTE
+    Maintainer: 'Alex M Chubaty <[email protected]>'
+
+    New maintainer:
+      Alex M Chubaty <[email protected]>
+    Old maintainer(s):
+      Alex M Chubaty <[email protected]>
 
-1. Some words were flagged as possibly mispelled, but they are false positives:
+2. Some words were flagged as possibly mispelled, but they are false positives:
 
         Possibly mis-spelled words in DESCRIPTION:
           DES (8:77)