Skip to content
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.

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

Pull requests #260

Merged
merged 20 commits into from
Apr 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a386435
Fixes to frescalo installation.
DylanCarbone Apr 9, 2024
2fa580b
more error fixes to frescalo installation
DylanCarbone Apr 9, 2024
277f59e
Fix of Frescalo installation errors
DylanCarbone Apr 10, 2024
f00032e
test of CI frescalo installation
DylanCarbone Apr 10, 2024
6b5f06d
negligable changes
DylanCarbone Apr 17, 2024
f625a5d
trial of Frescalo tests with skip on linux systems
DylanCarbone Apr 26, 2024
85abe99
Added mockery to imports
DylanCarbone Apr 26, 2024
ef8975a
Switch from mock to mockr and second check of frescalo installation
DylanCarbone Apr 26, 2024
1320ab3
changed with_mock to with_mocked_bindings
DylanCarbone Apr 26, 2024
6346b67
updates to documentation
DylanCarbone Apr 26, 2024
8597e36
removed package I added that was not needed
DylanCarbone Apr 26, 2024
8783c99
removed ubuntu release version from GHA due to compatability errors w…
DylanCarbone Apr 26, 2024
24a8b2a
fix of small test error
DylanCarbone Apr 26, 2024
1559239
skip frescalo tests in mac
DylanCarbone Apr 26, 2024
47e28a6
change to system info check for mac
DylanCarbone Apr 26, 2024
1df0fb1
Merge branch 'master' into pull_requests
DylanCarbone Apr 27, 2024
f831e37
Merge branch 'BiologicalRecordsCentre:master' into pull_requests
DylanCarbone Apr 27, 2024
3d20dfe
removed mockr dependancy we do not need
DylanCarbone Apr 27, 2024
9852219
Merge branch 'master' into pull_requests
DylanCarbone Apr 27, 2024
82f6111
Merge branch 'pull_requests' of https://github.com/DylanCarbone/spart…
DylanCarbone Apr 27, 2024
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
1 change: 0 additions & 1 deletion .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ jobs:
- {os: macos-latest, r: 'release'}
- {os: windows-latest, r: 'release'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}
- {os: ubuntu-latest, r: 'oldrel-1'}

env:
Expand Down
8 changes: 8 additions & 0 deletions R/detect_os_compat.r
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Detect whether the user is on a mac or Windows OS (compatable with Frescalo) or a different OS. This function is needed to work with Mockery functions in tests
detect_os_compat <- function() {
if (Sys.info()["sysname"] %in% c("Darwin", "Windows")) {
return(TRUE)
} else {
return(FALSE)
}
}
5 changes: 5 additions & 0 deletions R/run_fresc_file.R
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ function(
Plot=TRUE

){

if (!detect_os_compat()) {
stop("Apologies, Frescalo is currently only avaiable on mac and Windows operating systems.")
}

# BODY OF FUNCTION
# Print status to screen
cat("\nSAVING DATA TO FRESCALO WORKING DIRECTORY\n",rep("*",20),"\n\n", sep="")
Expand Down
171 changes: 0 additions & 171 deletions tests/testthat/testerrorChecks.R

This file was deleted.

Loading
Loading