diff --git a/CHANGELOG b/CHANGELOG index f2b3765..3358375 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,11 @@ +version-3.1.0 +08/14/2023 + +NEW FEATURES + - update with geniac version-3.1.0 + - set memory for outputDocumentation process to 1500MB + - update GLAD with Bioconductor 3.17 + version-3.0.0 05/05/2023 diff --git a/conf/geniac.config b/conf/geniac.config index 637d9a6..73cddd8 100644 --- a/conf/geniac.config +++ b/conf/geniac.config @@ -17,7 +17,7 @@ params { renvGlad { yml = "${projectDir}/recipes/conda/renvGlad.yml" env = "${params.condaCacheDir}/custom_renvGlad" - bioc = "3.14" + bioc = "3.17" } } diff --git a/conf/process.config b/conf/process.config index 8427962..f21d192 100644 --- a/conf/process.config +++ b/conf/process.config @@ -27,7 +27,7 @@ process { // add withName directive for process-specific tuning, for example: withName:outputDocumentation { - memory = { checkMax( 100.MB, 'memory' ) } + memory = { checkMax( 1500.MB, 'memory' ) } } withName:workflowSummaryMqc { diff --git a/geniac b/geniac index 1291408..737f58b 160000 --- a/geniac +++ b/geniac @@ -1 +1 @@ -Subproject commit 1291408737bf4934c349c404816458b316079933 +Subproject commit 737f58b9bb49e5bf7a8e2c8791982326f8aaa05c diff --git a/recipes/conda/renvGlad.yml b/recipes/conda/renvGlad.yml index 0cbc804..4584691 100644 --- a/recipes/conda/renvGlad.yml +++ b/recipes/conda/renvGlad.yml @@ -4,4 +4,4 @@ channels: - bioconda - defaults dependencies: - - r-base=4.1.3=h06d3f91_1 + - r-base=4.3.1=h29c4799_3 diff --git a/recipes/dependencies/renvGlad/renv.lock b/recipes/dependencies/renvGlad/renv.lock index 6b22ad5..3af82de 100644 --- a/recipes/dependencies/renvGlad/renv.lock +++ b/recipes/dependencies/renvGlad/renv.lock @@ -1,6 +1,6 @@ { "R": { - "Version": "4.1.3", + "Version": "4.3.1", "Repositories": [ { "Name": "CRAN", @@ -9,48 +9,81 @@ ] }, "Bioconductor": { - "Version": "3.14" + "Version": "3.17" }, "Packages": { + "BiocManager": { + "Package": "BiocManager", + "Version": "1.30.22", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "utils" + ], + "Hash": "d57e43105a1aa9cb54fdb4629725acb1" + }, + "BiocVersion": { + "Package": "BiocVersion", + "Version": "3.17.1", + "Source": "Bioconductor", + "Requirements": [ + "R" + ], + "Hash": "f7c0d5521799b7b0d0a211143ed0bfcb" + }, "GLAD": { "Package": "GLAD", - "Version": "2.58.0", + "Version": "2.64.0", "Source": "Bioconductor", - "git_url": "https://git.bioconductor.org/packages/GLAD", - "git_branch": "RELEASE_3_14", - "git_last_commit": "b91c49b", - "git_last_commit_date": "2021-10-26", - "Hash": "549efcfebe668ad72ac08af9e7a69688", "Requirements": [ + "R", "aws" - ] + ], + "Hash": "efd50c9f23e052f086c8a22fc92c07c8" }, "aws": { "Package": "aws", - "Version": "2.5-1", + "Version": "2.5-3", "Source": "Repository", "Repository": "CRAN", - "Hash": "05024f3255cd1e04541a122d73ab4a9d", "Requirements": [ + "R", "awsMethods", - "gsl" - ] + "gsl", + "methods" + ], + "Hash": "0832bb1e53afaba3a37732c1a5760deb" }, "awsMethods": { "Package": "awsMethods", "Version": "1.1-1", "Source": "Repository", "Repository": "CRAN", - "Hash": "2dfceb7e0b4e9979cc392acb569c6c0d", - "Requirements": [] + "Requirements": [ + "R", + "methods" + ], + "Hash": "2dfceb7e0b4e9979cc392acb569c6c0d" }, "gsl": { "Package": "gsl", - "Version": "2.1-7.1", + "Version": "2.1-8", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "8f8205cbb9f1066a94e22898fe949184" + }, + "renv": { + "Package": "renv", + "Version": "1.0.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "167952c96eec4308c9487e1519a90682", - "Requirements": [] + "Requirements": [ + "utils" + ], + "Hash": "6523639dd021b32c3199a41cbe6db340" } } }