From f382bae5034a2ee0d341a1c7a5e2fdefbae628c0 Mon Sep 17 00:00:00 2001 From: Bjoern Gruening Date: Mon, 27 Jan 2025 21:26:21 +0100 Subject: [PATCH 1/3] updates for 24.2 --- files/galaxy/config/datatypes_conf.xml | 40 ++++++++-- .../config/user_preferences_extra_conf.yml | 20 ++++- group_vars/gxconfig.yml | 76 ++++++++++++++----- templates/galaxy/config/oidc_config.xml | 2 +- templates/galaxy/config/tool_conf.xml.j2 | 1 + 5 files changed, 111 insertions(+), 28 deletions(-) diff --git a/files/galaxy/config/datatypes_conf.xml b/files/galaxy/config/datatypes_conf.xml index 14266f14e..51cf0998f 100644 --- a/files/galaxy/config/datatypes_conf.xml +++ b/files/galaxy/config/datatypes_conf.xml @@ -116,7 +116,11 @@ - + + + SOLID Color-Space sequence data is a rare data type. Consider selecting fasta instead. + + @@ -150,6 +154,9 @@ + + Sequencing data produced since February 2011 is generally using Sanger encoding. Please consider selecting fastqsanger${auto_compressed_type} instead. + @@ -159,6 +166,9 @@ + + Sequencing data produced since February 2011 is generally using Sanger encoding. Please consider selecting fastqsanger${auto_compressed_type} instead. + @@ -184,7 +194,7 @@ - + @@ -198,6 +208,7 @@ + @@ -286,15 +297,25 @@ - + + + - - + + + + + - + + + + + + @@ -379,6 +400,7 @@ + @@ -983,6 +1005,7 @@ + @@ -1015,6 +1038,7 @@ + - + diff --git a/templates/galaxy/config/tool_conf.xml.j2 b/templates/galaxy/config/tool_conf.xml.j2 index de713639a..c6e3bb680 100644 --- a/templates/galaxy/config/tool_conf.xml.j2 +++ b/templates/galaxy/config/tool_conf.xml.j2 @@ -44,6 +44,7 @@ + From 503b60fba59edb03f8567b7b42c07495c8b3c541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gr=C3=BCning?= Date: Sat, 1 Feb 2025 09:48:54 +0100 Subject: [PATCH 2/3] set to true --- templates/galaxy/config/oidc_config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/galaxy/config/oidc_config.xml b/templates/galaxy/config/oidc_config.xml index 6ccd61d38..2520e72f6 100644 --- a/templates/galaxy/config/oidc_config.xml +++ b/templates/galaxy/config/oidc_config.xml @@ -13,7 +13,7 @@ built-in type, which could be any of the following types: int; long; float; str; Note that the values of these attributes are case-sensitive. --> - + From e298715ddb30e8eb9eafc993a26d83171936c2fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gr=C3=BCning?= Date: Sat, 1 Feb 2025 09:53:33 +0100 Subject: [PATCH 3/3] update 24.2 --- group_vars/sn06/sn06.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/group_vars/sn06/sn06.yml b/group_vars/sn06/sn06.yml index 58e52fb83..c98ebb8a9 100644 --- a/group_vars/sn06/sn06.yml +++ b/group_vars/sn06/sn06.yml @@ -323,7 +323,7 @@ galaxy_instance_hostname: usegalaxy.eu galaxy_config_style: yaml galaxy_repo: "https://github.com/usegalaxy-eu/galaxy.git" -galaxy_commit_id: "release_24.1_europe" +galaxy_commit_id: "release_24.2_europe" galaxy_force_checkout: true # discard any modified files #galaxy_admin_email_from: 'noreply@usegalaxy.eu'