Merge pull request #105 from jonesor/devel

Devel
jonesor · Apr 27, 2021 · 898cab8 · 898cab8
2 parents 8c4c61a + a92f00b
commit 898cab8
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 40 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,9 +16,9 @@ matrix:
     - os: linux
       dist: xenial
       r: devel
-    - os: osx 
-      osx_image: xcode12
-      r: devel 
+  #  - os: osx 
+  #    osx_image: xcode12
+  #    r: devel 
 
 # Branches
 branches:

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
diff --git a/CRAN-RELEASE b/CRAN-RELEASE
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: Rcompadre
 Type: Package
-Title: Utilities for Working with the COMPADRE/COMADRE Plant and Animal Matrix Model Databases
+Title: Utilities for Working with the 'COMPADRE'/'COMADRE' Plant and Animal Matrix Model Databases
 Version: 1.0.0
 Authors@R: c(
     person(given = "Patrick", 
@@ -42,7 +42,7 @@ Authors@R: c(
            role = "aut",
            email = "[email protected]",
            comment = c(ORCID = "0000-0002-3289-9925"))) 
-Description: Utility functions for interacting with the COMPADRE and COMADRE databases of matrix population models.
+Description: Utility functions for interacting with the 'COMPADRE' and 'COMADRE' databases of matrix population models.
 License: GPL-2 | file LICENSE
 URL: https://github.com/jonesor/Rcompadre
 BugReports: https://github.com/jonesor/Rcompadre/issues

diff --git a/README.Rmd b/README.Rmd
@@ -138,7 +138,7 @@ In the meantime, please use `citation("Rcompadre")`.
 
 ## Contributions
 
-All contributions are welcome. Please note that this project is released with a [Contributor Code of Conduct](CONDUCT.md). By participating in this project you agree to abide by its terms.
+All contributions are welcome. Please note that this project is released with a [Contributor Code of Conduct](https://contributor-covenant.org/version/2/0/CODE_OF_CONDUCT.html). By participating in this project you agree to abide by its terms.
 
 
 There are numerous ways of contributing. 

diff --git a/README.md b/README.md
@@ -144,8 +144,9 @@ please use `citation("Rcompadre")`.
 ## Contributions
 
 All contributions are welcome. Please note that this project is released
-with a [Contributor Code of Conduct](CONDUCT.md). By participating in
-this project you agree to abide by its terms.
+with a [Contributor Code of
+Conduct](https://contributor-covenant.org/version/2/0/CODE_OF_CONDUCT.html).
+By participating in this project you agree to abide by its terms.
 
 There are numerous ways of contributing.
 

diff --git a/codemeta.json b/codemeta.json
@@ -5,8 +5,8 @@
   ],
   "@type": "SoftwareSourceCode",
   "identifier": "Rcompadre",
-  "description": "Utility functions for interacting with the COMPADRE and COMADRE databases of matrix population models.",
-  "name": "Rcompadre: Utilities for Working with the COMPADRE/COMADRE Plant and Animal Matrix Model Databases",
+  "description": "Utility functions for interacting with the 'COMPADRE' and 'COMADRE' databases of matrix population models.",
+  "name": "Rcompadre: Utilities for Working with the 'COMPADRE'/'COMADRE' Plant and Animal Matrix Model Databases",
   "codeRepository": "https://github.com/jonesor/Rcompadre",
   "issueTracker": "https://github.com/jonesor/Rcompadre/issues",
   "license": "https://spdx.org/licenses/GPL-2.0",

diff --git a/cran-comments.md b/cran-comments.md
@@ -148,8 +148,12 @@ __R latest release__
 
 ## R CMD check results
 
-There were no ERRORs, WARNINGs or NOTEs.
+There were no ERRORs or WARNINGs.
 
+There was 1 NOTE:
+Non-standard file/directory found at top level:
+  'cran-comments.md'
+
 This is the first submission to CRAN.
 
 ## Downstream dependencies

diff --git a/docs/articles/a04_ObtainingReferences.html b/docs/articles/a04_ObtainingReferences.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -6,5 +6,5 @@ articles:
   a02_RcompadreTidy: a02_RcompadreTidy.html
   a03_VectorisingRcompadre: a03_VectorisingRcompadre.html
   a04_ObtainingReferences: a04_ObtainingReferences.html
-last_built: 2021-04-27T13:51Z
+last_built: 2021-04-27T17:51Z