Skip to content

Commit 7341d3d

Browse files
Merge pull request #361 from StuartWheater/v6.3.1-RC5-dev
Latest update to RC5
2 parents 2985661 + 3e48793 commit 7341d3d

8 files changed

Lines changed: 166 additions & 173 deletions

File tree

.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88
^docs$
99
^pkgdown$
1010
^\.circleci$
11+
^\.circleci/config\.yml$

DESCRIPTION

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Package: dsBase
2-
Title: DataSHIELD server site base functions
3-
Description: DataSHIELD server site base functions.
2+
Title: DataSHIELD Server Site Base Functions
3+
Description: DataSHIELD Server Site Base Functions.
44
Version: 6.3.1
55
Author: DataSHIELD Developers <datashield@liverpool.ac.uk>
66
Maintainer: DataSHIELD Developers <datashield@liverpool.ac.uk>
77
License: GPL-3
88
Depends:
9-
R (>= 3.5.0)
9+
R (>= 4.0.0)
1010
Imports:
1111
RANN,
1212
stringr,

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ schedules:
6161

6262
jobs:
6363
- job: run_devtools_check
64-
timeoutInMinutes: 90
64+
timeoutInMinutes: 120
6565
pool:
6666
vmImage: ubuntu-24.04
6767

docs/LICENSE.html

Lines changed: 144 additions & 126 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/authors.html

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/index.html

Lines changed: 8 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/pkgdown.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
pandoc: 2.9.2.1
1+
pandoc: 3.1.3
22
pkgdown: 2.1.1
33
pkgdown_sha: ~
44
articles: {}
5-
last_built: 2024-09-30T08:59Z
5+
last_built: 2024-11-10T13:58Z

tests/testthat/test-arg-uniqueDS.R

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,14 @@ test_that("simple uniqueDS for NULL", {
2626
context("uniqueDS::arg::null value")
2727
test_that("simple uniqueDS for NULL", {
2828
input <- NULL
29-
3029
expect_error(uniqueDS("input"), "Variable can't be NULL", fixed = TRUE)
3130
})
3231

32+
context("uniqueDS::arg::not character value")
33+
test_that("simple uniqueDS for NULL", {
34+
expect_error(uniqueDS(17), "Variable's name isn't a single character vector", fixed = TRUE)
35+
})
36+
3337
context("uniqueDS::arg::missing value")
3438
test_that("simple uniqueDS for NULL", {
3539
expect_error(uniqueDS("input"), "object 'input' not found", fixed = TRUE)

0 commit comments

Comments
 (0)