Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
030edf4
First steps in switching to httr2
ldecicco-USGS Oct 23, 2024
84cb3cc
Getting there!
ldecicco-USGS Oct 24, 2024
ffbfaa3
udpates from main
ldecicco-USGS Oct 24, 2024
a8f236e
update ua
ldecicco-USGS Oct 24, 2024
ea8170a
start
ldecicco-USGS Oct 24, 2024
d829f26
Merge branch 'main' of https://code.usgs.gov/water/dataRetrieval into…
ldecicco-USGS Nov 1, 2024
6062607
cleaning up WQP calls
ldecicco-USGS Nov 1, 2024
af0b523
style
ldecicco-USGS Nov 1, 2024
f1bbab0
getting the lists correct
ldecicco-USGS Nov 2, 2024
993a2a4
More NWIS and WQP httr2 updates
ldecicco-USGS Nov 3, 2024
9fca4e2
a few httr2 updates
ldecicco-USGS Nov 4, 2024
313fdda
Fixing some tests. Mostly arguments in the URLs are shuffled around.
ldecicco-USGS Nov 4, 2024
f09bb35
wrong argument
ldecicco-USGS Nov 4, 2024
90cb26c
More tests to fix and update findNLDI
ldecicco-USGS Nov 4, 2024
746d32c
local file tests
ldecicco-USGS Nov 4, 2024
47e35a7
getting water use URLs to work
ldecicco-USGS Nov 5, 2024
790f924
more test url updates
ldecicco-USGS Nov 5, 2024
82318a9
everything except NGWMN working
ldecicco-USGS Nov 5, 2024
9792060
NGWMN
ldecicco-USGS Nov 5, 2024
111feb5
Dropping problimatic example (data source keeps changing)
ldecicco-USGS Nov 5, 2024
6bfc32a
Upstream pull
ldecicco-USGS Nov 5, 2024
d289745
adding count=no to legacy
ldecicco-USGS Nov 5, 2024
7ad1ed5
updating docker file
ldecicco-USGS Nov 5, 2024
20fa9e7
run check on develop
ldecicco-USGS Nov 5, 2024
8f93afe
Fix test due to my last minute addition of count=no to legacy WQP
ldecicco-USGS Nov 5, 2024
8ee4a7a
change example
ldecicco-USGS Nov 5, 2024
0b60de4
Another set of multi's
ldecicco-USGS Nov 5, 2024
6146ebb
wqp_check_status example
ldecicco-USGS Nov 5, 2024
722ed47
Trying new GH actions to reduce suggest list, and responding to a few…
ldecicco-USGS Nov 25, 2024
0b30821
Shame, shame, shame! 😔
ldecicco-USGS Nov 25, 2024
1704e18
Meant to include this so we can test if the GH actions work (building…
ldecicco-USGS Nov 25, 2024
29ecfcb
More updates thanks to Joe's review
ldecicco-USGS Nov 25, 2024
9ce4776
Custom .multi for legacy
ldecicco-USGS Nov 25, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading