From b0904a7b907065195e89507f430958a431521f55 Mon Sep 17 00:00:00 2001 From: Matt Jones Date: Tue, 5 May 2020 22:29:49 -0800 Subject: [PATCH] Increment version, update cran comments. Also, fix codemeta metadata file. --- DESCRIPTION | 2 +- codemeta.json | 10 ++++++---- cran-comments.md | 20 +++++++++++--------- docker/Dockerfile-devel | 2 +- docker/Dockerfile-stable | 2 +- 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index e58bccc..e3ccc86 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: codyn Title: Community Dynamics Metrics -Version: 2.0.3.9001 +Version: 2.0.4 Authors@R: c(person("Lauren", "Hallett", email="lauren.m.hallett@gmail.com", role=c("aut")), person("Meghan L.", "Avolio", email="meghan.avolio@jhu.edu", role=c("aut")), person("Ian T.", "Carroll", email="carroll.ian@gmail.com", role=c("aut")), diff --git a/codemeta.json b/codemeta.json index d6fb136..830bf94 100644 --- a/codemeta.json +++ b/codemeta.json @@ -1,5 +1,7 @@ { - "@context": ["https://doi.org/10.5063/schema/codemeta-2.0", "http://schema.org"], + "@context": [ + "https://doi.org/10.5063/schema/codemeta-2.0" + ], "@type": "SoftwareSourceCode", "identifier": "codyn", "description": "Univariate and multivariate temporal and spatial diversity indices, \n rank abundance curves, and community stability measures. The functions \n implement measures that are either explicitly temporal and include the \n option to calculate them over multiple replicates, or spatial and include \n the option to calculate them over multiple time points. Functions fall into \n five categories: static diversity indices, temporal diversity indices, \n spatial diversity indices, rank abundance curves, and community stability \n measures. The diversity indices are temporal and spatial analogs to \n traditional diversity indices. Specifically, the package includes functions \n to calculate community richness, evenness and diversity at a given point in \n space and time. In addition, it contains functions to calculate species \n turnover, mean rank shifts, and lags in community similarity between two \n time points.", @@ -11,10 +13,10 @@ "programmingLanguage": { "@type": "ComputerLanguage", "name": "R", - "version": "3.6.2", + "version": "4.0.0", "url": "https://r-project.org" }, - "runtimePlatform": "R version 3.6.2 (2019-12-12)", + "runtimePlatform": "R version 4.0.0 (2020-04-24)", "author": [ { "@type": "Person", @@ -240,7 +242,7 @@ ], "releaseNotes": "https://github.com/NCEAS/codyn/blob/master/NEWS", "readme": "https://github.com/NCEAS/codyn/blob/master/README.md", - "fileSize": "113.24KB", + "fileSize": "113.242KB", "contIntegration": "https://travis-ci.org/NCEAS/codyn", "developmentStatus": "https://www.repostatus.org/#active", "citation": [ diff --git a/cran-comments.md b/cran-comments.md index 5004951..df1cbb6 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -4,19 +4,21 @@ R CMD check and all tests passed on Linux, MacOS, and Windows, using the followi * Mac OS X 10.14.6 * R 3.6.2 (x86_64-apple-darwin15.6.0 (64-bit)) + * R 4.0.0 (x86_64-apple-darwin17.0 (64-bit)) * Via R-hub - * Ubuntu Linux 16.04 LTS, R-release, GCC - * Windows Server 2008 R2 SP1, R-release, 32/64 bit - * macOS 10.11 El Capitan, R-release (experimental) - * Debian Linux, R-devel, GCC (2019-09-14 r77190) (x86_64-pc-linux-gnu (64-bit)) + * R 4.0.0 debian-gcc-release (r-release) + * R Under development (unstable) (2020-05-01 r78341) (x86_64-pc-linux-gnu (64-bit)) * Via win_builder - * R 3.6.1 (2019-07-05) (x86_64-w64-mingw32 (64-bit)) - * R Under development (unstable) (2019-09-15 r77192) (x86_64-w64-mingw32 (64-bit)) - + * R 4.0.0 (2020-04-24) (x86_64-w64-mingw32 (64-bit)) + * R Under development (unstable) (2020-05-05 r78369) (x86_64-w64-mingw32 (64-bit)) + # R CMD check results -* There were no NOTES, ERRORs or WARNINGs +* There was one NOTE, that this is a new submission, and that words were potentially +misspelled in the DESCRIPTION. This is not a new submission, as it is an +update to fix tests that broke after the R 4.0.0 factor changes. The flagged spelling word +is correctly spelled: 'indices'. # Downstream dependencies -None, since `revdepcheck::revdep_check()` reports no downnstream dependencies. +None, since `devtools::revdep()` reports no downnstream dependencies. diff --git a/docker/Dockerfile-devel b/docker/Dockerfile-devel index 1bac46d..7c43bb7 100644 --- a/docker/Dockerfile-devel +++ b/docker/Dockerfile-devel @@ -1,5 +1,5 @@ ## Start with the rstudio daily image, which is built on a daily R build snapshot -FROM rocker/verse:devel +FROM rocker/r-devel MAINTAINER Matt Jones jones@nceas.ucsb.edu RUN apt-get update && apt-get install -y xvfb xauth xfonts-base diff --git a/docker/Dockerfile-stable b/docker/Dockerfile-stable index 2288365..430fcfe 100644 --- a/docker/Dockerfile-stable +++ b/docker/Dockerfile-stable @@ -1,5 +1,5 @@ ## Start with the ropensci image, and put our check code inline -FROM rocker/verse +FROM rocker/verse:3.6.3 MAINTAINER Matt Jones jones@nceas.ucsb.edu RUN apt-get update && apt-get install -y xvfb xauth xfonts-base