From cca483a381cc0d06ba6b81ccaf6fe2bbb387e181 Mon Sep 17 00:00:00 2001 From: florisvdh Date: Tue, 17 Sep 2024 17:37:19 +0200 Subject: [PATCH 1/5] Increment version number to 0.4.1 --- .zenodo.json | 2 +- CITATION.cff | 2 +- DESCRIPTION | 2 +- NEWS.md | 2 +- inst/CITATION | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index ca5c7824..2dab7279 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -1,6 +1,6 @@ { "title": "R package qgisprocess: use QGIS processing algorithms", - "version": "0.4.0", + "version": "0.4.1", "license": "GPL-3.0-or-later", "upload_type": "software", "description": "

R package qgisprocess provides seamless access to the QGIS processing toolbox using the standalone qgis_process command-line utility. Both native and third-party (plugin) processing providers are supported. Beside referring data sources from file, also common objects from sf, terra and stars are supported. The native processing algorithms are documented at QGIS.org. URL: https://r-spatial.github.io/qgisprocess. CRAN landing page: https://CRAN.R-project.org/package=qgisprocess.

", diff --git a/CITATION.cff b/CITATION.cff index 17dc91f1..33265f93 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -39,4 +39,4 @@ abstract: R package 'qgisprocess' provides seamless access identifiers: - type: url value: https://r-spatial.github.io/qgisprocess/ -version: 0.4.0 +version: 0.4.1 diff --git a/DESCRIPTION b/DESCRIPTION index cdd1b010..e2ec3249 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: qgisprocess Title: Use 'QGIS' Processing Algorithms -Version: 0.4.0.9000 +Version: 0.4.1 Authors@R: c( person("Dewey", "Dunnington", , "dewey@fishandwhistle.net", role = "aut", comment = c(ORCID = "0000-0002-9415-4582", affiliation = "Voltron Data")), diff --git a/NEWS.md b/NEWS.md index b818281d..b833df4a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# qgisprocess (development version) +# qgisprocess 0.4.1 ## Fix for non-UTF-8 locales diff --git a/inst/CITATION b/inst/CITATION index 9f144c32..ed7b2576 100644 --- a/inst/CITATION +++ b/inst/CITATION @@ -2,11 +2,11 @@ citHeader("To cite `qgisprocess` in publications please use:") # begin checklist entry bibentry( bibtype = "Manual", - title = "R package qgisprocess: use QGIS processing algorithms. Version 0.4.0", + title = "R package qgisprocess: use QGIS processing algorithms. Version 0.4.1", author = c( author = c(person(given = "Dewey", family = "Dunnington"), person(given = "Floris", family = "Vanderhaeghe"), person(given = "Jan", family = "Caha"), person(given = "Jannes", family = "Muenchow"))), year = 2024, url = "https://r-spatial.github.io/qgisprocess/", - textVersion = "Dunnington, Dewey; Vanderhaeghe, Floris; Caha, Jan; Muenchow, Jannes (2024). R package qgisprocess: use QGIS processing algorithms. Version 0.4.0. https://github.com/r-spatial/qgisprocess/", + textVersion = "Dunnington, Dewey; Vanderhaeghe, Floris; Caha, Jan; Muenchow, Jannes (2024). R package qgisprocess: use QGIS processing algorithms. Version 0.4.1. https://github.com/r-spatial/qgisprocess/", keywords = "R; package; QGIS", ) # end checklist entry From 2e379e8a7393df9d0c01d8f69095914eec0e5f22 Mon Sep 17 00:00:00 2001 From: florisvdh Date: Sat, 5 Oct 2024 17:16:14 +0200 Subject: [PATCH 2/5] cran-comments.md: include third note for resubmission --- cran-comments.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/cran-comments.md b/cran-comments.md index 189f1577..133a4e22 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,6 +1,16 @@ ## R CMD check results -0 errors | 0 warnings | 2 notes +0 errors | 0 warnings | 3 notes + +* checking DESCRIPTION meta-information ... NOTE + + Author field differs from that derived from Authors@R + + > I think this a false positive: + + - in the source code, the DESCRIPTION only contains Authors@R, which is formatted correctly. The field went unchanged since several CRAN versions, and was not altered in this submission. + - 'Author' has been automatically derived by R CMD build. (using R 4.4.1) + - the difference is that the names of the 'comment' elements are present in Authors@R, but not in Author (typical example: the term 'ORCID') * checking CRAN incoming feasibility ... [11s] NOTE From 59f2b1dd739c22b5544fd3aaec9c626bccdfe0a8 Mon Sep 17 00:00:00 2001 From: florisvdh Date: Sun, 6 Oct 2024 21:43:28 +0200 Subject: [PATCH 3/5] Revert "cran-comments.md: include third note for resubmission" This reverts commit 2e379e8a7393df9d0c01d8f69095914eec0e5f22. --- cran-comments.md | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/cran-comments.md b/cran-comments.md index 133a4e22..189f1577 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,16 +1,6 @@ ## R CMD check results -0 errors | 0 warnings | 3 notes - -* checking DESCRIPTION meta-information ... NOTE - - Author field differs from that derived from Authors@R - - > I think this a false positive: - - - in the source code, the DESCRIPTION only contains Authors@R, which is formatted correctly. The field went unchanged since several CRAN versions, and was not altered in this submission. - - 'Author' has been automatically derived by R CMD build. (using R 4.4.1) - - the difference is that the names of the 'comment' elements are present in Authors@R, but not in Author (typical example: the term 'ORCID') +0 errors | 0 warnings | 2 notes * checking CRAN incoming feasibility ... [11s] NOTE From b65fdb3748cc366ff54e7e70249e5185a50b52fe Mon Sep 17 00:00:00 2001 From: florisvdh Date: Mon, 7 Oct 2024 09:23:50 +0200 Subject: [PATCH 4/5] Bump dev version number --- DESCRIPTION | 2 +- NEWS.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 1518d9d5..99bee503 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: qgisprocess Title: Use 'QGIS' Processing Algorithms -Version: 0.4.1 +Version: 0.4.1.9000 Authors@R: c( person("Dewey", "Dunnington", , "dewey@fishandwhistle.net", role = "aut", comment = c("https://orcid.org/0000-0002-9415-4582", "Voltron Data")), diff --git a/NEWS.md b/NEWS.md index b833df4a..41e7ef09 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,5 @@ +# qgisprocess (development version) + # qgisprocess 0.4.1 ## Fix for non-UTF-8 locales From 4a2fe4d104a7096e093f8b3372867daf8abffbaf Mon Sep 17 00:00:00 2001 From: florisvdh Date: Mon, 7 Oct 2024 09:23:57 +0200 Subject: [PATCH 5/5] Revert "DESCRIPTION: workaround to circumvent CRAN note *" * This reverts commit 028dd3b5fbc833be9a6f943fa19270d09181a946. Reasons: - don't break the pkgdown ORCID links - hopefully with future R versions this clash between Authors@R and Authors will no longer occur --- DESCRIPTION | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 99bee503..e681510e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -3,19 +3,19 @@ Title: Use 'QGIS' Processing Algorithms Version: 0.4.1.9000 Authors@R: c( person("Dewey", "Dunnington", , "dewey@fishandwhistle.net", role = "aut", - comment = c("https://orcid.org/0000-0002-9415-4582", "Voltron Data")), + comment = c(ORCID = "0000-0002-9415-4582", affiliation = "Voltron Data")), person("Floris", "Vanderhaeghe", , "floris.vanderhaeghe@inbo.be", role = c("aut", "cre"), - comment = c("https://orcid.org/0000-0002-6378-6229", "Research Institute for Nature and Forest (INBO)")), + comment = c(ORCID = "0000-0002-6378-6229", affiliation = "Research Institute for Nature and Forest (INBO)")), person("Jan", "Caha", , "jan.caha@outlook.com", role = "aut", - comment = c("https://orcid.org/0000-0003-0165-0606")), + comment = c(ORCID = "0000-0003-0165-0606")), person("Jannes", "Muenchow", , "malnamalja@gmx.de", role = "aut", - comment = c("https://orcid.org/0000-0001-7834-4717")), + comment = c(ORCID = "0000-0001-7834-4717")), person("Antony", "Barja", , "antony.barja8@gmail.com", role = "ctb", - comment = c("https://orcid.org/0000-0001-5921-2858")), + comment = c(ORCID = "0000-0001-5921-2858")), person("Robin", "Lovelace", , "rob00x@gmail.com", role = "ctb", - comment = c("https://orcid.org/0000-0001-5679-6536")), + comment = c(ORCID = "0000-0001-5679-6536")), person("Jakub", "Nowosad", , "nowosad.jakub@gmail.com", role = "ctb", - comment = c("https://orcid.org/0000-0002-1057-3721")), + comment = c(ORCID = "0000-0002-1057-3721")), person("Research Institute for Nature and Forest (INBO)", role = c("cph", "fnd"), comment = "https://www.inbo.be/en/") )