From 978c0f1d4a312982b9a8e045a299f850a912ee0a Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Sun, 15 Nov 2020 16:35:00 +1000 Subject: [PATCH 01/10] Revert "Merge branch 'devel'" This reverts commit 52271a40006721d0dd576d300a9ce19d101e4611. --- DESCRIPTION | 2 +- NEWS.md | 2 -- R/get_radar_imagery.R | 2 ++ man/get_radar_imagery.Rd | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index e3c5e137..c569e666 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: bomrang Type: Package Title: Australian Government Bureau of Meteorology ('BOM') Data Client -Version: 0.7.1.9000 +Version: 0.7.1 Authors@R: c(person(given = "Adam H.", family = "Sparks", diff --git a/NEWS.md b/NEWS.md index d8e5a0b6..ab7ffb42 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,3 @@ -# bomrang (development version) - # bomrang 0.7.1 ## Bug fixes diff --git a/R/get_radar_imagery.R b/R/get_radar_imagery.R index 540658cb..2662c9c0 100644 --- a/R/get_radar_imagery.R +++ b/R/get_radar_imagery.R @@ -111,6 +111,8 @@ get_available_radar <- function(radar_id = "all") { #' imagery <- get_radar_imagery(product_id = "IDR032") #' plot(imagery) #' +#' # Save imagery to a local path +#' imagery <- get_radar_imagery(product_id = "IDR032", path = "image.gif") #' } #' #' @author Dean Marchiori, \email{deanmarchiori@@gmail.com} diff --git a/man/get_radar_imagery.Rd b/man/get_radar_imagery.Rd index f03aa899..84d89a85 100644 --- a/man/get_radar_imagery.Rd +++ b/man/get_radar_imagery.Rd @@ -40,6 +40,8 @@ library(raster) imagery <- get_radar_imagery(product_id = "IDR032") plot(imagery) +# Save imagery to a local path +imagery <- get_radar_imagery(product_id = "IDR032", path = "image.gif") } } From 207f596811c4bf24929c2c9bbbd3e2f14bdc171f Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Sun, 15 Nov 2020 17:54:32 +1000 Subject: [PATCH 02/10] Update NEWS.md --- NEWS.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NEWS.md b/NEWS.md index ab7ffb42..5303a7ce 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +# bomrang 0.7.1.1 + +* Fixes an example that wrote to R userspace, when it should not + # bomrang 0.7.1 ## Bug fixes From f21e84f203a8733dadd56e93343550068dc254df Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Sun, 15 Nov 2020 17:54:52 +1000 Subject: [PATCH 03/10] Update CRAN comments --- cran-comments.md | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/cran-comments.md b/cran-comments.md index f8f228ad..aee52967 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,41 +1,21 @@ ## Test environments -- local macOS install R version 4.0.2 (2020-06-22) +- local macOS install R version 4.0.3 (2020-10-10) -- win-builder R Under development (unstable) (2020-09-17 r79226) +- win-builder R Under development (unstable) (2020-11-14 r79432) -- win-builder R version 4.0.2 (2020-06-22) +- win-builder R version 4.0.3 (2020-10-10) ## R CMD check results 0 errors | 0 warnings | 1 note -This is a resubmission that removes functionality due to a broken CRAN package so that all examples in this package pass checks - -## Removal of functionality - -* `get_subdaily_weather()` has been removed due to CRAN policy for failing examples so that I can get the bug fixes in this package submitted to deal with errors that do originate in this package as the failing example is a direct result of the _stationAry_ package which is already on CRAN, not _bomrang_. +This is a new patch release that fixes a bug in the documentation ## Bug fixes -* For a time BOM was not listing historical rainfall records. -A message is emitted now if records are missing or unavailable rather than `get_historical_weather()` failing. -Thanks to James Goldie, [@rensa](https://github.com/rensa) for this fix. - -* Cross-links in the function documentation have been fixed. - -## Standardised function naming - -* `get_historical()` is now an alias for `get_historical_weather()` to bring this function into line with the other function names. -Neither name is preferred and both will be provided going forward. -This is simply to provide a standard nomenclature across the package for function names. - -## Internal changes - -* Update internal databases of station and forecast locations. - -* Reorganise functions and files to be more consistent within the package. +* Fixes an example that wrote to R userspace, when it should not ## Reverse dependencies From c9350b39ac2bb299901fe90717ba2a20d24d9753 Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Sun, 15 Nov 2020 18:02:48 +1000 Subject: [PATCH 04/10] Update codemeta.json --- codemeta.json | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/codemeta.json b/codemeta.json index 6d5176ba..d511537c 100644 --- a/codemeta.json +++ b/codemeta.json @@ -10,13 +10,13 @@ "codeRepository": "https://github.com/ropensci/bomrang", "issueTracker": "https://github.com/ropensci/bomrang/issues", "license": "https://spdx.org/licenses/MIT", - "version": "0.7.1", + "version": "0.7.1.1", "programmingLanguage": { "@type": "ComputerLanguage", "name": "R", "url": "https://r-project.org" }, - "runtimePlatform": "R version 4.0.2 (2020-06-22)", + "runtimePlatform": "R version 4.0.3 (2020-10-10)", "provider": { "@id": "https://cran.r-project.org", "@type": "Organization", @@ -582,13 +582,8 @@ "https://CRAN.R-project.org/package=bomrang", "https://docs.ropensci.org/bomrang/" ], - "review": { - "@type": "Review", - "url": "https://github.com/ropensci/software-review/issues/121", - "provider": "https://ropensci.org" - }, "developmentStatus": "https://www.repostatus.org/#active", "copyrightHolder": {}, "funder": {}, - "fileSize": "657668.552KB" + "fileSize": "1358.297KB" } From 871e6623d4322f22e03585a8636ea35aca75ae6e Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Sun, 15 Nov 2020 18:58:24 +1000 Subject: [PATCH 05/10] Increment version number --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index c569e666..649cc8d4 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: bomrang Type: Package Title: Australian Government Bureau of Meteorology ('BOM') Data Client -Version: 0.7.1 +Version: 0.7.2 Authors@R: c(person(given = "Adam H.", family = "Sparks", From 3c8dd3ea97737e7f3f6b3662c7ef77560a0cedaa Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Sun, 15 Nov 2020 18:58:37 +1000 Subject: [PATCH 06/10] clarify where the issue was that is fixed --- NEWS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index 5303a7ce..dc7004e4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,6 @@ -# bomrang 0.7.1.1 +# bomrang 0.7.2 -* Fixes an example that wrote to R userspace, when it should not +* Fixes an example that wrote to R userspace, when it should not in `get_radar_imagery()` # bomrang 0.7.1 From 4f604216d13ef351d78419a770d7a65efb4288e1 Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Sun, 15 Nov 2020 18:58:48 +1000 Subject: [PATCH 07/10] Clarify where the issue was that is fixed --- cran-comments.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cran-comments.md b/cran-comments.md index aee52967..67026d1f 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,3 +1,4 @@ +## bomrang version 0.7.2 ## Test environments @@ -15,7 +16,7 @@ This is a new patch release that fixes a bug in the documentation ## Bug fixes -* Fixes an example that wrote to R userspace, when it should not +* Fixes an example that wrote to R userspace, when it should not in `get_radar_imagery()` ## Reverse dependencies From 61ea384320fc66fd6c75931115f53693006e124b Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Sun, 15 Nov 2020 19:00:17 +1000 Subject: [PATCH 08/10] Update codemeta.json --- codemeta.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/codemeta.json b/codemeta.json index d511537c..df209f80 100644 --- a/codemeta.json +++ b/codemeta.json @@ -10,7 +10,7 @@ "codeRepository": "https://github.com/ropensci/bomrang", "issueTracker": "https://github.com/ropensci/bomrang/issues", "license": "https://spdx.org/licenses/MIT", - "version": "0.7.1.1", + "version": "0.7.2", "programmingLanguage": { "@type": "ComputerLanguage", "name": "R", @@ -585,5 +585,5 @@ "developmentStatus": "https://www.repostatus.org/#active", "copyrightHolder": {}, "funder": {}, - "fileSize": "1358.297KB" + "fileSize": "1360.913KB" } From a02f99e0b8cda27ea9924b1dae98ec2e548eecc5 Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Sun, 15 Nov 2020 19:07:43 +1000 Subject: [PATCH 09/10] Add CRAN-RELEASE --- CRAN-RELEASE | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 CRAN-RELEASE diff --git a/CRAN-RELEASE b/CRAN-RELEASE new file mode 100644 index 00000000..0d8a12ca --- /dev/null +++ b/CRAN-RELEASE @@ -0,0 +1,2 @@ +This package was submitted to CRAN on 2020-11-15. +Once it is accepted, delete this file and tag the release (commit 61ea384). From ab5c6e2bb3c3ad51ff2e4e53ce299b0a664b39fb Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Tue, 17 Nov 2020 16:14:06 +1000 Subject: [PATCH 10/10] Delete CRAN-RELEASE --- CRAN-RELEASE | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 CRAN-RELEASE diff --git a/CRAN-RELEASE b/CRAN-RELEASE deleted file mode 100644 index 0d8a12ca..00000000 --- a/CRAN-RELEASE +++ /dev/null @@ -1,2 +0,0 @@ -This package was submitted to CRAN on 2020-11-15. -Once it is accepted, delete this file and tag the release (commit 61ea384).