diff --git a/.github/workflows/rworkflows.yml b/.github/workflows/rworkflows.yml index a3ebf8c..d52336f 100644 --- a/.github/workflows/rworkflows.yml +++ b/.github/workflows/rworkflows.yml @@ -32,10 +32,10 @@ jobs: cont: ~ rspm: ~ steps: - - name: Install zlib - if: ${{ matrix.config.os == 'macOS-latest' }} - run: | - brew install zlib + - name: Setup .NET # Install dotnet v6.0.x to run mspc + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.x' - uses: neurogenomics/rworkflows@master with: run_bioccheck: ${{ false }} diff --git a/DESCRIPTION b/DESCRIPTION index 65d00dd..4759633 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: ConsensusPeak Title: Call consensus peaks from multiple biological replicates -Version: 0.0.0.9000 +Version: 0.0.0.9001 Authors@R: person(given = "Thomas", family = "Roberts", email = "tomroberts.work15@gmail.com", diff --git a/R/check_dotnet_version.R b/R/check_dotnet_version.R index 2c9d713..230dbfa 100644 --- a/R/check_dotnet_version.R +++ b/R/check_dotnet_version.R @@ -4,7 +4,7 @@ check_dotnet_version <- function() { check <- system("dotnet --info", intern = TRUE) version_line <- grep("^\\s*Version:\\s*\\d\\..*$", check, value = TRUE)[1] major_version <- gsub("^\\s*Version:\\s*", "", version_line) - if (as.numeric(gsub("^(\\d+)\\..*$", "\\1", major_version)) != 6) { + if (as.numeric(gsub("^(\\d+)\\..*$", "\\1", major_version)) < 6) { stopper("") } messager( diff --git a/R/messager.R b/R/messager.R index af0fd51..a2a6191 100644 --- a/R/messager.R +++ b/R/messager.R @@ -6,16 +6,12 @@ #' must first be stored to a variable before passing to \link[base]{message}. #' #' @param v Whether to print messages or not. -#' @param parallel Whether to enable message print when wrapped -#' in parallelised functions. #' #' @return NULL #' @keywords internal -messager <- function(..., v = TRUE, parallel = FALSE) { - if(parallel){ - if(v) try({message_parallel(...)}) - } else { +messager <- function(..., v = TRUE) { + if(v){ msg <- paste(...) - if (v) try({message(msg)}) + try({message(msg)}) } } diff --git a/man/messager.Rd b/man/messager.Rd index 482d32c..49b769a 100644 --- a/man/messager.Rd +++ b/man/messager.Rd @@ -4,13 +4,10 @@ \alias{messager} \title{Print messages} \usage{ -messager(..., v = TRUE, parallel = FALSE) +messager(..., v = TRUE) } \arguments{ \item{v}{Whether to print messages or not.} - -\item{parallel}{Whether to enable message print when wrapped -in parallelised functions.} } \description{ Conditionally print messages.