Skip to content

Commit

Permalink
Merge pull request #51 from ropensci/devel
Browse files Browse the repository at this point in the history
Devel
  • Loading branch information
adamhsparks committed Oct 10, 2020
2 parents 30b29ee + 7a719ad commit e0b3a89
Show file tree
Hide file tree
Showing 21 changed files with 586 additions and 1,485 deletions.
9 changes: 3 additions & 6 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: nasapower
Type: Package
Title: NASA POWER API Client
Version: 2.0.0
Version: 3.0.0
Authors@R:
c(person(given = "Adam H.",
family = "Sparks",
Expand Down Expand Up @@ -40,14 +40,12 @@ Depends:
R (>= 3.5.0)
License: MIT + file LICENSE
Imports:
APSIM,
crul,
curl,
lubridate,
jsonlite,
readr,
tibble,
utils
tibble
RoxygenNote: 7.1.1
Encoding: UTF-8
Language: en-AU
Expand All @@ -64,8 +62,7 @@ Suggests:
rmarkdown,
rnaturalearth,
sf,
testthat,
vcr
testthat
VignetteBuilder: knitr
X-schema.org-applicationCategory: Tools
X-schema.org-keywords: NASA, meteorological-data, weather, global, weather,
Expand Down
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Generated by roxygen2: do not edit by hand

S3method(print,POWER.Info)
export(create_icasa)
export(create_met)
export(get_power)
27 changes: 16 additions & 11 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
# nasapower 2.0.0
# nasapower 3.0.0

## Bug Fixes
## Major Changes to Functionality

* Correct any missing or redirecting URLs
* Due to the removal of the CRAN package _APSIM_ from CRAN, the removal of the `create_met()` function has been implemented sooner than expected to keep _nasapower_ on CRAN

* Replace deprecated `subclass` with `class` in `new_tibble()`
* Deprecates `create_met()`

## Bug fixes

* Properly deprecates `create_icasa()`

# nasapower 2.0.0

## Bug Fixes

* Correct any missing or redirecting URLs

Expand Down Expand Up @@ -159,17 +167,15 @@ These tests should be skipped on CRAN but were not.

- Corrects logical operators `&&` and `||` where they should be `&` or `|`

- Removes extra code in `create_icasa()` and `create_met()` that performed
a duplicated check of `latlon` values
- Removes extra code in `create_icasa()` and `create_met()` that performed a duplicated check of `latlon` values

- Removes unnecessary checks for `latlon` in `get_power()`

# nasapower 1.0.1

## Minor changes

- Provides corrections to documentation formatting as per CRAN volunteers'
requests
- Provides corrections to documentation formatting as per CRAN volunteers' requests

- Provides edits and clarifications in DESCRIPTION's Description and Title about the package's uses and capabilities

Expand All @@ -183,12 +189,11 @@ requests

- Uses new 'POWER' 'API' to download new 1/2 x 1/2 degree data

- Adds function `get_power()` to get weather data and optionally metadata as
well
- Adds function `get_power()` to get weather data and optionally metadata as well

- Adds function `create_met()` to create 'APSIM' met objects from 'POWER' data

- Adsd function `create_icasa()` to create a text file of weather data for use in 'DSSAT' crop modelling
- Adds function `create_icasa()` to create a text file of weather data for use in 'DSSAT' crop modelling

- Internally, replaces _httr_ package with _crul_

Expand Down
244 changes: 0 additions & 244 deletions R/deprecated_create_met.R

This file was deleted.

2 changes: 1 addition & 1 deletion R/internal_functions.R
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@
}
}

#' Prints Power.Info object.
#' Prints Power.Info object
#'
#' @param x POWER.Info object
#' @param ... ignored
Expand Down
30 changes: 30 additions & 0 deletions R/nasapower-defunct.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#' @name nasapower-defunct
#'
#' @title Defunct functions in \CRANpkg{nasapower}
#'
#' These functions are gone, no longer available.
#'
#' \itemize{
#' \item \code{\link{create_icasa}}: This function is defunct.
#' \item \code{\link{create_met}}: This function is defunct.
#' }
#'
NULL

#' @details `create_met()` is now defunct and has been removed from
#' \CRANpkg{nasapower}
#' @param ... unused arguments
#' @rdname nasapower-defunct
#' @export
create_met <- function(...){
.Defunct()
}

#' @details `create_icasa()` is now defunct and has been removed from
#' \CRANpkg{nasapower}
#' @param ... unused arguments
#' @rdname nasapower-defunct
#' @export
create_icasa <- function(...){
.Defunct()
}
Loading

0 comments on commit e0b3a89

Please sign in to comment.