Skip to content

Commit

Permalink
Merge pull request #738 from ldecicco-USGS/httr2
Browse files Browse the repository at this point in the history
Initial switch to httr2
  • Loading branch information
ldecicco-USGS authored Nov 25, 2024
2 parents 8277747 + 9ce4776 commit 35a957f
Show file tree
Hide file tree
Showing 42 changed files with 643 additions and 689 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main]
branches: [main, develop]
pull_request:
branches: [main]
branches: [main, develop]

name: R-CMD-check

Expand Down Expand Up @@ -36,15 +36,16 @@ jobs:

- uses: r-lib/actions/setup-pandoc@6012817847b5f064d0882d67a7b5e2ca6639afb2

- uses: r-lib/actions/setup-r@15cf1013badbaf6d25f100593ad5d7d75e65d64b
- uses: r-lib/actions/setup-r@473c68190595b311a74f208fba61a8d8c0d4c247
with:
r-version: ${{ matrix.config.r }}
http-user-agent: ${{ matrix.config.http-user-agent }}
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@96b1dc658a45175f93ed5f33fda2b2cebbb12ee8
with:
extra-packages: any::rcmdcheck
extra-packages: |
any::rcmdcheck
needs: check

- uses: r-lib/actions/check-r-package@3e56ca41aa267855f36891af7a495d24bfaa8373
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,15 @@ jobs:

- uses: r-lib/actions/setup-r-dependencies@52330cc136b963487918a8867f948ddf954e9e63
with:
extra-packages: any::pkgdown, local::.
extra-packages: |
any::pkgdown
any::rcmdcheck
any::DT
any::data.table
any::dplyr
any::tidyr
any::gridExtra
local::.
needs: website

- name: Build site
Expand Down
11 changes: 3 additions & 8 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,19 @@ Copyright: This software is in the public domain because it contains materials
that originally came from the United States Geological Survey, an agency of
the United States Department of Interior.
Depends:
R (>= 3.5.0)
R (>= 4.1.0)
Imports:
httr (>= 1.0.0),
curl,
lubridate (>= 1.5.0),
stats,
utils,
xml2,
readr (>= 1.4.0),
jsonlite
jsonlite,
httr2
Suggests:
covr,
dplyr,
ggplot2,
tidyr,
data.table,
DT,
gridExtra,
knitr,
rmarkdown,
sf,
Expand Down
1 change: 1 addition & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
dataRetrieval 2.7.18
===================
* Switched from httr to httr2
* Added a way to include a custom user-agent suffix via an enviornmental variable "CUSTOM_DR_UA"

dataRetrieval 2.7.17
Expand Down
Loading

0 comments on commit 35a957f

Please sign in to comment.