From 15b1cdda91a2261cb36a77052db8662732a890ac Mon Sep 17 00:00:00 2001 From: "Phillip D. Alderman" Date: Tue, 1 Feb 2022 01:03:29 -0600 Subject: [PATCH 01/22] Adding I() to calls to readr::read_lines() and readr::read_csv() for compatibility with vroom >= 1.5.0. Resolves #66 from ropensci/nasapower. --- R/get_power.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/get_power.R b/R/get_power.R index 22839e3f..2910feff 100644 --- a/R/get_power.R +++ b/R/get_power.R @@ -323,7 +323,7 @@ get_power <- function(community, response$raise_for_status() # create meta object - power_data <- readr::read_lines(response$parse("UTF8")) + power_data <- readr::read_lines(I(response$parse("UTF8"))) meta <- power_data[c(grep("-BEGIN HEADER-", power_data):grep("-END HEADER-", @@ -340,7 +340,7 @@ get_power <- function(community, # create tibble object power_data <- readr::read_csv( - response$parse("UTF8"), + I(response$parse("UTF8")), col_types = readr::cols(), na = c("-999", "-999.00", "-999.0", "-99", "-99.00", "-99.0"), skip = length(meta) + 2 From e04daaa470b6fc4b27e428124a642d71c0ba3c3f Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Tue, 1 Feb 2022 15:57:16 +0800 Subject: [PATCH 02/22] Add Phil as contributor for PR #67 --- DESCRIPTION | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 14f0ff97..0c3da113 100755 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -14,25 +14,26 @@ Authors@R: email = "myrmecocystus@gmail.com", comment = c(ORCID = "0000-0003-1444-9135", "Scott Chamberlain reviewed nasapower for rOpenSci, see - https://github.com/ropensci/software-review/issues/155") + .") ), person(given = "Hazel", family = "Kavili", role = "rev", comment = "Hazel Kavili reviewed nasapower for rOpenSci, see - https://github.com/ropensci/software-review/issues/155"), + ."), person(given = "Alison", family = "Boyer", role = "rev", comment = "Alison Boyer reviewed nasapower for rOpenSci, see - https://github.com/ropensci/software-review/issues/155"), + ."), person(given = "Fernando", family = "Miguez", role = "ctb", + email = "femiguez@iastate.edu", comment = c(ORCID = "0000-0002-4627-8329", "Fernando Miguez provided assistance in identifying improper missing value handling in the POWER data, see - ")), + .")), person(given = "Maëlle", family = "Salmon", role = "ctb", @@ -40,7 +41,16 @@ Authors@R: "Maëlle Salmon contributed a patch to fix issues with using the R package, 'vcr', for testing the 'API' queries, see - https://github.com/ropensci/nasapower/pull/64."))) + .")), + person(given = "Phillip D.", + family = "Alderman", + role = "ctb", + email = "phillip.alderman@okstate.edu", + comment = c(ORCID = "0000-0003-1467-2337", + "Phillip Alderman contributed a patch to fix an issue + with, 'The `file` argument of `vroom()` must use `I()` + for literal data as of vroom 1.5.0.', see + https://github.com/ropensci/nasapower/pull/67."))) URL: https://docs.ropensci.org/nasapower/ BugReports: https://github.com/ropensci/nasapower/issues Description: Client for 'NASA' 'POWER' global meteorology, surface solar From 591b8dbecdbfce1d473edfdaf99f459f74ff04e5 Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Tue, 1 Feb 2022 15:58:53 +0800 Subject: [PATCH 03/22] Add WAA as cph for my time --- DESCRIPTION | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 0c3da113..2ba4f417 100755 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -50,7 +50,11 @@ Authors@R: "Phillip Alderman contributed a patch to fix an issue with, 'The `file` argument of `vroom()` must use `I()` for literal data as of vroom 1.5.0.', see - https://github.com/ropensci/nasapower/pull/67."))) + https://github.com/ropensci/nasapower/pull/67.")), + person(given = "Western Australia Agriculture Authority (WAAA)", + role = "cph", + comment = c("Supported the development of ascotraceR through Adam + H. Sparks' time."))) URL: https://docs.ropensci.org/nasapower/ BugReports: https://github.com/ropensci/nasapower/issues Description: Client for 'NASA' 'POWER' global meteorology, surface solar From f175129c62c3d09eead6b578b38a4ebc38c6f933 Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Tue, 1 Feb 2022 15:59:25 +0800 Subject: [PATCH 04/22] Increment version number --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 2ba4f417..b693ff9b 100755 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: nasapower Type: Package Title: NASA POWER API Client -Version: 4.0.3.1 +Version: 4.0.4 Authors@R: c(person(given = "Adam H.", family = "Sparks", From f8603c3230a709d6eacb9c83b9e39899b3f21b71 Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Tue, 1 Feb 2022 15:59:35 +0800 Subject: [PATCH 05/22] Redoc with new authors --- man/nasapower-package.Rd | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/man/nasapower-package.Rd b/man/nasapower-package.Rd index 2cfa9959..834226b3 100644 --- a/man/nasapower-package.Rd +++ b/man/nasapower-package.Rd @@ -23,11 +23,13 @@ Useful links: Other contributors: \itemize{ - \item Scott Chamberlain \email{myrmecocystus@gmail.com} (\href{https://orcid.org/0000-0003-1444-9135}{ORCID}) (Scott Chamberlain reviewed nasapower for rOpenSci, see https://github.com/ropensci/software-review/issues/155) [reviewer] - \item Hazel Kavili (Hazel Kavili reviewed nasapower for rOpenSci, see https://github.com/ropensci/software-review/issues/155) [reviewer] - \item Alison Boyer (Alison Boyer reviewed nasapower for rOpenSci, see https://github.com/ropensci/software-review/issues/155) [reviewer] - \item Fernando Miguez (\href{https://orcid.org/0000-0002-4627-8329}{ORCID}) (Fernando Miguez provided assistance in identifying improper missing value handling in the POWER data, see ) [contributor] - \item Maëlle Salmon (\href{https://orcid.org/0000-0002-2815-0399}{ORCID}) (Maëlle Salmon contributed a patch to fix issues with using the R package, 'vcr', for testing the 'API' queries, see https://github.com/ropensci/nasapower/pull/64.) [contributor] + \item Scott Chamberlain \email{myrmecocystus@gmail.com} (\href{https://orcid.org/0000-0003-1444-9135}{ORCID}) (Scott Chamberlain reviewed nasapower for rOpenSci, see .) [reviewer] + \item Hazel Kavili (Hazel Kavili reviewed nasapower for rOpenSci, see .) [reviewer] + \item Alison Boyer (Alison Boyer reviewed nasapower for rOpenSci, see .) [reviewer] + \item Fernando Miguez \email{femiguez@iastate.edu} (\href{https://orcid.org/0000-0002-4627-8329}{ORCID}) (Fernando Miguez provided assistance in identifying improper missing value handling in the POWER data, see .) [contributor] + \item Maëlle Salmon (\href{https://orcid.org/0000-0002-2815-0399}{ORCID}) (Maëlle Salmon contributed a patch to fix issues with using the R package, 'vcr', for testing the 'API' queries, see .) [contributor] + \item Phillip D. Alderman \email{phillip.alderman@okstate.edu} (\href{https://orcid.org/0000-0003-1467-2337}{ORCID}) (Phillip Alderman contributed a patch to fix an issue with, 'The `file` argument of `vroom()` must use `I()` for literal data as of vroom 1.5.0.', see https://github.com/ropensci/nasapower/pull/67.) [contributor] + \item Western Australia Agriculture Authority (WAAA) (Supported the development of ascotraceR through Adam H. Sparks' time.) [copyright holder] } } From 159e67afea66343e9f61480844f14cfb75313dd5 Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Tue, 1 Feb 2022 16:00:01 +0800 Subject: [PATCH 06/22] Update NEWS.md for new release --- NEWS.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index 22c0b012..34963713 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,10 @@ -# nasapower 4.0.3.1 +# nasapower 4.0.4 -* Uses new version numbering for development version. The POWER server won't accept the useragent string if it's too long. +## Bug fixes + +* Fixes message when importing data using vroom >= 1.5.0, `The `file` argument of `vroom()` must use `I()` for literal data as of vroom 1.5.0.`. Thanks to @palderman for the fix in [Pull Request 67](https://github.com/ropensci/nasapower/pull/67). + +## Minor changes * Sets minimum version of _tibble_ necessary for use with _nasapower_. From c9c14c88ebea52d23754c98c5b8699a8314a2ccf Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Tue, 1 Feb 2022 16:00:25 +0800 Subject: [PATCH 07/22] Update codemeta.json --- codemeta.json | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/codemeta.json b/codemeta.json index 9a3f8760..895d3711 100644 --- a/codemeta.json +++ b/codemeta.json @@ -7,7 +7,7 @@ "codeRepository": "https://github.com/ropensci/nasapower", "issueTracker": "https://github.com/ropensci/nasapower/issues", "license": "https://spdx.org/licenses/MIT", - "version": "4.0.3.9000", + "version": "4.0.4", "programmingLanguage": { "@type": "ComputerLanguage", "name": "R", @@ -34,6 +34,7 @@ "@type": "Person", "givenName": "Fernando", "familyName": "Miguez", + "email": "femiguez@iastate.edu", "@id": "https://orcid.org/0000-0002-4627-8329" }, { @@ -41,6 +42,19 @@ "givenName": "Maëlle", "familyName": "Salmon", "@id": "https://orcid.org/0000-0002-2815-0399" + }, + { + "@type": "Person", + "givenName": "Phillip D.", + "familyName": "Alderman", + "email": "phillip.alderman@okstate.edu", + "@id": "https://orcid.org/0000-0003-1467-2337" + } + ], + "copyrightHolder": [ + { + "@type": "Organization", + "name": "Western Australia Agriculture Authority (WAAA)" } ], "maintainer": [ @@ -210,8 +224,8 @@ }, "applicationCategory": "Tools", "isPartOf": "https://ropensci.org", - "keywords": ["NASA", "meteorological-data", "weather", "global", "weather", "weather-data", "meteorology", "NASA-POWER", "agroclimatology", "earth-science", "data-access", "climate-data"], - "fileSize": "365.409KB", + "keywords": ["NASA", "meteorological-data", "weather", "global", "weather-data", "meteorology", "NASA-POWER", "agroclimatology", "earth-science", "data-access", "climate-data", "r", "nasa-power", "nasa", "agroclimatology-data", "weather-variables", "rstats", "r-package"], + "fileSize": "367.091KB", "citation": [ { "@type": "ScholarlyArticle", @@ -251,14 +265,15 @@ "name": "{nasapower}: NASA-POWER Data from R", "identifier": "10.5281/zenodo.1040727", "url": "https://CRAN.R-project.org/package=nasapower", - "description": "R package version 4.0.3.9000", + "description": "R package version 4.0.4", "@id": "https://doi.org/10.5281/zenodo.1040727", "sameAs": "https://doi.org/10.5281/zenodo.1040727" } ], "relatedLink": ["https://docs.ropensci.org/nasapower/", "https://CRAN.R-project.org/package=nasapower"], "releaseNotes": "https://github.com/ropensci/nasapower/blob/master/NEWS.md", - "contIntegration": ["https://github.com/ropensci/nasapower/actions", "https://app.codecov.io/gh/ropensci/nasapower"], + "readme": "https://github.com/ropensci/nasapower/blob/main/README.md", + "contIntegration": ["https://github.com/ropensci/nasapower/actions", "https://codecov.io/gh/ropensci/nasapower"], "developmentStatus": "https://www.repostatus.org/#active", "review": { "@type": "Review", From d3d2b57c8296584773eb4e93385dd8810b241684 Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Tue, 1 Feb 2022 16:00:51 +0800 Subject: [PATCH 08/22] Package name styling in NEWS --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 34963713..a85cded3 100755 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,7 @@ ## Bug fixes -* Fixes message when importing data using vroom >= 1.5.0, `The `file` argument of `vroom()` must use `I()` for literal data as of vroom 1.5.0.`. Thanks to @palderman for the fix in [Pull Request 67](https://github.com/ropensci/nasapower/pull/67). +* Fixes message when importing data using _vroom_ >= 1.5.0, `The `file` argument of `vroom()` must use `I()` for literal data as of vroom 1.5.0.`. Thanks to @palderman for the fix in [Pull Request 67](https://github.com/ropensci/nasapower/pull/67). ## Minor changes From 0612050038500f629b34d499f4b5e473f7b03108 Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Tue, 1 Feb 2022 16:05:00 +0800 Subject: [PATCH 09/22] Update test fixtures for vcr --- tests/fixtures/API_failure.yml | 2 +- tests/fixtures/adjusted_air_pressure.yml | 19 ++++++++++--------- tests/fixtures/climatology_ag_point.yml | 16 ++++++++-------- tests/fixtures/daily_ag_point.yml | 18 +++++++++--------- tests/fixtures/daily_sb_point.yml | 18 +++++++++--------- tests/fixtures/temporal_api-warning.yml | 16 ++++++++-------- 6 files changed, 45 insertions(+), 44 deletions(-) diff --git a/tests/fixtures/API_failure.yml b/tests/fixtures/API_failure.yml index 16c90fa3..6a388fe7 100644 --- a/tests/fixtures/API_failure.yml +++ b/tests/fixtures/API_failure.yml @@ -1,7 +1,7 @@ http_interactions: - request: method: get - uri: https://power.larc.nasa.gov/api/temporal/daily/point?parameters=T2M&community=ag&start=19830101&end=19830101&longitude=-179.5&latitude=-89.5&format=csv&time_standard=utc&user=nasapower4031 + uri: https://power.larc.nasa.gov/api/temporal/daily/point?parameters=T2M&community=ag&start=19830101&end=19830101&longitude=-179.5&latitude=-89.5&format=csv&time_standard=utc&user=nasapower404 body: encoding: '' string: '' diff --git a/tests/fixtures/adjusted_air_pressure.yml b/tests/fixtures/adjusted_air_pressure.yml index d4e06ea3..28c9945d 100644 --- a/tests/fixtures/adjusted_air_pressure.yml +++ b/tests/fixtures/adjusted_air_pressure.yml @@ -1,7 +1,7 @@ http_interactions: - request: method: get - uri: https://power.larc.nasa.gov/api/temporal/daily/point?parameters=T2M%2CT2M_MIN%2CT2M_MAX%2CRH2M%2CWS10M%2CPS&community=ag&start=19830101&end=19830101&longitude=-179.5&latitude=-89.5&format=csv&time_standard=utc&user=nasapower4031 + uri: https://power.larc.nasa.gov/api/temporal/daily/point?parameters=T2M%2CT2M_MIN%2CT2M_MAX%2CRH2M%2CWS10M%2CPS&community=ag&start=19830101&end=19830101&longitude=-179.5&latitude=-89.5&format=csv&time_standard=utc&user=nasapower404 body: encoding: '' string: '' @@ -18,20 +18,21 @@ http_interactions: status: HTTP/1.1 200 OK content-type: text/csv content-length: '473' - x-ratelimit-remaining-minute: '59' + connection: close + x-ratelimit-remaining-minute: '56' x-ratelimit-limit-minute: '60' - ratelimit-remaining: '59' + ratelimit-remaining: '56' ratelimit-limit: '60' - ratelimit-reset: '59' - date: Tue, 01 Feb 2022 01:13:58 GMT + ratelimit-reset: '1' + date: Tue, 01 Feb 2022 08:02:55 GMT server: uvicorn content-disposition: attachment; filename=POWER_Point_Daily_19830101_19830101_89d50S_179d50W_LST.csv - x-archive-time: '2.158' + x-archive-time: '2.54' x-process-time: '0.03' - x-objects-time: '0.008' + x-objects-time: '0.006' content-encoding: gzip vary: Accept-Encoding - x-service-time: '2.198' + x-service-time: '2.578' x-app-version: v2.2.17 content-language: en-US strict-transport-security: max-age=31536000;includeSubDomains;preload @@ -51,5 +52,5 @@ http_interactions: (C) \r\nRH2M MERRA-2 Relative Humidity at 2 Meters (%) \r\nWS10M MERRA-2 Wind Speed at 10 Meters (m/s) \r\nPS MERRA-2 Surface Pressure (kPa) \r\n-END HEADER-\r\nYEAR,DOY,T2M,T2M_MIN,T2M_MAX,RH2M,WS10M,PS\n1983,1,-25.24,-25.67,-24.88,94.25,2.32,69.06\n" - recorded_at: 2022-02-01 01:14:03 GMT + recorded_at: 2022-02-01 08:03:02 GMT recorded_with: vcr/1.0.2, webmockr/0.8.0 diff --git a/tests/fixtures/climatology_ag_point.yml b/tests/fixtures/climatology_ag_point.yml index ca3189be..cc61f1d6 100644 --- a/tests/fixtures/climatology_ag_point.yml +++ b/tests/fixtures/climatology_ag_point.yml @@ -1,7 +1,7 @@ http_interactions: - request: method: get - uri: https://power.larc.nasa.gov/api/temporal/climatology/point?parameters=T2M&community=ag&longitude=-179.5&latitude=-89.5&format=csv&time_standard=utc&user=nasapower4031 + uri: https://power.larc.nasa.gov/api/temporal/climatology/point?parameters=T2M&community=ag&longitude=-179.5&latitude=-89.5&format=csv&time_standard=utc&user=nasapower404 body: encoding: '' string: '' @@ -22,16 +22,16 @@ http_interactions: x-ratelimit-limit-minute: '60' ratelimit-remaining: '59' ratelimit-limit: '60' - ratelimit-reset: '50' - date: Tue, 01 Feb 2022 01:14:10 GMT + ratelimit-reset: '51' + date: Tue, 01 Feb 2022 08:03:09 GMT server: uvicorn content-disposition: attachment; filename=POWER_Point_Climatology_Climatology_2001_2020_89d50S_179d50W_UTC.csv - x-archive-time: '0.518' - x-process-time: '0.06' - x-objects-time: '0.008' + x-archive-time: '0.484' + x-process-time: '0.05' + x-objects-time: '0.011' content-encoding: gzip vary: Accept-Encoding - x-service-time: '0.588' + x-service-time: '0.546' x-app-version: v2.2.15 content-language: en-US strict-transport-security: max-age=31536000;includeSubDomains;preload @@ -48,5 +48,5 @@ http_interactions: = 2885.03 meters\r\nValue for missing model data cannot be computed or out of model availability range: -999 \r\nParameter(s): \r\nT2M MERRA-2 Temperature at 2 Meters (C) \r\n-END HEADER-\r\nPARAMETER,JAN,FEB,MAR,APR,MAY,JUN,JUL,AUG,SEP,OCT,NOV,DEC,ANN\nT2M,-29.16,-40.68,-52.56,-57.06,-57.9,-59.46,-62.02,-61.4,-60.25,-52.29,-38.76,-28.66,-50.04\n" - recorded_at: 2022-02-01 01:14:11 GMT + recorded_at: 2022-02-01 08:03:10 GMT recorded_with: vcr/1.0.2, webmockr/0.8.0 diff --git a/tests/fixtures/daily_ag_point.yml b/tests/fixtures/daily_ag_point.yml index cc2afcf1..57195a89 100644 --- a/tests/fixtures/daily_ag_point.yml +++ b/tests/fixtures/daily_ag_point.yml @@ -1,7 +1,7 @@ http_interactions: - request: method: get - uri: https://power.larc.nasa.gov/api/temporal/daily/point?parameters=T2M%2CT2M_MIN%2CT2M_MAX%2CRH2M%2CWS10M%2CPS&community=ag&start=19830101&end=19830101&longitude=-179.5&latitude=-89.5&format=csv&time_standard=utc&user=nasapower4031 + uri: https://power.larc.nasa.gov/api/temporal/daily/point?parameters=T2M%2CT2M_MIN%2CT2M_MAX%2CRH2M%2CWS10M%2CPS&community=ag&start=19830101&end=19830101&longitude=-179.5&latitude=-89.5&format=csv&time_standard=utc&user=nasapower404 body: encoding: '' string: '' @@ -18,20 +18,20 @@ http_interactions: status: HTTP/1.1 200 OK content-type: text/csv content-length: '473' - x-ratelimit-remaining-minute: '59' + x-ratelimit-remaining-minute: '57' x-ratelimit-limit-minute: '60' - ratelimit-remaining: '59' + ratelimit-remaining: '57' ratelimit-limit: '60' - ratelimit-reset: '2' - date: Tue, 01 Feb 2022 01:13:58 GMT + ratelimit-reset: '4' + date: Tue, 01 Feb 2022 08:02:55 GMT server: uvicorn content-disposition: attachment; filename=POWER_Point_Daily_19830101_19830101_89d50S_179d50W_LST.csv - x-archive-time: '2.225' + x-archive-time: '2.483' x-process-time: '0.03' - x-objects-time: '0.007' + x-objects-time: '0.008' content-encoding: gzip vary: Accept-Encoding - x-service-time: '2.263' + x-service-time: '2.523' x-app-version: v2.2.17 content-language: en-US strict-transport-security: max-age=31536000;includeSubDomains;preload @@ -51,5 +51,5 @@ http_interactions: (C) \r\nRH2M MERRA-2 Relative Humidity at 2 Meters (%) \r\nWS10M MERRA-2 Wind Speed at 10 Meters (m/s) \r\nPS MERRA-2 Surface Pressure (kPa) \r\n-END HEADER-\r\nYEAR,DOY,T2M,T2M_MIN,T2M_MAX,RH2M,WS10M,PS\n1983,1,-25.24,-25.67,-24.88,94.25,2.32,69.06\n" - recorded_at: 2022-02-01 01:14:01 GMT + recorded_at: 2022-02-01 08:02:59 GMT recorded_with: vcr/1.0.2, webmockr/0.8.0 diff --git a/tests/fixtures/daily_sb_point.yml b/tests/fixtures/daily_sb_point.yml index 9318be26..ccba8aa9 100644 --- a/tests/fixtures/daily_sb_point.yml +++ b/tests/fixtures/daily_sb_point.yml @@ -1,7 +1,7 @@ http_interactions: - request: method: get - uri: https://power.larc.nasa.gov/api/temporal/daily/point?parameters=T2M%2CT2M_MIN%2CT2M_MAX%2CRH2M%2CWS10M&community=sb&start=19830101&end=19830101&longitude=-179.5&latitude=-89.5&format=csv&time_standard=utc&user=nasapower4031 + uri: https://power.larc.nasa.gov/api/temporal/daily/point?parameters=T2M%2CT2M_MIN%2CT2M_MAX%2CRH2M%2CWS10M&community=sb&start=19830101&end=19830101&longitude=-179.5&latitude=-89.5&format=csv&time_standard=utc&user=nasapower404 body: encoding: '' string: '' @@ -18,20 +18,20 @@ http_interactions: status: HTTP/1.1 200 OK content-type: text/csv content-length: '447' - x-ratelimit-remaining-minute: '58' + x-ratelimit-remaining-minute: '59' x-ratelimit-limit-minute: '60' - ratelimit-remaining: '58' + ratelimit-remaining: '59' ratelimit-limit: '60' ratelimit-reset: '56' - date: Tue, 01 Feb 2022 01:13:58 GMT + date: Tue, 01 Feb 2022 08:02:59 GMT server: uvicorn content-disposition: attachment; filename=POWER_Point_Daily_19830101_19830101_89d50S_179d50W_LST.csv - x-archive-time: '2.426' - x-process-time: '0.02' - x-objects-time: '0.012' + x-archive-time: '2.199' + x-process-time: '0.03' + x-objects-time: '0.007' content-encoding: gzip vary: Accept-Encoding - x-service-time: '2.46' + x-service-time: '2.238' x-app-version: v2.2.17 content-language: en-US strict-transport-security: max-age=31536000;includeSubDomains;preload @@ -50,5 +50,5 @@ http_interactions: at 2 Meters Minimum (C) \r\nT2M_MAX MERRA-2 Temperature at 2 Meters Maximum (C) \r\nRH2M MERRA-2 Relative Humidity at 2 Meters (%) \r\nWS10M MERRA-2 Wind Speed at 10 Meters (m/s) \r\n-END HEADER-\r\nYEAR,MO,DY,T2M,T2M_MIN,T2M_MAX,RH2M,WS10M\n1983,1,1,-25.24,-25.67,-24.88,94.25,2.32\n" - recorded_at: 2022-02-01 01:14:07 GMT + recorded_at: 2022-02-01 08:03:06 GMT recorded_with: vcr/1.0.2, webmockr/0.8.0 diff --git a/tests/fixtures/temporal_api-warning.yml b/tests/fixtures/temporal_api-warning.yml index 41092cc9..08b45fe6 100644 --- a/tests/fixtures/temporal_api-warning.yml +++ b/tests/fixtures/temporal_api-warning.yml @@ -1,7 +1,7 @@ http_interactions: - request: method: get - uri: https://power.larc.nasa.gov/api/temporal/daily/point?parameters=T2M&community=ag&start=19830101&end=19830101&longitude=-179.5&latitude=-89.5&format=csv&time_standard=utc&user=nasapower4031 + uri: https://power.larc.nasa.gov/api/temporal/daily/point?parameters=T2M&community=ag&start=19830101&end=19830101&longitude=-179.5&latitude=-89.5&format=csv&time_standard=utc&user=nasapower404 body: encoding: '' string: '' @@ -18,20 +18,20 @@ http_interactions: status: HTTP/1.1 200 OK content-type: text/csv content-length: '343' - x-ratelimit-remaining-minute: '54' + x-ratelimit-remaining-minute: '55' x-ratelimit-limit-minute: '60' - ratelimit-remaining: '54' + ratelimit-remaining: '55' ratelimit-limit: '60' - ratelimit-reset: '33' - date: Tue, 01 Feb 2022 01:14:24 GMT + ratelimit-reset: '34' + date: Tue, 01 Feb 2022 08:03:09 GMT server: uvicorn content-disposition: attachment; filename=POWER_Point_Daily_19830101_19830101_89d50S_179d50W_LST.csv - x-archive-time: '2.388' + x-archive-time: '2.542' x-process-time: '0.02' x-objects-time: '0.006' content-encoding: gzip vary: Accept-Encoding - x-service-time: '2.415' + x-service-time: '2.57' x-app-version: v2.2.17 content-language: en-US strict-transport-security: max-age=31536000;includeSubDomains;preload @@ -47,5 +47,5 @@ http_interactions: degree lat/lon region = 2885.03 meters\r\nValue for missing model data cannot be computed or out of model availability range: -999 \r\nParameter(s): \r\nT2M \ MERRA-2 Temperature at 2 Meters (C) \r\n-END HEADER-\r\nYEAR,DOY,T2M\n1983,1,-25.24\n" - recorded_at: 2022-02-01 01:14:30 GMT + recorded_at: 2022-02-01 08:03:29 GMT recorded_with: vcr/1.0.2, webmockr/0.8.0 From 7038388f337f6f575ab3afdf4a8b20b3d875c12a Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Tue, 1 Feb 2022 16:05:22 +0800 Subject: [PATCH 10/22] rewrite codemeta.json --- codemeta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codemeta.json b/codemeta.json index 895d3711..c98e9c6c 100644 --- a/codemeta.json +++ b/codemeta.json @@ -225,7 +225,7 @@ "applicationCategory": "Tools", "isPartOf": "https://ropensci.org", "keywords": ["NASA", "meteorological-data", "weather", "global", "weather-data", "meteorology", "NASA-POWER", "agroclimatology", "earth-science", "data-access", "climate-data", "r", "nasa-power", "nasa", "agroclimatology-data", "weather-variables", "rstats", "r-package"], - "fileSize": "367.091KB", + "fileSize": "367.107KB", "citation": [ { "@type": "ScholarlyArticle", From 4cbdfa4795c0af9aff20b33187e20a83aae211f5 Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Tue, 1 Feb 2022 16:15:12 +0800 Subject: [PATCH 11/22] Fix codecov link --- README.Rmd | 3 ++- README.md | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.Rmd b/README.Rmd index 570a7076..6376230b 100644 --- a/README.Rmd +++ b/README.Rmd @@ -4,8 +4,9 @@ output: github_document # _nasapower_: NASA POWER API Client + [![tic](https://github.com/ropensci/nasapower/workflows/tic/badge.svg?branch=main)](https://github.com/ropensci/nasapower/actions) -[![codecov](https://codecov.io/gh/ropensci/nasapower/branch/master/graph/badge.svg?token=Kq9aea0TQN)](https://codecov.io/gh/ropensci/nasapower) +[![codecov](https://codecov.io/gh/ropensci/nasapower/branch/master/graph/badge.svg?token=Kq9aea0TQN)](https://app.codecov.io/gh/ropensci/nasapower) [![DOI](https://zenodo.org/badge/109224461.svg)](https://zenodo.org/badge/latestdoi/109224461) [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![peer-review](https://badges.ropensci.org/155_status.svg)](https://github.com/ropensci/software-review/issues/155) diff --git a/README.md b/README.md index 68efac85..f62e7bda 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![tic](https://github.com/ropensci/nasapower/workflows/tic/badge.svg?branch=main)](https://github.com/ropensci/nasapower/actions) -[![codecov](https://codecov.io/gh/ropensci/nasapower/branch/master/graph/badge.svg?token=Kq9aea0TQN)](https://codecov.io/gh/ropensci/nasapower) +[![codecov](https://codecov.io/gh/ropensci/nasapower/branch/master/graph/badge.svg?token=Kq9aea0TQN)](https://app.codecov.io/gh/ropensci/nasapower) [![DOI](https://zenodo.org/badge/109224461.svg)](https://zenodo.org/badge/latestdoi/109224461) [![Project Status: Active – The project has reached a stable, usable state and is being actively From 0fc24b40aebb8783a96b0ef7fb6ae0cefa8eb9be Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Tue, 1 Feb 2022 16:15:23 +0800 Subject: [PATCH 12/22] Update codemeta.json --- codemeta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codemeta.json b/codemeta.json index c98e9c6c..48576eb2 100644 --- a/codemeta.json +++ b/codemeta.json @@ -225,7 +225,7 @@ "applicationCategory": "Tools", "isPartOf": "https://ropensci.org", "keywords": ["NASA", "meteorological-data", "weather", "global", "weather-data", "meteorology", "NASA-POWER", "agroclimatology", "earth-science", "data-access", "climate-data", "r", "nasa-power", "nasa", "agroclimatology-data", "weather-variables", "rstats", "r-package"], - "fileSize": "367.107KB", + "fileSize": "367.111KB", "citation": [ { "@type": "ScholarlyArticle", From 36c0f47f3371b9412dfde18091ceea6a7dc0e182 Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Tue, 1 Feb 2022 16:22:34 +0800 Subject: [PATCH 13/22] Fix package name for WAAA contribution --- DESCRIPTION | 4 ++-- man/nasapower-package.Rd | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index b693ff9b..0ad2529d 100755 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -53,8 +53,8 @@ Authors@R: https://github.com/ropensci/nasapower/pull/67.")), person(given = "Western Australia Agriculture Authority (WAAA)", role = "cph", - comment = c("Supported the development of ascotraceR through Adam - H. Sparks' time."))) + comment = c("Supported the development of nasapower through Adam H. + Sparks' time."))) URL: https://docs.ropensci.org/nasapower/ BugReports: https://github.com/ropensci/nasapower/issues Description: Client for 'NASA' 'POWER' global meteorology, surface solar diff --git a/man/nasapower-package.Rd b/man/nasapower-package.Rd index 834226b3..025d7011 100644 --- a/man/nasapower-package.Rd +++ b/man/nasapower-package.Rd @@ -29,7 +29,7 @@ Other contributors: \item Fernando Miguez \email{femiguez@iastate.edu} (\href{https://orcid.org/0000-0002-4627-8329}{ORCID}) (Fernando Miguez provided assistance in identifying improper missing value handling in the POWER data, see .) [contributor] \item Maëlle Salmon (\href{https://orcid.org/0000-0002-2815-0399}{ORCID}) (Maëlle Salmon contributed a patch to fix issues with using the R package, 'vcr', for testing the 'API' queries, see .) [contributor] \item Phillip D. Alderman \email{phillip.alderman@okstate.edu} (\href{https://orcid.org/0000-0003-1467-2337}{ORCID}) (Phillip Alderman contributed a patch to fix an issue with, 'The `file` argument of `vroom()` must use `I()` for literal data as of vroom 1.5.0.', see https://github.com/ropensci/nasapower/pull/67.) [contributor] - \item Western Australia Agriculture Authority (WAAA) (Supported the development of ascotraceR through Adam H. Sparks' time.) [copyright holder] + \item Western Australia Agriculture Authority (WAAA) (Supported the development of nasapower through Adam H. Sparks' time.) [copyright holder] } } From aa55a202a608c6da9651518232d69a5b2a040dda Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Tue, 1 Feb 2022 16:22:46 +0800 Subject: [PATCH 14/22] Update spelling wordlist --- inst/WORDLIST | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/inst/WORDLIST b/inst/WORDLIST index 85bf7b7d..1534db87 100644 --- a/inst/WORDLIST +++ b/inst/WORDLIST @@ -15,6 +15,7 @@ ROxygen Rdata SFC Standardise +WAAA WS YYYY acknowledgement @@ -53,6 +54,6 @@ ropensci sb terra tibble -useragent vcr +vroom zzz From 11e69a1bc4ea4b3f4148d1f36dbc013e653e0ab9 Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Tue, 1 Feb 2022 16:22:55 +0800 Subject: [PATCH 15/22] Update codemeta.json --- codemeta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codemeta.json b/codemeta.json index 48576eb2..897e27b1 100644 --- a/codemeta.json +++ b/codemeta.json @@ -225,7 +225,7 @@ "applicationCategory": "Tools", "isPartOf": "https://ropensci.org", "keywords": ["NASA", "meteorological-data", "weather", "global", "weather-data", "meteorology", "NASA-POWER", "agroclimatology", "earth-science", "data-access", "climate-data", "r", "nasa-power", "nasa", "agroclimatology-data", "weather-variables", "rstats", "r-package"], - "fileSize": "367.111KB", + "fileSize": "367.11KB", "citation": [ { "@type": "ScholarlyArticle", From 71e78032237930505a6a34de08d9a7e7652c18ec Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Tue, 1 Feb 2022 16:35:10 +0800 Subject: [PATCH 16/22] Reknit vignette --- vignettes/nasapower.Rmd | 98 ++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 64 deletions(-) diff --git a/vignettes/nasapower.Rmd b/vignettes/nasapower.Rmd index 65a327f3..865bb812 100644 --- a/vignettes/nasapower.Rmd +++ b/vignettes/nasapower.Rmd @@ -51,19 +51,19 @@ daily_single_ag #> PRECTOTCORR MERRA-2 Precipitation Corrected (mm/day) #> #> # A tibble: 31 × 10 -#> LON LAT YEAR MM DD DOY YYYYMMDD RH2M T2M -#> -#> 1 152. -27.5 1985 1 1 1 1985-01-01 54.7 24.9 -#> 2 152. -27.5 1985 1 2 2 1985-01-02 42.1 28.6 -#> 3 152. -27.5 1985 1 3 3 1985-01-03 43.4 27.4 -#> 4 152. -27.5 1985 1 4 4 1985-01-04 48.9 24.3 -#> 5 152. -27.5 1985 1 5 5 1985-01-05 55.3 26.5 -#> 6 152. -27.5 1985 1 6 6 1985-01-06 60.2 27.0 -#> 7 152. -27.5 1985 1 7 7 1985-01-07 63.1 27.2 -#> 8 152. -27.5 1985 1 8 8 1985-01-08 70.6 24.9 -#> 9 152. -27.5 1985 1 9 9 1985-01-09 60 26.1 -#> 10 152. -27.5 1985 1 10 10 1985-01-10 45.2 27.0 -#> # … with 21 more rows, and 1 more variable: PRECTOTCORR +#> LON LAT YEAR MM DD DOY YYYYMMDD RH2M T2M PRECTOTCORR +#> +#> 1 152. -27.5 1985 1 1 1 1985-01-01 54.7 24.9 0.9 +#> 2 152. -27.5 1985 1 2 2 1985-01-02 42.1 28.6 0.49 +#> 3 152. -27.5 1985 1 3 3 1985-01-03 43.4 27.4 0.01 +#> 4 152. -27.5 1985 1 4 4 1985-01-04 48.9 24.3 0.05 +#> 5 152. -27.5 1985 1 5 5 1985-01-05 55.3 26.5 1.33 +#> 6 152. -27.5 1985 1 6 6 1985-01-06 60.2 27.0 4.88 +#> 7 152. -27.5 1985 1 7 7 1985-01-07 63.1 27.2 10.7 +#> 8 152. -27.5 1985 1 8 8 1985-01-08 70.6 24.9 10 +#> 9 152. -27.5 1985 1 9 9 1985-01-09 60 26.1 2.45 +#> 10 152. -27.5 1985 1 10 10 1985-01-10 45.2 27.0 0.48 +#> # … with 21 more rows ``` ### Example fetching daily data for an area @@ -136,21 +136,20 @@ interannual_re #> CLRSKY_SFC_SW_DWN CERES SYN1deg Clear Sky Surface Shortwave Downward Irradiance (kW-hr/m^2/day) #> #> # A tibble: 144 × 17 -#> PARAMETER YEAR LAT LON JAN FEB MAR APR MAY -#> -#> 1 ALLSKY_SFC… 1984 -25.8 151. 6.01 6.49 5.79 4.67 4.12 -#> 2 ALLSKY_SFC… 1984 -25.8 151. 5.92 5.97 5.64 4.37 4.01 -#> 3 ALLSKY_SFC… 1984 -25.8 152. 5.92 5.97 5.64 4.37 4.01 -#> 4 ALLSKY_SFC… 1984 -25.8 152. 5.96 5.85 5.56 4.26 3.92 -#> 5 ALLSKY_SFC… 1984 -25.8 153. 5.96 5.85 5.56 4.26 3.92 -#> 6 ALLSKY_SFC… 1984 -25.8 153. 6.23 6.05 5.88 4.26 3.81 -#> 7 ALLSKY_SFC… 1984 -26.2 151. 5.97 6.65 6 4.66 4.02 -#> 8 ALLSKY_SFC… 1984 -26.2 151. 6 6.38 5.71 4.38 4.01 -#> 9 ALLSKY_SFC… 1984 -26.2 152. 6 6.38 5.71 4.38 4.01 -#> 10 ALLSKY_SFC… 1984 -26.2 152. 5.75 5.96 5.37 4.13 3.8 -#> # … with 134 more rows, and 8 more variables: JUN , -#> # JUL , AUG , SEP , OCT , NOV , -#> # DEC , ANN +#> PARAMETER YEAR LAT LON JAN FEB MAR APR MAY JUN JUL +#> +#> 1 ALLSKY_SFC_… 1984 -25.8 151. 6.01 6.49 5.79 4.67 4.12 3.77 2.46 +#> 2 ALLSKY_SFC_… 1984 -25.8 151. 5.92 5.97 5.64 4.37 4.01 3.61 2.6 +#> 3 ALLSKY_SFC_… 1984 -25.8 152. 5.92 5.97 5.64 4.37 4.01 3.61 2.6 +#> 4 ALLSKY_SFC_… 1984 -25.8 152. 5.96 5.85 5.56 4.26 3.92 3.52 2.66 +#> 5 ALLSKY_SFC_… 1984 -25.8 153. 5.96 5.85 5.56 4.26 3.92 3.52 2.66 +#> 6 ALLSKY_SFC_… 1984 -25.8 153. 6.23 6.05 5.88 4.26 3.81 3.3 2.96 +#> 7 ALLSKY_SFC_… 1984 -26.2 151. 5.97 6.65 6 4.66 4.02 3.72 2.28 +#> 8 ALLSKY_SFC_… 1984 -26.2 151. 6 6.38 5.71 4.38 4.01 3.66 2.17 +#> 9 ALLSKY_SFC_… 1984 -26.2 152. 6 6.38 5.71 4.38 4.01 3.66 2.17 +#> 10 ALLSKY_SFC_… 1984 -26.2 152. 5.75 5.96 5.37 4.13 3.8 3.44 2.38 +#> # … with 134 more rows, and 6 more variables: AUG , SEP , +#> # OCT , NOV , DEC , ANN ``` ### Example fetching climatology data @@ -171,7 +170,7 @@ climatology_ag <- get_power( climatology_ag #> NASA/POWER CERES/MERRA2 Native Resolution Climatology Climatologies -#> 30-year Meteorological and Solar Monthly & Annual Climatologies (January 1990 - December 2019) +#> 20-year Meteorological and Solar Monthly & Annual Climatologies (January 2001 - December 2020) #> Location: Latitude -27.48 Longitude 151.81 #> Elevation from MERRA-2: Average for 0.5 x 0.625 degree lat/lon region = 442.77 meters #> Value for missing model data cannot be computed or out of model availability range: NA @@ -182,12 +181,12 @@ climatology_ag #> RH2M MERRA-2 Relative Humidity at 2 Meters (%) #> #> # A tibble: 2 × 16 -#> LON LAT PARAMETER JAN FEB MAR APR MAY JUN -#> -#> 1 152. -27.5 T2M 24.3 23.5 21.8 18.7 15.1 12.2 -#> 2 152. -27.5 RH2M 65.5 70.1 70.4 70.1 71.8 75.5 -#> # … with 7 more variables: JUL , AUG , SEP , -#> # OCT , NOV , DEC , ANN +#> LON LAT PARAMETER JAN FEB MAR APR MAY JUN JUL AUG +#> +#> 1 152. -27.5 T2M 24.7 23.7 22.0 19.0 15.1 12.6 11.6 13.1 +#> 2 152. -27.5 RH2M 64.7 69.6 71.1 70.5 69.1 75.1 70.4 63.1 +#> # … with 5 more variables: SEP , OCT , NOV , DEC , +#> # ANN ``` _Note_ the associated metadata in the data frame header are not saved if the data are exported to a file format other than an R data format, _e.g._, .Rdata, .rda or .rds. @@ -1380,35 +1379,6 @@ query_parameters(community = "ag", #> [1] "The diffuse (light energy scattered out of the direction of the sun) solar irradiance incident on a horizontal plane at the surface of the earth under clear sky conditions." #> #> -#> $CLRSKY_SFC_SW_DIRH -#> $CLRSKY_SFC_SW_DIRH$type -#> [1] "RADIATION" -#> -#> $CLRSKY_SFC_SW_DIRH$temporal -#> [1] "HOURLY" -#> -#> $CLRSKY_SFC_SW_DIRH$source -#> [1] "CERES" -#> -#> $CLRSKY_SFC_SW_DIRH$community -#> [1] "AG" -#> -#> $CLRSKY_SFC_SW_DIRH$calculated -#> [1] FALSE -#> -#> $CLRSKY_SFC_SW_DIRH$inputs -#> NULL -#> -#> $CLRSKY_SFC_SW_DIRH$units -#> [1] "MJ/m^2/day" -#> -#> $CLRSKY_SFC_SW_DIRH$name -#> [1] "Clear Sky Surface Shortwave Direct Horizontal Irradiance" -#> -#> $CLRSKY_SFC_SW_DIRH$definition -#> [1] "The direct solar irradiance incident on a horizontal plane at the surface of the earth under clear sky conditions." -#> -#> #> $CLRSKY_SFC_SW_DWN #> $CLRSKY_SFC_SW_DWN$type #> [1] "RADIATION" From fd302266fad878c5ef05831973e1011e1d2387fc Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Tue, 1 Feb 2022 16:35:37 +0800 Subject: [PATCH 17/22] Update codemeta.json --- codemeta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codemeta.json b/codemeta.json index 897e27b1..fb691853 100644 --- a/codemeta.json +++ b/codemeta.json @@ -225,7 +225,7 @@ "applicationCategory": "Tools", "isPartOf": "https://ropensci.org", "keywords": ["NASA", "meteorological-data", "weather", "global", "weather-data", "meteorology", "NASA-POWER", "agroclimatology", "earth-science", "data-access", "climate-data", "r", "nasa-power", "nasa", "agroclimatology-data", "weather-variables", "rstats", "r-package"], - "fileSize": "367.11KB", + "fileSize": "366.733KB", "citation": [ { "@type": "ScholarlyArticle", From 6706ad19bb63925df6d8d2ac786d41373745ab21 Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Tue, 1 Feb 2022 16:35:52 +0800 Subject: [PATCH 18/22] Update cran-comments for release --- cran-comments.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cran-comments.md b/cran-comments.md index 8a9b79d9..420d4b6f 100755 --- a/cran-comments.md +++ b/cran-comments.md @@ -6,7 +6,7 @@ Sorry for the inconvenience, but I thought this was better to submit a new(er) v ## Test environments * local macOS, Platform: aarch64-apple-darwin20 (64-bit), R 4.1.2 -* win-builder, R Under development (unstable) (2021-12-17 r81389 ucrt) +* win-builder, R Under development (unstable) (2022-01-31 r81608 ucrt) * win-builder, R 4.1.2 ## R CMD check results From d3839aa1b6fe562187445776717ec9d98ee7ffa5 Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Tue, 1 Feb 2022 17:04:06 +0800 Subject: [PATCH 19/22] Revdepcheck --- revdep/README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/revdep/README.md b/revdep/README.md index 29ccaf70..e79e3fcc 100644 --- a/revdep/README.md +++ b/revdep/README.md @@ -2,23 +2,24 @@ |field |value | |:--------|:------------------------------------| -|version |R version 4.1.2 (2021-11-01) | -|os |macOS Monterey 12.0.1 | +|version |R version 4.1.0 (2021-05-18) | +|os |macOS 12.2 | |system |x86_64, darwin17.0 | |ui |RStudio | |language |(EN) | |collate |en_AU.UTF-8 | |ctype |en_AU.UTF-8 | |tz |Australia/Perth | -|date |2021-12-12 | +|date |2022-02-01 | |rstudio |2021.09.0+351 Ghost Orchid (desktop) | -|pandoc |2.13 @ /usr/local/bin/pandoc | +|pandoc |2.14.0.1 @ /usr/local/bin/pandoc | # Dependencies |package |old |new |Δ | |:---------|:-----|:-----|:--| -|nasapower |4.0.1 |4.0.2 |* | +|nasapower |4.0.3 |4.0.4 |* | +|readr |NA |2.1.1 |* | # Revdeps From 972131c60917c1cf880f281fec93ef25da0b1ae1 Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Tue, 1 Feb 2022 17:04:37 +0800 Subject: [PATCH 20/22] Update CRAN comments --- cran-comments.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cran-comments.md b/cran-comments.md index 420d4b6f..48451e69 100755 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,8 +1,4 @@ -# nasapower v4.0.3 - -This submission supersedes v4.0.2, which should not be released to CRAN due to issues in the tests. -This submission skips all tests requiring API connectivity on CRAN fixing this issue introduced with 4.0.2. -Sorry for the inconvenience, but I thought this was better to submit a new(er) version rather than causing failures on CRAN servers. +# nasapower v4.0.4 ## Test environments * local macOS, Platform: aarch64-apple-darwin20 (64-bit), R 4.1.2 From 091fd65583f4d479856a4c2b874a5c40bd10127e Mon Sep 17 00:00:00 2001 From: Adam Sparks Date: Tue, 1 Feb 2022 17:08:56 +0800 Subject: [PATCH 21/22] Add CRAN-SUBMISSION --- CRAN-SUBMISSION | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 CRAN-SUBMISSION diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION new file mode 100644 index 00000000..bba698af --- /dev/null +++ b/CRAN-SUBMISSION @@ -0,0 +1,3 @@ +Version: 4.0.4 +Date: 2022-02-01 09:08:10 UTC +SHA: 972131c60917c1cf880f281fec93ef25da0b1ae1 From 44f423e6c57e3851b66eb1843c08fb9cc44cb8f4 Mon Sep 17 00:00:00 2001 From: "Adam H. Sparks" Date: Tue, 1 Feb 2022 17:59:19 +0800 Subject: [PATCH 22/22] Delete CRAN-SUBMISSION --- CRAN-SUBMISSION | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 CRAN-SUBMISSION diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION deleted file mode 100644 index bba698af..00000000 --- a/CRAN-SUBMISSION +++ /dev/null @@ -1,3 +0,0 @@ -Version: 4.0.4 -Date: 2022-02-01 09:08:10 UTC -SHA: 972131c60917c1cf880f281fec93ef25da0b1ae1