Skip to content

Commit e6c1797

Browse files
committed
Update version
1 parent 1a5bc41 commit e6c1797

6 files changed

Lines changed: 14 additions & 14 deletions

File tree

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: dsBaseClient
22
Title: 'DataSHIELD' Client Side Base Functions
3-
Version: 6.3.4
3+
Version: 6.3.5-9000
44
Description: Base 'DataSHIELD' functions for the client side. 'DataSHIELD' is a software package which allows
55
you to do non-disclosive federated analysis on sensitive data. 'DataSHIELD' analytic functions have
66
been designed to only share non disclosive summary statistics, with built in automated output

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ And the development version from
2323
install.packages("remotes")
2424
remotes::install_github("datashield/dsBaseClient", "<BRANCH>")
2525

26-
# Install v6.3.4 with the following
27-
remotes::install_github("datashield/dsBaseClient", "6.3.4")
26+
# Install v6.3.5 with the following
27+
remotes::install_github("datashield/dsBaseClient", "6.3.5")
2828
```
2929

3030
For a full list of development branches, checkout https://github.com/datashield/dsBaseClient/branches
@@ -50,7 +50,7 @@ The code here is organised as:
5050

5151
[1] Burton P, Wilson R, Butters O, Ryser-Welch P, Westerberg A, Abarrategui L, Villegas-Diaz R,
5252
Avraam D, Marcon Y, Bishop T, Gaye A, Escribà Montagut X, Wheater S (2025).
53-
_dsBaseClient: 'DataSHIELD' Client Side Base Functions_. R package version 6.3.4.
53+
_dsBaseClient: 'DataSHIELD' Client Side Base Functions_. R package version 6.3.5.
5454

5555
[2] Gaye A, Marcon Y, Isaeva J, LaFlamme P, Turner A, Jones E, Minion J, Boyd A, Newby C, Nuotio
5656
M, Wilson R, Butters O, Murtagh B, Demir I, Doiron D, Giepmans L, Wallace S, Budin-Ljøsne I,

armadillo_azure-pipelines.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ schedules:
5858
- master
5959
always: true
6060
- cron: "0 2 * * *"
61-
displayName: Nightly build - v6.3.4-dev
61+
displayName: Nightly build - v6.3.5-dev
6262
branches:
6363
include:
64-
- v6.3.4-dev
64+
- v6.3.5-dev
6565
always: true
6666

6767
#########################################################################################
@@ -235,7 +235,7 @@ jobs:
235235
236236
curl -u admin:admin -X GET http://localhost:8080/packages
237237
238-
curl -u admin:admin --max-time 300 -v -H 'Content-Type: multipart/form-data' -F "file=@dsBase_6.3.4-permissive.tar.gz" -X POST http://localhost:8080/install-package
238+
curl -u admin:admin --max-time 300 -v -H 'Content-Type: multipart/form-data' -F "file=@dsBase_6.3.5-permissive.tar.gz" -X POST http://localhost:8080/install-package
239239
sleep 60
240240
241241
docker container restart dsbaseclient_armadillo_1

azure-pipelines.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ schedules:
4444
- master
4545
always: true
4646
- cron: "0 2 * * *"
47-
displayName: Nightly build - v6.3.4-dev
47+
displayName: Nightly build - v6.3.5-dev
4848
branches:
4949
include:
50-
- v6.3.4-dev
50+
- v6.3.5-dev
5151
always: true
5252

5353
#########################################################################################
@@ -216,7 +216,7 @@ jobs:
216216
- bash: |
217217
R -q -e "library(opalr); opal <- opal.login(username = 'administrator', password = 'datashield_test&', url = 'https://localhost:8443', opts = list(ssl_verifyhost=0, ssl_verifypeer=0)); opal.put(opal, 'system', 'conf', 'general', '_rPackage'); opal.logout(o)"
218218
219-
R -q -e "library(opalr); opal <- opal.login('administrator','datashield_test&', url='https://localhost:8443/', opts = list(ssl_verifyhost=0, ssl_verifypeer=0)); dsadmin.install_github_package(opal, 'dsBase', username = 'datashield', ref = 'v6.3.4-dev'); opal.logout(opal)"
219+
R -q -e "library(opalr); opal <- opal.login('administrator','datashield_test&', url='https://localhost:8443/', opts = list(ssl_verifyhost=0, ssl_verifypeer=0)); dsadmin.install_github_package(opal, 'dsBase', username = 'datashield', ref = 'v6.3.5-dev'); opal.logout(opal)"
220220
221221
sleep 60
222222

opal_azure-pipelines.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ schedules:
5858
- master
5959
always: true
6060
- cron: "0 2 * * *"
61-
displayName: Nightly build - v6.3.4-dev
61+
displayName: Nightly build - v6.3.5-dev
6262
branches:
6363
include:
64-
- v6.3.4-dev
64+
- v6.3.5-dev
6565
always: true
6666

6767
#########################################################################################
@@ -235,7 +235,7 @@ jobs:
235235
- bash: |
236236
R -q -e "library(opalr); opal <- opal.login(username = 'administrator', password = 'datashield_test&', url = 'https://localhost:8443', opts = list(ssl_verifyhost=0, ssl_verifypeer=0)); opal.put(opal, 'system', 'conf', 'general', '_rPackage'); opal.logout(o)"
237237
238-
R -q -e "library(opalr); opal <- opal.login('administrator','datashield_test&', url='https://localhost:8443/', opts = list(ssl_verifyhost=0, ssl_verifypeer=0)); dsadmin.install_github_package(opal, 'dsBase', username = 'datashield', ref = 'v6.3.4-dev'); opal.logout(opal)"
238+
R -q -e "library(opalr); opal <- opal.login('administrator','datashield_test&', url='https://localhost:8443/', opts = list(ssl_verifyhost=0, ssl_verifypeer=0)); dsadmin.install_github_package(opal, 'dsBase', username = 'datashield', ref = 'v6.3.5-dev'); opal.logout(opal)"
239239
240240
sleep 60
241241

tests/testthat/test-smk-isDefined.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
# context("isDefined::smk::setup")
1717

18-
# connect.discordant.dataset.simple(list("A", "B", "C"))
18+
connect.discordant.dataset.simple(list("A", "B", "C"))
1919

2020
test_that("setup", {
2121
ds_expect_variables(c("D"))

0 commit comments

Comments
 (0)