From 0e268a1af5a0d4b8590a1de54b33bed3bc63ddcb Mon Sep 17 00:00:00 2001 From: Robin Lovelace Date: Mon, 2 Sep 2024 13:36:07 +0100 Subject: [PATCH 01/19] timeout in GET() Close #91 --- R/batch.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/batch.R b/R/batch.R index eda65bb..4c5f4d4 100644 --- a/R/batch.R +++ b/R/batch.R @@ -207,7 +207,7 @@ get_routes = function(url, desire_lines = NULL, filename, directory, if(file.exists(filename_local)) { message(filename, " already exists, overwriting it") } - httr::GET(url, httr::write_disk(filename_local, overwrite = TRUE)) + httr::GET(url, httr::write_disk(filename_local, overwrite = TRUE), httr::timeout(600)) # R.utils::gzip(filename_local) # routes = batch_read(gsub(pattern = ".gz", replacement = "", filename_local)) # list.files(tempdir()) From 9ee25cb8d7890dadcec682437290bbab70b1c4f9 Mon Sep 17 00:00:00 2001 From: robinlovelace Date: Mon, 2 Sep 2024 16:49:40 +0100 Subject: [PATCH 02/19] Increment version number to 1.0.2 --- DESCRIPTION | 2 +- NEWS.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 53f9ecd..777ac53 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: cyclestreets Title: Cycle Routing and Data for Cycling Advocacy -Version: 1.0.1 +Version: 1.0.2 Authors@R: c( person("Robin", "Lovelace", , "rob00x@gmail.com", role = c("aut", "cre"), comment = c(ORCID = "0000-0001-5679-6536")), diff --git a/NEWS.md b/NEWS.md index 630ecee..845a7d6 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,5 @@ +# cyclestreets 1.0.2 + # cyclestreets 1.0.1 * Bug fix: issue with batch identified and fix (#80) thanks to @mem48 From 003460ef1bd9d0ec1bc67ce46bc1a27374c0e53d Mon Sep 17 00:00:00 2001 From: robinlovelace Date: Mon, 2 Sep 2024 16:51:25 +0100 Subject: [PATCH 03/19] Update news --- NEWS.md | 4 +++- cran-comments.md | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index 845a7d6..bd3aca9 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,6 @@ -# cyclestreets 1.0.2 +# cyclestreets 1.0.2 (2024-09) + +* Minor update to fix an issue with the `batch()` function (#91) # cyclestreets 1.0.1 diff --git a/cran-comments.md b/cran-comments.md index 838ca52..5c408ab 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,4 +1,4 @@ -We found a bug in the previous release, apologies for the submission of 2 versions in quick succession +Minor update to fix an issue with the `batch()` function. ## R CMD check results From b8bb8f0c76c9df902bd08250263248e810334768 Mon Sep 17 00:00:00 2001 From: Robin Lovelace Date: Thu, 7 Nov 2024 14:52:44 +0000 Subject: [PATCH 04/19] Update batch.R --- R/batch.R | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/R/batch.R b/R/batch.R index 4c5f4d4..fef92ad 100644 --- a/R/batch.R +++ b/R/batch.R @@ -338,7 +338,7 @@ batch_control = function(base_url = "https://api.cyclestreets.net/v2/batchroutes username = username, password = Sys.getenv("CYCLESTREETS_PW") ) - httr::POST(url = batch_url, body = body) + httr::POST(url = batch_url, body = body, httr::timeout(600)) } batch_jobdata = function( @@ -358,7 +358,7 @@ batch_jobdata = function( ) # TODO add polling if(!silent) message("Sending data, wait...") - res = httr::POST(url = batch_url, body = body) + res = httr::POST(url = batch_url, body = body, httr::timeout(600)) res_json = httr::content(res, "parsed") error_message = paste0(" ", as.character(res_json$error)) # Print message if silent = FALSE @@ -410,7 +410,7 @@ batch_deletejob = function( ) # TODO add polling if(!silent) message("Deleting the data") - res = httr::POST(url = batch_url, body = body) + res = httr::POST(url = batch_url, body = body, httr::timeout(600)) res_json = httr::content(res, "parsed") message("Job ",paste0(res_json, collapse = ": ")) } From 9e2d0b9bd5779c7ef34a717fb47a8cb26ce2183d Mon Sep 17 00:00:00 2001 From: robinlovelace Date: Mon, 2 Dec 2024 10:01:24 +0000 Subject: [PATCH 05/19] Update timeout --- R/batch.R | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/R/batch.R b/R/batch.R index 4c5f4d4..d948728 100644 --- a/R/batch.R +++ b/R/batch.R @@ -306,7 +306,7 @@ batch_routes = function( } # # With httr: - res = httr::POST(url = batch_url, body = body, httr::timeout(600)) + res = httr::POST(url = batch_url, body = body, httr::timeout(60*60*5)) res_json = httr::content(res, "parsed") # # # With httr2: @@ -338,7 +338,7 @@ batch_control = function(base_url = "https://api.cyclestreets.net/v2/batchroutes username = username, password = Sys.getenv("CYCLESTREETS_PW") ) - httr::POST(url = batch_url, body = body) + httr::POST(url = batch_url, body = body, httr::timeout(60*60*5)) } batch_jobdata = function( @@ -358,7 +358,7 @@ batch_jobdata = function( ) # TODO add polling if(!silent) message("Sending data, wait...") - res = httr::POST(url = batch_url, body = body) + res = httr::POST(url = batch_url, body = body, httr::timeout(60*60*5)) res_json = httr::content(res, "parsed") error_message = paste0(" ", as.character(res_json$error)) # Print message if silent = FALSE @@ -410,7 +410,7 @@ batch_deletejob = function( ) # TODO add polling if(!silent) message("Deleting the data") - res = httr::POST(url = batch_url, body = body) + res = httr::POST(url = batch_url, body = body, httr::timeout(60*60*5)) res_json = httr::content(res, "parsed") message("Job ",paste0(res_json, collapse = ": ")) } From eee6971e80e68b67a4fd5f9fc498ab12a3f8417a Mon Sep 17 00:00:00 2001 From: robinlovelace Date: Mon, 2 Dec 2024 10:02:26 +0000 Subject: [PATCH 06/19] Update news --- NEWS.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS.md b/NEWS.md index bd3aca9..ddd974d 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,8 @@ +# cyclestreets 1.0.3 (2024-12) + +* Increased timeout time (#91) + + # cyclestreets 1.0.2 (2024-09) * Minor update to fix an issue with the `batch()` function (#91) From f22231e506225a72f44361dff5acea8c1bdd5975 Mon Sep 17 00:00:00 2001 From: robinlovelace Date: Mon, 2 Dec 2024 10:06:30 +0000 Subject: [PATCH 07/19] Increase timeout time for POST and GET --- R/batch.R | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/R/batch.R b/R/batch.R index fef92ad..f22815e 100644 --- a/R/batch.R +++ b/R/batch.R @@ -207,7 +207,7 @@ get_routes = function(url, desire_lines = NULL, filename, directory, if(file.exists(filename_local)) { message(filename, " already exists, overwriting it") } - httr::GET(url, httr::write_disk(filename_local, overwrite = TRUE), httr::timeout(600)) + httr::GET(url, httr::write_disk(filename_local, overwrite = TRUE), httr::timeout(60*60*5)) # R.utils::gzip(filename_local) # routes = batch_read(gsub(pattern = ".gz", replacement = "", filename_local)) # list.files(tempdir()) @@ -306,7 +306,7 @@ batch_routes = function( } # # With httr: - res = httr::POST(url = batch_url, body = body, httr::timeout(600)) + res = httr::POST(url = batch_url, body = body, httr::timeout(60*60*5)) res_json = httr::content(res, "parsed") # # # With httr2: @@ -338,7 +338,7 @@ batch_control = function(base_url = "https://api.cyclestreets.net/v2/batchroutes username = username, password = Sys.getenv("CYCLESTREETS_PW") ) - httr::POST(url = batch_url, body = body, httr::timeout(600)) + httr::POST(url = batch_url, body = body, httr::timeout(60*60*5)) } batch_jobdata = function( @@ -358,7 +358,7 @@ batch_jobdata = function( ) # TODO add polling if(!silent) message("Sending data, wait...") - res = httr::POST(url = batch_url, body = body, httr::timeout(600)) + res = httr::POST(url = batch_url, body = body, httr::timeout(60*60*5)) res_json = httr::content(res, "parsed") error_message = paste0(" ", as.character(res_json$error)) # Print message if silent = FALSE @@ -410,7 +410,7 @@ batch_deletejob = function( ) # TODO add polling if(!silent) message("Deleting the data") - res = httr::POST(url = batch_url, body = body, httr::timeout(600)) + res = httr::POST(url = batch_url, body = body, httr::timeout(60*60*5)) res_json = httr::content(res, "parsed") message("Job ",paste0(res_json, collapse = ": ")) } From 393770f660fd3615964ccc2920aa476712873ab4 Mon Sep 17 00:00:00 2001 From: wangzhao0217 <74598734+wangzhao0217@users.noreply.github.com> Date: Mon, 2 Dec 2024 21:44:15 +0000 Subject: [PATCH 08/19] Update batch.R --- R/batch.R | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/R/batch.R b/R/batch.R index f22815e..75aabe7 100644 --- a/R/batch.R +++ b/R/batch.R @@ -207,7 +207,7 @@ get_routes = function(url, desire_lines = NULL, filename, directory, if(file.exists(filename_local)) { message(filename, " already exists, overwriting it") } - httr::GET(url, httr::write_disk(filename_local, overwrite = TRUE), httr::timeout(60*60*5)) + httr::GET(url, httr::write_disk(filename_local, overwrite = TRUE), httr::timeout(60*60*5),httr::config(connecttimeout = 60 * 60 * 5)) # R.utils::gzip(filename_local) # routes = batch_read(gsub(pattern = ".gz", replacement = "", filename_local)) # list.files(tempdir()) @@ -306,7 +306,7 @@ batch_routes = function( } # # With httr: - res = httr::POST(url = batch_url, body = body, httr::timeout(60*60*5)) + res = httr::POST(url = batch_url, body = body, httr::timeout(60*60*5), httr::config(connecttimeout = 60 * 60 * 5)) res_json = httr::content(res, "parsed") # # # With httr2: @@ -358,7 +358,7 @@ batch_jobdata = function( ) # TODO add polling if(!silent) message("Sending data, wait...") - res = httr::POST(url = batch_url, body = body, httr::timeout(60*60*5)) + res = httr::POST(url = batch_url, body = body, httr::timeout(60*60*5), httr::config(connecttimeout = 60 * 60 * 5)) res_json = httr::content(res, "parsed") error_message = paste0(" ", as.character(res_json$error)) # Print message if silent = FALSE @@ -410,7 +410,7 @@ batch_deletejob = function( ) # TODO add polling if(!silent) message("Deleting the data") - res = httr::POST(url = batch_url, body = body, httr::timeout(60*60*5)) + res = httr::POST(url = batch_url, body = body, httr::timeout(60*60*5), httr::config(connecttimeout = 60 * 60 * 5)) res_json = httr::content(res, "parsed") message("Job ",paste0(res_json, collapse = ": ")) } From 98b5b0f71e6b80ae7c790858b2eed87dd22ccad6 Mon Sep 17 00:00:00 2001 From: wangzhao0217 <74598734+wangzhao0217@users.noreply.github.com> Date: Tue, 3 Dec 2024 03:24:04 +0000 Subject: [PATCH 09/19] Update batch.R --- R/batch.R | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/R/batch.R b/R/batch.R index 75aabe7..7114654 100644 --- a/R/batch.R +++ b/R/batch.R @@ -306,7 +306,21 @@ batch_routes = function( } # # With httr: - res = httr::POST(url = batch_url, body = body, httr::timeout(60*60*5), httr::config(connecttimeout = 60 * 60 * 5)) + res = httr::RETRY( + "POST", + url = batch_url, + body = body, + httr::timeout(60 * 60 * 5), + httr::config(connecttimeout = 60 * 60 * 5), + times = 5, # Number of retries + pause_base = 2, # Base delay between retries + pause_cap = 60, # Max delay between retries + pause_min = 1, # Min delay between retries + terminate_on = NULL, # Don't terminate on specific status codes + retry_on = NULL, # Retry on all errors (since connection refused isn't an HTTP status code) + httr::verbose() # Optional: outputs detailed request info + ) + res_json = httr::content(res, "parsed") # # # With httr2: @@ -358,7 +372,20 @@ batch_jobdata = function( ) # TODO add polling if(!silent) message("Sending data, wait...") - res = httr::POST(url = batch_url, body = body, httr::timeout(60*60*5), httr::config(connecttimeout = 60 * 60 * 5)) + res = httr::RETRY( + "POST", + url = batch_url, + body = body, + httr::timeout(60 * 60 * 5), + httr::config(connecttimeout = 60 * 60 * 5), + times = 5, + pause_base = 2, + pause_cap = 60, + pause_min = 1, + terminate_on = NULL, + retry_on = NULL, + httr::verbose() + ) res_json = httr::content(res, "parsed") error_message = paste0(" ", as.character(res_json$error)) # Print message if silent = FALSE From 445087c14b18f0b1d2c46dd94610707e0f02ab8d Mon Sep 17 00:00:00 2001 From: wangzhao0217 <74598734+wangzhao0217@users.noreply.github.com> Date: Tue, 3 Dec 2024 03:26:05 +0000 Subject: [PATCH 10/19] Update batch.R --- R/batch.R | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/R/batch.R b/R/batch.R index 7114654..686f132 100644 --- a/R/batch.R +++ b/R/batch.R @@ -207,7 +207,21 @@ get_routes = function(url, desire_lines = NULL, filename, directory, if(file.exists(filename_local)) { message(filename, " already exists, overwriting it") } - httr::GET(url, httr::write_disk(filename_local, overwrite = TRUE), httr::timeout(60*60*5),httr::config(connecttimeout = 60 * 60 * 5)) + httr::RETRY( + "GET", + url, + httr::write_disk(filename_local, overwrite = TRUE), + httr::timeout(60 * 60 * 5), + httr::config(connecttimeout = 60 * 60 * 5), + times = 5, + pause_base = 2, + pause_cap = 60, + pause_min = 10, + terminate_on = NULL, + retry_on = NULL, + httr::verbose() + ) + # R.utils::gzip(filename_local) # routes = batch_read(gsub(pattern = ".gz", replacement = "", filename_local)) # list.files(tempdir()) @@ -315,7 +329,7 @@ batch_routes = function( times = 5, # Number of retries pause_base = 2, # Base delay between retries pause_cap = 60, # Max delay between retries - pause_min = 1, # Min delay between retries + pause_min = 10, # Min delay between retries terminate_on = NULL, # Don't terminate on specific status codes retry_on = NULL, # Retry on all errors (since connection refused isn't an HTTP status code) httr::verbose() # Optional: outputs detailed request info @@ -381,7 +395,7 @@ batch_jobdata = function( times = 5, pause_base = 2, pause_cap = 60, - pause_min = 1, + pause_min = 10, terminate_on = NULL, retry_on = NULL, httr::verbose() From a9dc1f7b27684ef85e6c90fd6054d5b90f848f9b Mon Sep 17 00:00:00 2001 From: wangzhao0217 Date: Wed, 4 Dec 2024 09:49:57 +0000 Subject: [PATCH 11/19] update --- .gitignore | 1 + R/batch.R | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index e5b63f4..aad865a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ *.Rds *.csv *.gz +.devcontainer/ \ No newline at end of file diff --git a/R/batch.R b/R/batch.R index 686f132..bae4d04 100644 --- a/R/batch.R +++ b/R/batch.R @@ -211,12 +211,12 @@ get_routes = function(url, desire_lines = NULL, filename, directory, "GET", url, httr::write_disk(filename_local, overwrite = TRUE), - httr::timeout(60 * 60 * 5), - httr::config(connecttimeout = 60 * 60 * 5), + httr::timeout(60 * 60 * 10), + httr::config(connecttimeout = 60 * 60 * 10), times = 5, pause_base = 2, - pause_cap = 60, - pause_min = 10, + pause_cap = 600, # Increased maximum pause cap + pause_min = 30, terminate_on = NULL, retry_on = NULL, httr::verbose() @@ -324,12 +324,12 @@ batch_routes = function( "POST", url = batch_url, body = body, - httr::timeout(60 * 60 * 5), - httr::config(connecttimeout = 60 * 60 * 5), + httr::timeout(60 * 60 * 10), + httr::config(connecttimeout = 60 * 60 * 10), times = 5, # Number of retries pause_base = 2, # Base delay between retries - pause_cap = 60, # Max delay between retries - pause_min = 10, # Min delay between retries + pause_cap = 600, # Max delay between retries + pause_min = 30, # Min delay between retries terminate_on = NULL, # Don't terminate on specific status codes retry_on = NULL, # Retry on all errors (since connection refused isn't an HTTP status code) httr::verbose() # Optional: outputs detailed request info @@ -390,12 +390,12 @@ batch_jobdata = function( "POST", url = batch_url, body = body, - httr::timeout(60 * 60 * 5), - httr::config(connecttimeout = 60 * 60 * 5), + httr::timeout(60 * 60 * 10), + httr::config(connecttimeout = 60 * 60 * 10), times = 5, pause_base = 2, - pause_cap = 60, - pause_min = 10, + pause_cap = 600, + pause_min = 30, terminate_on = NULL, retry_on = NULL, httr::verbose() @@ -451,7 +451,7 @@ batch_deletejob = function( ) # TODO add polling if(!silent) message("Deleting the data") - res = httr::POST(url = batch_url, body = body, httr::timeout(60*60*5), httr::config(connecttimeout = 60 * 60 * 5)) + res = httr::POST(url = batch_url, body = body, httr::timeout(60*60*5), httr::config(connecttimeout = 60 * 60 * 10)) res_json = httr::content(res, "parsed") message("Job ",paste0(res_json, collapse = ": ")) } From c3766d3c7631b5c0dc1366a8e075740a1fdad163 Mon Sep 17 00:00:00 2001 From: wangzhao0217 <74598734+wangzhao0217@users.noreply.github.com> Date: Wed, 4 Dec 2024 10:41:55 +0000 Subject: [PATCH 12/19] Update R/batch.R That' cool Co-authored-by: Robin Lovelace --- R/batch.R | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/R/batch.R b/R/batch.R index bae4d04..2805765 100644 --- a/R/batch.R +++ b/R/batch.R @@ -218,8 +218,9 @@ get_routes = function(url, desire_lines = NULL, filename, directory, pause_cap = 600, # Increased maximum pause cap pause_min = 30, terminate_on = NULL, - retry_on = NULL, - httr::verbose() + retry_on = NULL + # , + # httr::verbose() # for debugging ) # R.utils::gzip(filename_local) From aaa2d0b08593c6b745ecdcce32176a6c3a73aaa7 Mon Sep 17 00:00:00 2001 From: wangzhao0217 Date: Wed, 4 Dec 2024 11:08:55 +0000 Subject: [PATCH 13/19] verbose commented out --- R/batch.R | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/R/batch.R b/R/batch.R index bae4d04..b4f40f4 100644 --- a/R/batch.R +++ b/R/batch.R @@ -219,7 +219,7 @@ get_routes = function(url, desire_lines = NULL, filename, directory, pause_min = 30, terminate_on = NULL, retry_on = NULL, - httr::verbose() + # httr::verbose() ) # R.utils::gzip(filename_local) @@ -332,7 +332,7 @@ batch_routes = function( pause_min = 30, # Min delay between retries terminate_on = NULL, # Don't terminate on specific status codes retry_on = NULL, # Retry on all errors (since connection refused isn't an HTTP status code) - httr::verbose() # Optional: outputs detailed request info + # httr::verbose() # Optional: outputs detailed request info ) res_json = httr::content(res, "parsed") @@ -398,7 +398,7 @@ batch_jobdata = function( pause_min = 30, terminate_on = NULL, retry_on = NULL, - httr::verbose() + # httr::verbose() ) res_json = httr::content(res, "parsed") error_message = paste0(" ", as.character(res_json$error)) From 2dd99a71bb87aa41f6bf8bab25d4cbe672d80a2e Mon Sep 17 00:00:00 2001 From: wangzhao0217 Date: Wed, 4 Dec 2024 11:12:44 +0000 Subject: [PATCH 14/19] remove , --- R/batch.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/batch.R b/R/batch.R index de001ed..a4fbf8c 100644 --- a/R/batch.R +++ b/R/batch.R @@ -331,7 +331,7 @@ batch_routes = function( pause_cap = 600, # Max delay between retries pause_min = 30, # Min delay between retries terminate_on = NULL, # Don't terminate on specific status codes - retry_on = NULL, # Retry on all errors (since connection refused isn't an HTTP status code) + retry_on = NULL # Retry on all errors (since connection refused isn't an HTTP status code) # httr::verbose() # Optional: outputs detailed request info ) @@ -397,7 +397,7 @@ batch_jobdata = function( pause_cap = 600, pause_min = 30, terminate_on = NULL, - retry_on = NULL, + retry_on = NULL # httr::verbose() ) res_json = httr::content(res, "parsed") From 9a49aec7160189dee98323d1609a8c5dac43c1cf Mon Sep 17 00:00:00 2001 From: robinlovelace Date: Wed, 4 Dec 2024 11:18:32 +0000 Subject: [PATCH 15/19] Tweak examples --- R/batch.R | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/R/batch.R b/R/batch.R index a4fbf8c..301d55b 100644 --- a/R/batch.R +++ b/R/batch.R @@ -50,8 +50,9 @@ #' if(FALSE) { #' library(sf) #' desire_lines = od::od_to_sf(od::od_data_df, od::od_data_zones)[4:5, 1:3] -#' u = paste0("https://github.com/cyclestreets/cyclestreets-r/", -#' "releases/download/v0.5.3/od-longford-10-test.Rds") +#' u1 = "https://github.com/cyclestreets/cyclestreets-r/" +#' u2 = "releases/download/v0.5.3/od-longford-10-test.Rds" +#' u = paste0(u1, u2) #' desire_lines = readRDS(url(u)) #' routes_id = batch(desire_lines, username = "robinlovelace", wait = FALSE) #' # Wait for some time, around a minute or 2 From 9e3b4d5472443dc18872f7be30ba2b5577789c1d Mon Sep 17 00:00:00 2001 From: robinlovelace Date: Wed, 4 Dec 2024 11:19:34 +0000 Subject: [PATCH 16/19] Increment version number to 1.0.3 --- DESCRIPTION | 2 +- NEWS.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 777ac53..a38af0c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: cyclestreets Title: Cycle Routing and Data for Cycling Advocacy -Version: 1.0.2 +Version: 1.0.3 Authors@R: c( person("Robin", "Lovelace", , "rob00x@gmail.com", role = c("aut", "cre"), comment = c(ORCID = "0000-0001-5679-6536")), diff --git a/NEWS.md b/NEWS.md index ddd974d..aa7175d 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,5 @@ +# cyclestreets 1.0.3 + # cyclestreets 1.0.3 (2024-12) * Increased timeout time (#91) From fc5da8fe9ce33df6c2507f358c1c25b9d982412b Mon Sep 17 00:00:00 2001 From: robinlovelace Date: Wed, 4 Dec 2024 11:20:58 +0000 Subject: [PATCH 17/19] Add @wangzhao0217 to contributors --- DESCRIPTION | 4 +++- NEWS.md | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index a38af0c..37cb0ad 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -10,7 +10,9 @@ Authors@R: c( person("Joey", "Talbot", , "j.d.talbot@leeds.ac.uk", role = "aut", comment = c(ORCID = "0000-0002-6520-4560")), person("Malcolm", "Morgan", role = "ctb", - comment = c(ORCID = "0000-0002-9488-9183")) + comment = c(ORCID = "0000-0002-9488-9183")), + person("Zhao", "Wang", role = "ctb", + comment = c(ORCID = "0000-0002-4054-0533")) ) Description: An interface to the cycle routing/data services provided by 'CycleStreets', a not-for-profit social enterprise and advocacy diff --git a/NEWS.md b/NEWS.md index aa7175d..242b04e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,9 +1,7 @@ -# cyclestreets 1.0.3 - # cyclestreets 1.0.3 (2024-12) * Increased timeout time (#91) - +* Use retry # cyclestreets 1.0.2 (2024-09) From 149fa956b9de369075a4dd1e2e60887ce6f6db0d Mon Sep 17 00:00:00 2001 From: robinlovelace Date: Wed, 4 Dec 2024 11:27:19 +0000 Subject: [PATCH 18/19] Update comments --- cran-comments.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cran-comments.md b/cran-comments.md index 5c408ab..5792d74 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,4 +1,4 @@ -Minor update to fix an issue with the `batch()` function. +Minor patches. ## R CMD check results From aeaac3070551fdf5bd6f5ac3c87653fb8b9ab566 Mon Sep 17 00:00:00 2001 From: robinlovelace Date: Wed, 4 Dec 2024 11:27:41 +0000 Subject: [PATCH 19/19] Update news --- NEWS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS.md b/NEWS.md index 242b04e..78443ab 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,6 +2,7 @@ * Increased timeout time (#91) * Use retry +* Added Wang Zhao to DESCRIPTION file # cyclestreets 1.0.2 (2024-09)