Merge pull request #64 from Microsoft/richcala/UpdatePublicTo3.4.4

Modifications for MRO 3.4.4

additionalPackages/RevoIOQ/DESCRIPTION

@@ -1,6 +1,6 @@
 Package: RevoIOQ
-Version: 8.0.9
-Date: 2018-01-03
+Version: 8.0.10
+Date: 2018-03-28
 Title: Microsoft R Services Test Suite
 Author: Microsoft Corporation
 Maintainer: Microsoft Corporation <[email protected]>
@@ -9,5 +9,4 @@ Suggests: RevoUtils
 Description: Test suite for Microsoft R Services.
 License: GPL-2
 Copyright: Copyright Microsoft Corporation
-BuildID: 9.3.0.0020
-
+BuildID: 9.4.1.0077

additionalPackages/RevoIOQ/inst/unitTests/Revo/common/runit.revo.common.version.R

@@ -26,7 +26,7 @@ if (!identical(system.file(package="RevoMods"), ""))
     "test.revor.RevoIOQ.version" <- function() checkTrue("checkPackageVersion"(pkg = "RevoIOQ", ver = revover))
     "test.revor.RUnit.version" <- function() checkTrue("checkPackageVersion"(pkg = "RUnit", ver = "0.4.26"))
     "test.revoparallelr.doParallel.version" <- function() checkTrue("checkPackageVersion"(pkg = "doParallel", ver = "1.0.12"))
