Skip to content

Commit fb670a4

Browse files
Merge pull request datashield#574 from StuartWheater/v6.3.2-dev
Updates
2 parents d3c08cd + 5574e1d commit fb670a4

3 files changed

Lines changed: 45 additions & 16 deletions

File tree

DESCRIPTION

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,37 @@
11
Package: dsBaseClient
22
Title: DataSHIELD Client Functions
33
Version: 6.3.2.9000
4-
Author: DataSHIELD Developers <datashield@liverpool.ac.uk>
5-
Maintainer: DataSHIELD Developers <datashield@liverpool.ac.uk>
4+
Authors@R: c(person(given = "Paul",
5+
family = "Burton",
6+
role = c("aut")),
7+
person(given = "Rebecca",
8+
family = "Wilson",
9+
role = c("aut")),
10+
person(given = "Olly",
11+
family = "Butters",
12+
role = c("aut")),
13+
person(given = "Patricia",
14+
family = "Ryser-Welch",
15+
role = c("aut")),
16+
person(given = "Alex",
17+
family = "Westerberg",
18+
role = c("aut")),
19+
person(given = "Leire",
20+
family = "Abarrategui",
21+
role = c("aut")),
22+
person(given = "Roberto",
23+
family = "Villegas-Diaz",
24+
role = c("aut"),
25+
comment = c(ORCID = "0000-0001-5036-8661")),
26+
person(given = "Demetris",
27+
family = "Avraam",
28+
role = c("aut"),
29+
comment = c(ORCID = "0000-0001-8908-2441")),
30+
person(given = "Stuart",
31+
family = "Wheater",
32+
role = c("aut", "cre"),
33+
email = "stuart.wheater@arjuna.com",
34+
comment = c(ORCID = "0009-0003-2419-1964")))
635
Description: DataSHIELD client functions for the client side.
736
License: GPL-3
837
Depends:

docker-compose_armadillo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ services:
33
hostname: armadillo
44
ports:
55
- 8080:8080
6-
image: datashield/armadillo_citest:4.13.1
6+
image: datashield/armadillo_citest:5.0.0
77
environment:
88
LOGGING_CONFIG: 'classpath:logback-file.xml'
99
AUDIT_LOG_PATH: '/app/logs/audit.log'
Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
"refer_name","rate","lower_tolerance","upper_tolerance"
2-
"conndisconn::perf::simple0","0.2118","0.5","2"
3-
"ds.abs::perf::0","1.718","0.5","2"
4-
"ds.asInteger::perf:0","1.484","0.5","2"
5-
"ds.asList::perf:0","3.050","0.5","2"
6-
"ds.asNumeric::perf:0","1.508","0.5","2"
7-
"ds.assign::perf::0","3.547","0.5","2"
8-
"ds.class::perf::combine:0","3.061","0.5","2"
9-
"ds.colnames::perf:0","2.456","0.5","2"
10-
"ds.exists::perf::combine:0","6.904","0.5","2"
11-
"ds.length::perf::combine:0","6.058","0.5","2"
12-
"ds.mean::perf::combine:0","5.892","0.5","2"
13-
"ds.mean::perf::split:0","6.881","0.5","2"
14-
"void::perf::void::0","27070.0","0.5","2"
2+
"conndisconn::perf::simple0","0.1275","0.5","2"
3+
"ds.abs::perf::0","4.824","0.5","2"
4+
"ds.asInteger::perf:0","4.366","0.5","2"
5+
"ds.asList::perf:0","9.787","0.5","2"
6+
"ds.asNumeric::perf:0","4.316","0.5","2"
7+
"ds.assign::perf::0","8.055","0.5","2"
8+
"ds.class::perf::combine:0","9.847","0.5","2"
9+
"ds.colnames::perf:0","7.574","0.5","2"
10+
"ds.exists::perf::combine:0","19.84","0.5","2"
11+
"ds.length::perf::combine:0","19.58","0.5","2"
12+
"ds.mean::perf::combine:0","19.66","0.5","2"
13+
"ds.mean::perf::split:0","19.21","0.5","2"
14+
"void::perf::void::0","41810.0","0.5","2"

0 commit comments

Comments
 (0)