[ARVADOS] updated: 1.3.0-3214-gca07e0d0c

[Git user]

Summary of changes:
 sdk/R/DESCRIPTION                       | 6 +++---
 sdk/R/R/ArvadosFile.R                   | 2 --
 sdk/R/R/Collection.R                    | 5 -----
 sdk/R/R/CollectionTree.R                | 4 ----
 sdk/R/R/HttpRequest.R                   | 4 +---
 sdk/R/R/Subcollection.R                 | 2 --
 sdk/R/tests/testthat/test-HttpRequest.R | 2 +-
 7 files changed, 5 insertions(+), 20 deletions(-)

       via  ca07e0d0c46fbe0f4e5b5a1c702a208391c0d1ad (commit)
      from  d993e4c9508e0570df1d64ab63d3a9e6a6c40184 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit ca07e0d0c46fbe0f4e5b5a1c702a208391c0d1ad
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed Sep 23 17:50:14 2020 -0400

    16827: Don't append '/' to requests with query params.  Bump version
    
    Also remove package-cross loading with "source" that generated warnings.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/sdk/R/DESCRIPTION b/sdk/R/DESCRIPTION
index 878a70901..75ac892b4 100644
--- a/sdk/R/DESCRIPTION
+++ b/sdk/R/DESCRIPTION
@@ -1,9 +1,9 @@
 Package: ArvadosR
 Type: Package
 Title: Arvados R SDK
-Version: 0.0.5
-Authors at R: person("Fuad", "Muhic", role = c("aut", "cre"), email = "fmuhic at capeannenterprises.com")
-Maintainer: Ward Vandewege <wvandewege at veritasgenetics.com>
+Version: 0.0.6
+Authors at R: c(person("Fuad", "Muhic", role = c("aut", "ctr"), email = "fmuhic at capeannenterprises.com"),
+             person("Peter", "Amstutz", role = c("cre"), email = "peter.amstutz at curii.com"))
 Description: This is the Arvados R SDK
 URL: http://doc.arvados.org
 License: Apache-2.0
diff --git a/sdk/R/R/ArvadosFile.R b/sdk/R/R/ArvadosFile.R
index 70bb4450e..fb1d3b335 100644
--- a/sdk/R/R/ArvadosFile.R
+++ b/sdk/R/R/ArvadosFile.R
@@ -2,8 +2,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-source("./R/util.R")
-
 #' ArvadosFile
 #'
 #' ArvadosFile class represents a file inside Arvados collection.
diff --git a/sdk/R/R/Collection.R b/sdk/R/R/Collection.R
index 8869d7be6..144083654 100644
--- a/sdk/R/R/Collection.R
+++ b/sdk/R/R/Collection.R
@@ -2,11 +2,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-source("./R/Subcollection.R")
-source("./R/ArvadosFile.R")
-source("./R/RESTService.R")
-source("./R/util.R")
-
 #' Collection
 #'
 #' Collection class provides interface for working with Arvados collections.
diff --git a/sdk/R/R/CollectionTree.R b/sdk/R/R/CollectionTree.R
index 5f7a29455..e01e7e8de 100644
--- a/sdk/R/R/CollectionTree.R
+++ b/sdk/R/R/CollectionTree.R
@@ -2,10 +2,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-source("./R/Subcollection.R")
-source("./R/ArvadosFile.R")
-source("./R/util.R")
-
 CollectionTree <- R6::R6Class(
     "CollectionTree",
     public = list(
diff --git a/sdk/R/R/HttpRequest.R b/sdk/R/R/HttpRequest.R
index 07defca90..18b36f968 100644
--- a/sdk/R/R/HttpRequest.R
+++ b/sdk/R/R/HttpRequest.R
@@ -2,8 +2,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-source("./R/util.R")
-
 HttpRequest <- R6::R6Class(
 
     "HttrRequest",
@@ -54,7 +52,7 @@ HttpRequest <- R6::R6Class(
             {
                 query <- paste0(names(query), "=", query, collapse = "&")
 
-                return(paste0("/?", query))
+                return(paste0("?", query))
             }
 
             return("")
diff --git a/sdk/R/R/Subcollection.R b/sdk/R/R/Subcollection.R
index 17a9ef3ee..981bd687a 100644
--- a/sdk/R/R/Subcollection.R
+++ b/sdk/R/R/Subcollection.R
@@ -2,8 +2,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-source("./R/util.R")
-
 #' Subcollection
 #'
 #' Subcollection class represents a folder inside Arvados collection.
diff --git a/sdk/R/tests/testthat/test-HttpRequest.R b/sdk/R/tests/testthat/test-HttpRequest.R
index eb58d033b..c1b6f1039 100644
--- a/sdk/R/tests/testthat/test-HttpRequest.R
+++ b/sdk/R/tests/testthat/test-HttpRequest.R
@@ -20,7 +20,7 @@ test_that("createQuery generates and encodes query portion of http", {
     queryParams$limit <- 20
     queryParams$offset <- 50
     expect_that(http$createQuery(queryParams),
-                equals(paste0("/?filters=%5B%5B%22color%22%2C%22%3D%22%2C%22red",
+                equals(paste0("?filters=%5B%5B%22color%22%2C%22%3D%22%2C%22red",
                               "%22%5D%5D&limit=20&offset=50")))
 })
 

-----------------------------------------------------------------------


hooks/post-receive
--