-    "test.revor.RevoUtils.version" <- function() checkTrue("checkPackageVersion"(pkg = "RevoUtils", ver = "10.0.7"))
+    "test.revor.RevoUtils.version" <- function() checkTrue("checkPackageVersion"(pkg = "RevoUtils", ver = "10.0.9"))
     "test.revor.RevoMods.version" <- function() checkTrue("checkPackageVersion"(pkg = "RevoMods", ver = "11.0.0"))
 } else
 {

additionalPackages/RevoIOQ/inst/unitTests/Revo/common/runitRegression.R

@@ -19,8 +19,10 @@ if (compareVersion(paste(R.version$major, R.version$minor, sep=".") ,"2.9.0") <
     load(system.file(file.path("unitTestData", "regression_3.0.3.Rdata"), package="RevoIOQ"))
 } else if (compareVersion(paste(R.version$major, R.version$minor, sep="."), "3.4.0") < 0){
 	load(system.file(file.path("unitTestData", "regression_3.1.0.Rdata"), package="RevoIOQ"))
-} else {
+} else if (compareVersion(paste(R.version$major, R.version$minor, sep="."), "3.4.4") < 0){
 	load(system.file(file.path("unitTestData", "regression_3.4.0.Rdata"), package="RevoIOQ"))
+} else {
+	load(system.file(file.path("unitTestData", "regression_3.4.4.Rdata"), package="RevoIOQ"))
 }
 
 test.lm<- function(){

additionalPackages/RevoUtils/DESCRIPTION

@@ -1,13 +1,12 @@
 Package: RevoUtils
-Version: 10.0.7
-Date: 2018-01-03
-RevoBuildID: {10.0.7.0116}
+Version: 10.0.9
+Date: 2018-04-15
+RevoBuildID: 10.0.9.0125
 Title: Microsoft R Utility Package
 Author: Microsoft Corporation
 Maintainer: Microsoft Corporation <[email protected]>
 SystemRequirements: R (>= 3.0.0)
 Description: Utility functions for Microsoft R
 License: GPL-2
 Copyright: Microsoft Corporation
-MRANDate: 2018-01-01
-
+MRANDate: 2018-04-01

additionalPackages/RevoUtils/R/isClient.R

@@ -10,7 +10,11 @@
                 if (identical(clientPath, Rpath)){
                     returnVal <- TRUE
                 }
-        }
+        } else {
+			if (!identical(system.file(package="RevoScaleR"), "")) {
+				returnVal <- RevoScaleR:::rxIsExpressEdition()		
+			}
+		}
     } else if(identical(.Platform$OS.type, "unix") && !identical(Sys.info()["sysname"], "Darwin")){
 		if (!identical(system.file(package="RevoScaleR"), "")) {
 			returnVal <- RevoScaleR:::rxIsExpressEdition()

additionalPackages/curl/DESCRIPTION

@@ -1,9 +1,10 @@
 Package: curl
 Type: Package
 Title: A Modern and Flexible Web Client for R
-Version: 3.1
+Version: 3.2
 Authors@R: c(
-    person("Jeroen", "Ooms", , "[email protected]", role = c("cre", "aut")),
+    person("Jeroen", "Ooms", role = c("aut", "cre"), email = "[email protected]",
+      comment = c(ORCID = "0000-0002-4035-0289")),
     person("Hadley", "Wickham", , "[email protected]", role = "ctb"),
     person("RStudio", role = "cph")
     )
@@ -17,20 +18,24 @@ Description: The curl() and curl_download() functions provide highly
     web client see the 'httr' package which builds on this package with http
     specific tools and logic.
 License: MIT + file LICENSE
-SystemRequirements: libcurl: libcurl-devel (rpm) or libcurl4-openssl-dev (deb).
-URL: https://github.com/jeroen/curl#readme (devel) 
-    https://curl.haxx.se/libcurl/ (upstream)
+SystemRequirements: libcurl: libcurl-devel (rpm) or
+        libcurl4-openssl-dev (deb).
+URL: https://github.com/jeroen/curl#readme (devel)
+        https://curl.haxx.se/libcurl/ (upstream)
 BugReports: https://github.com/jeroen/curl/issues
-Suggests:
-    testthat (>= 1.0.0),
-    knitr,
-    jsonlite,
-    rmarkdown,
-    magrittr,
-    httpuv,
-    webutils
+Suggests: spelling, testthat (>= 1.0.0), knitr, jsonlite, rmarkdown,
+        magrittr, httpuv, webutils
 VignetteBuilder: knitr
-Depends:
-    R (>= 3.0.0)
+Depends: R (>= 3.0.0)
 LazyData: true
-RoxygenNote: 6.0.1
+RoxygenNote: 6.0.1.9000
+Encoding: UTF-8
+Language: en-US
+NeedsCompilation: yes
+Packaged: 2018-03-19 16:18:53 UTC; jeroen
+Author: Jeroen Ooms [aut, cre] (<https://orcid.org/0000-0002-4035-0289>),
+  Hadley Wickham [ctb],
+  RStudio [cph]
+Maintainer: Jeroen Ooms <[email protected]>
+Repository: CRAN
+Date/Publication: 2018-03-28 07:42:52 UTC

additionalPackages/curl/NEWS

@@ -1,3 +1,10 @@
+3.2
+ - Windows: Update libcurl to 7.59.0
+ - Update curl_symbols dataset to 7.59.0
+ - Fix an IDN unit test (malmö.se has messed up their SSL cert)
+ - Add unit test for multi_fdset
+ - Add backport of trimws for R 3.1
+
 3.1
  - Fix potential memory bug in curl() when doubling the buffer is insufficient.
  - Windows: update to libcurl 7.56.1, restore support for libssh2.

additionalPackages/curl/R/fetch.R

@@ -16,7 +16,7 @@
 #' is enabled when R runs in interactive mode or when
 #' \code{getOption("curl_interrupt") == TRUE}.
 #'
-#' The \code{curl_fetch_multi} function is the asyncronous equivalent of
+#' The \code{curl_fetch_multi} function is the asynchronous equivalent of
 #' \code{curl_fetch_memory}. It wraps \code{multi_add} to schedule requests which
 #' are executed concurrently when calling \code{multi_run}. For each successful
 #' request the \code{done} callback is triggered with response data. For failed

additionalPackages/curl/R/multi.R

@@ -11,7 +11,7 @@
 #' if the user presses \code{ESC} or \code{CTRL+C} in the console). In case of
 #' the latter, simply call \link{multi_run} again to resume pending requests.
 #'
-#' When the request succeeded, the \code{done} callback gets triggerd with
+#' When the request succeeded, the \code{done} callback gets triggered with
 #' the response data. The structure if this data is identical to \link{curl_fetch_memory}.
 #' When the request fails, the \code{fail} callback is triggered with an error
 #' message. Note that failure here means something went wrong in performing the

additionalPackages/curl/R/utilities.R

@@ -44,3 +44,7 @@ parse_date <- function(datestring){
 split_string <- function(x, split = ":"){
   .Call(R_split_string, x, split)
 }
+
+trimws <- function(x) {
+  sub("\\s+$", "", sub("^\\s+", "", x))
+}

additionalPackages/curl/src/Makevars.win

@@ -1,4 +1,4 @@
-VERSION=7.56.1
+VERSION=7.59.0
 PKG_LIBS= -L../windows/libcurl-$(VERSION)/lib${R_ARCH} \
 	-L. -lwinhttp -lcurl-dualssl -lssh2 -lz -lssl -lcrypto -lgdi32 -lws2_32 -lcrypt32 -lwldap32
 

additionalPackages/curl/src/handle.c

@@ -173,6 +173,7 @@ int opt_is_linked_list(int key) {
     key == 10023 || // CURLOPT_HTTPHEADER
     key == 10024 || // CURLOPT_HTTPPOST
     key == 10070 || // CURLOPT_TELNETOPTIONS
+    key == 10104 || // CURLOPT_HTTP200ALIASES
     key == 10228;   // CURLOPT_PROXYHEADER
 }
 

additionalPackages/curl/tests/testthat/helper-version.R

@@ -6,8 +6,10 @@ find_test_server <- function(){
 
   # Try to download latest test-server list
   servers <- tryCatch({
-    req <- curl_fetch_memory("http://jeroen.github.io/curl/servers", handle = h)
-    strsplit(rawToChar(req$content), "\n", fixed = TRUE)[[1]]
+    con <- curl::curl("https://jeroen.github.io/curl/servers.R", handle = h)
+    on.exit(close(con))
+    out <- source(con, local = TRUE)
+    out$value
   }, error = function(e){
     message("Failed to download server list:", e$message)
     c("https://eu.httpbin.org", "https://httpbin.org", "http://httpbin.org")

additionalPackages/curl/tests/testthat/test-idn.R

@@ -3,16 +3,17 @@ context("IDN")
 test_that("IDN domain names",{
   # OSX does not support IDN by default :(
   skip_if_not(curl_version()$idn, "libcurl does not have libidn")
+  skip_on_cran()
 
-  malmo <- "http://www.malm\u00F6.se"
-  expect_is(curl::curl_fetch_memory(enc2utf8(malmo))$status_code, "integer")
-  expect_is(curl::curl_fetch_memory(enc2native(malmo))$status_code, "integer")
+  koln <- "http://www.köln.de"
+  expect_is(curl::curl_fetch_memory(enc2utf8(koln))$status_code, "integer")
+  expect_is(curl::curl_fetch_memory(enc2native(koln))$status_code, "integer")
 
-  con <- curl::curl(enc2utf8(malmo))
+  con <- curl::curl(enc2utf8(koln))
   expect_is(readLines(con, warn = FALSE), "character")
   close(con)
 
-  con <- curl::curl(enc2native(malmo))
+  con <- curl::curl(enc2native(koln))
   expect_is(readLines(con, warn = FALSE), "character")
   close(con)
 

additionalPackages/curl/tests/testthat/test-multi.R

@@ -2,7 +2,7 @@ context("Multi handle")
 
 test_that("Max connections works", {
   skip_on_os("solaris")
-  skip_if_not(curl_version()$version >= as.numeric_version("7.30"),
+  skip_if_not(strsplit(curl_version()$version, "-")[[1]][1] >= as.numeric_version("7.30"),
     "libcurl does not support host_connections")
   multi_set(host_con = 2, multiplex = FALSE)
   for(i in 1:3){
@@ -154,6 +154,18 @@ test_that("callback protection", {
   expect_equal(out$success, 1)
 })
 
+test_that("host_con works via and multi_fdset", {
+  pool <- new_pool(host_con = 3)
+  for (i in 4:0) {
+    h1 <- new_handle(url = httpbin(paste0("delay/", i)))
+    multi_add(h1, done = force, fail = cat, pool = pool)
+  }
+  for(i in 4:0){
+    res <- multi_run(pool = pool, poll = 1)
+    expect_length(multi_fdset(pool = pool)$reads, min(3, i))
+  }
+})
+
 test_that("GC works", {
   gc()
   expect_equal(total_handles(), 0L)

additionalPackages/curl/vignettes/intro.Rmd

@@ -85,10 +85,11 @@ The example shows how to use `readLines` on an opened connection to read `n` lin
 
 #### Non blocking connections
 
-As of version 2.3 it is also possible to open connetions in non-blocking mode. In this case `readBin` and `readLines` will return immediately with data that is available without waiting. For non-blocking connections we use `isIncomplete` to check if the download has completed yet.
+As of version 2.3 it is also possible to open connections in non-blocking mode. In this case `readBin` and `readLines` will return immediately with data that is available without waiting. For non-blocking connections we use `isIncomplete` to check if the download has completed yet.
 
-```{r}
-con <- curl("https://httpbin.org/drip?duration=1&numbytes=50")
+```{r, eval=FALSE}
+# This httpbin mirror doesn't cache
+con <- curl("https://nghttp2.org/httpbin/drip?duration=1&numbytes=50")
 open(con, "rb", blocking = FALSE)
 while(isIncomplete(con)){
   buf <- readBin(con, raw(), 1024)
@@ -138,7 +139,7 @@ The `curl` and `curl_download` functions are safest to use because they automati
 
 ```{r}
 # This is OK
-curl_download('https://cran.r-project.org/CRAN_mirrors.csv', 'mirrors.csv')
+curl_download('https://cloud.r-project.org/CRAN_mirrors.csv', 'mirrors.csv')
 mirros <- read.csv('mirrors.csv')
 unlink('mirrors.csv')
 ```
@@ -147,8 +148,8 @@ If the HTTP request was unsuccessful, R will not continue:
 
 ```{r, error=TRUE, purl = FALSE}
 # Oops! A typo in the URL!
-curl_download('https://cran.r-project.org/CRAN_mirrorZ.csv', 'mirrors.csv')
-con <- curl('https://cran.r-project.org/CRAN_mirrorZ.csv')
+curl_download('https://cloud.r-project.org/CRAN_mirrorZ.csv', 'mirrors.csv')
+con <- curl('https://cloud.r-project.org/CRAN_mirrorZ.csv')
 open(con)
 ```
 
@@ -163,15 +164,15 @@ rm(con)
 When using any of the `curl_fetch_*` functions it is important to realize that these do **not** raise an error if the request was completed but returned a non-200 status code. When using `curl_fetch_memory` or `curl_fetch_disk` you need to implement such application logic yourself and check if the response was successful.
 
 ```{r}
-req <- curl_fetch_memory('https://cran.r-project.org/CRAN_mirrors.csv')
+req <- curl_fetch_memory('https://cloud.r-project.org/CRAN_mirrors.csv')
 print(req$status_code)
 ```
 
 Same for downloading to disk. If you do not check your status, you might have downloaded an error page!
 
 ```{r}
 # Oops a typo!
-req <- curl_fetch_disk('https://cran.r-project.org/CRAN_mirrorZ.csv', 'mirrors.csv')
+req <- curl_fetch_disk('https://cloud.r-project.org/CRAN_mirrorZ.csv', 'mirrors.csv')
 print(req$status_code)
 
 # This is not the CSV file we were expecting!
@@ -183,7 +184,7 @@ If you *do* want the `curl_fetch_*` functions to automatically raise an error, y
 
 ```{r, error=TRUE, purl = FALSE}
 h <- new_handle(failonerror = TRUE)
-curl_fetch_memory('https://cran.r-project.org/CRAN_mirrorZ.csv', handle = h)
+curl_fetch_memory('https://cloud.r-project.org/CRAN_mirrorZ.csv', handle = h)
 ```
 
 ## Customizing requests

source/SVN-REVISION

@@ -1,2 +1,2 @@
-Revision: 73796
-Last Changed Date: 2017-11-30
+Revision: 74408
+Last Changed Date: 2018-03-15

source/VERSION

@@ -1 +1 @@
-3.4.3
+3.4.4

source/VERSION-NICK

@@ -1 +1 @@
-Kite-Eating Tree
+Someone to Lean On