Merge branch 'dev_tmp' into newfeature_validate_model

nf-core · Dec 20, 2024 · 2ee77d0 · 2ee77d0
2 parents 6dafd95 + 8597c2b
commit 2ee77d0
Show file tree

Hide file tree

Showing 16 changed files with 247 additions and 215 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [[#286](https://github.com/nf-core/differentialabundance/pull/286)] - Integration of limma voom for rnaseq data ([@KamilMaliszArdigen](https://github.com/KamilMaliszArdigen), review by [@pinin4fjords](https://github.com/pinin4fjords))
 - [[#380](https://github.com/nf-core/differentialabundance/pull/380)] - Replace local filter_diff_table module with nf-core one, and create nf-tests for tabular_to_gsea_chip. ([@nschcolnicov](https://github.com/nschcolnicov), review by [@pinin4fjords](https://github.com/pinin4fjords))
 - [[#382](https://github.com/nf-core/differentialabundance/pull/382)] - Add YAML formatted contrasts file handling. ([@nschcolnicov](https://github.com/nschcolnicov), review by [@TODO](https://github.com/TODO))
+- [[#411](https://github.com/nf-core/differentialabundance/pull/411)] - Replace local tabulartogseachip with nf-core version. ([@nschcolnicov](https://github.com/nschcolnicov), review by [@TODO](https://github.com/TODO))
 
 ### Fixed
 

diff --git a/conf/modules.config b/conf/modules.config
@@ -493,7 +493,7 @@ process {
         ]
     }
 
-    withName: 'TABULAR_TO_GSEA_CHIP' {
+    withName: 'CUSTOM_TABULARTOGSEACHIP' {
         publishDir = [
             enabled: false
         ]

diff --git a/modules.json b/modules.json
@@ -25,6 +25,11 @@
                         "git_sha": "666652151335353eef2fcd58880bcef5bc2928e1",
                         "installed_by": ["modules"]
                     },
+                    "custom/tabulartogseachip": {
+                        "branch": "master",
+                        "git_sha": "7900e49fb84969a2479ecfbeef7bcbe296513c90",
+                        "installed_by": ["modules"]
+                    },
                     "custom/tabulartogseacls": {
                         "branch": "master",
                         "git_sha": "666652151335353eef2fcd58880bcef5bc2928e1",

diff --git a/modules/local/tabulartogseachip/main.nf b/modules/local/tabulartogseachip/main.nf
diff --git a/modules/local/tabulartogseachip/meta.yml b/modules/local/tabulartogseachip/meta.yml
diff --git a/modules/local/tabulartogseachip/tests/main.nf.test b/modules/local/tabulartogseachip/tests/main.nf.test
diff --git a/modules/local/tabulartogseachip/tests/main.nf.test.snap b/modules/local/tabulartogseachip/tests/main.nf.test.snap
diff --git a/...s/local/tabulartogseachip/environment.yml → .../custom/tabulartogseachip/environment.yml b/...s/local/tabulartogseachip/environment.yml → .../custom/tabulartogseachip/environment.yml
diff --git a/modules/nf-core/custom/tabulartogseachip/main.nf b/modules/nf-core/custom/tabulartogseachip/main.nf
diff --git a/modules/nf-core/custom/tabulartogseachip/meta.yml b/modules/nf-core/custom/tabulartogseachip/meta.yml