Skip to content

Updates #574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StuartWheater merged 3 commits into from
May 2, 2025
Merged

Updates #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0d72a4
Update of 'Authors@R'
StuartWheater Apr 23, 2025
df396fe
Merge branch 'v6.3.2-dev' of github.com:StuartWheater/dsBaseClient in…
StuartWheater Apr 23, 2025
5574e1d
Update to Armadillo 5.0.0, and switch perf profile
StuartWheater Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 31 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,37 @@
Package: dsBaseClient
Title: DataSHIELD Client Functions
Version: 6.3.2.9000
Author: DataSHIELD Developers <datashield@liverpool.ac.uk>
Maintainer: DataSHIELD Developers <datashield@liverpool.ac.uk>
Authors@R: c(person(given = "Paul",
family = "Burton",
role = c("aut")),
person(given = "Rebecca",
family = "Wilson",
role = c("aut")),
person(given = "Olly",
family = "Butters",
role = c("aut")),
person(given = "Patricia",
family = "Ryser-Welch",
role = c("aut")),
person(given = "Alex",
family = "Westerberg",
role = c("aut")),
person(given = "Leire",
family = "Abarrategui",
role = c("aut")),
person(given = "Roberto",
family = "Villegas-Diaz",
role = c("aut"),
comment = c(ORCID = "0000-0001-5036-8661")),
person(given = "Demetris",
family = "Avraam",
role = c("aut"),
comment = c(ORCID = "0000-0001-8908-2441")),
person(given = "Stuart",
family = "Wheater",
role = c("aut", "cre"),
email = "stuart.wheater@arjuna.com",
comment = c(ORCID = "0009-0003-2419-1964")))
Description: DataSHIELD client functions for the client side.
License: GPL-3
Depends:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose_armadillo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:
hostname: armadillo
ports:
- 8080:8080
image: datashield/armadillo_citest:4.13.1
image: datashield/armadillo_citest:5.0.0
environment:
LOGGING_CONFIG: 'classpath:logback-file.xml'
AUDIT_LOG_PATH: '/app/logs/audit.log'
Expand Down
26 changes: 13 additions & 13 deletions tests/testthat/perf_files/default_perf_profile.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
"refer_name","rate","lower_tolerance","upper_tolerance"
"conndisconn::perf::simple0","0.2118","0.5","2"
"ds.abs::perf::0","1.718","0.5","2"
"ds.asInteger::perf:0","1.484","0.5","2"
"ds.asList::perf:0","3.050","0.5","2"
"ds.asNumeric::perf:0","1.508","0.5","2"
"ds.assign::perf::0","3.547","0.5","2"
"ds.class::perf::combine:0","3.061","0.5","2"
"ds.colnames::perf:0","2.456","0.5","2"
"ds.exists::perf::combine:0","6.904","0.5","2"
"ds.length::perf::combine:0","6.058","0.5","2"
"ds.mean::perf::combine:0","5.892","0.5","2"
"ds.mean::perf::split:0","6.881","0.5","2"
"void::perf::void::0","27070.0","0.5","2"
"conndisconn::perf::simple0","0.1275","0.5","2"
"ds.abs::perf::0","4.824","0.5","2"
"ds.asInteger::perf:0","4.366","0.5","2"
"ds.asList::perf:0","9.787","0.5","2"
"ds.asNumeric::perf:0","4.316","0.5","2"
"ds.assign::perf::0","8.055","0.5","2"
"ds.class::perf::combine:0","9.847","0.5","2"
"ds.colnames::perf:0","7.574","0.5","2"
"ds.exists::perf::combine:0","19.84","0.5","2"
"ds.length::perf::combine:0","19.58","0.5","2"
"ds.mean::perf::combine:0","19.66","0.5","2"
"ds.mean::perf::split:0","19.21","0.5","2"
"void::perf::void::0","41810.0","0.5","2"