Fix conflict after pulling from master

Merge branch 'master' of https://github.com/rte-antares-rpackage/antaresRead into ant2389 # Conflicts: # NEWS.md
rte-antares-rpackage · Nov 20, 2024 · b774f15 · b774f15
2 parents de0364f + bd47bac
commit b774f15
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/NAMESPACE b/NAMESPACE
@@ -90,6 +90,7 @@ importFrom(httr,content_type_json)
 importFrom(httr,http_status)
 importFrom(httr,stop_for_status)
 importFrom(httr,timeout)
+importFrom(httr,warn_for_status)
 importFrom(lifecycle,deprecated)
 importFrom(memuse,Sys.meminfo)
 importFrom(methods,is)

diff --git a/NEWS.md b/NEWS.md
@@ -6,6 +6,7 @@
 
 BUGFIXES :
 * `setSimulationPathAPI()` : encode URL before reading the data in simulation mode
+* `api_get()` : add warn_for_status in importFrom section
 * `readAntares()` : In disk mode, return all the available columns for a short-term storage output and match the column with the content
 
 BREAKING CHANGES :  

diff --git a/R/API-methods.R b/R/API-methods.R
@@ -14,7 +14,7 @@
 #'
 #' @name API-methods
 #'
-#' @importFrom httr GET accept_json stop_for_status content add_headers timeout
+#' @importFrom httr GET accept_json stop_for_status warn_for_status content add_headers timeout
 #'
 #' @examples
 #' \dontrun{