-
Notifications
You must be signed in to change notification settings - Fork 98
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
updates for 24.2 #1392
Merged
updates for 24.2 #1392
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -234,7 +234,7 @@ base_app_main: &BASE_APP_MAIN | |
|
||
# conda channels to enable by default | ||
# (https://conda.io/docs/user-guide/tasks/manage-channels.html) | ||
conda_ensure_channels: "conda-forge,bioconda" | ||
#conda_ensure_channels: conda-forge,bioconda | ||
|
||
# Use locally-built conda packages. | ||
#conda_use_local: false | ||
|
@@ -245,8 +245,9 @@ base_app_main: &BASE_APP_MAIN | |
|
||
# Set to true to instruct Galaxy to install Conda from the web | ||
# automatically if it cannot find a local copy and conda_exec is not | ||
# configured. | ||
#conda_auto_init: true | ||
# configured. The default is true if running Galaxy from source, and | ||
# false if running from installed packages. | ||
#conda_auto_init: false | ||
|
||
# You must set this to true if conda_prefix and job_working_directory | ||
# are not on the same volume, or some conda dependencies will fail to | ||
|
@@ -377,15 +378,6 @@ base_app_main: &BASE_APP_MAIN | |
# Configured user file source templates embedded into Galaxy's config. | ||
#file_source_templates: null | ||
|
||
# Configure URIs for user object stores to use either the object ID | ||
# ('id') or UUIDs ('uuid'). Either is fine really, Galaxy doesn't | ||
# typically expose database objects by 'id' but there isn't any | ||
# obvious disadvantage to doing it in this case and it keeps user | ||
# exposed URIs much smaller. The default of UUID feels a little more | ||
# like a typical way to do this within Galaxy though. Do not change | ||
# this value once user object stores have been created. | ||
#user_config_templates_index_by: uuid | ||
|
||
# User defined object stores and file sources are saved in the | ||
# database with their last valid configuration. It may be the case | ||
# that the admin changes file source and object store templates over | ||
|
@@ -769,8 +761,8 @@ base_app_main: &BASE_APP_MAIN | |
# <cache_dir>. | ||
object_store_cache_path: '/data/jwd02f/s3_object_store_cache' | ||
|
||
# Default cache size for caching object stores if cache not configured | ||
# for that object store entry. | ||
# Default cache size, in GB, for caching object stores if the cache is | ||
# not configured for that object store entry. | ||
object_store_cache_size: 10000 | ||
|
||
# Set this to true to indicate in the UI that a user's object store | ||
|
@@ -1013,11 +1005,24 @@ base_app_main: &BASE_APP_MAIN | |
# subdomain. Defaults to "/". | ||
#interactivetools_base_path: / | ||
|
||
# Map for interactivetool proxy. | ||
# Map for the interactivetool proxy. Mappings are stored in a SQLite | ||
# database file located on this path. As an alternative, you may also | ||
# store them in any other RDBMS supported by SQLAlchemy using the | ||
# option ``interactivetoolsproxy_map``, which overrides this one. | ||
# The value of this option will be resolved with respect to | ||
# <data_dir>. | ||
interactivetools_map: "{{ galaxy_mutable_data_dir }}/interactivetools_map.sqlite" | ||
|
||
# Use a database supported by SQLAlchemy as map for the | ||
# interactivetool proxy. When this option is set, the value of | ||
# ``interactivetools_map`` is ignored. The value of this option must | ||
# be a `SQLAlchemy database URL | ||
# <https://docs.sqlalchemy.org/en/20/core/engines.html#database-urls>`_. | ||
# Mappings are written to the table "gxitproxy" within the database. | ||
# This value cannot match ``database_connection`` nor | ||
# ``install_database_connection``. | ||
#interactivetoolsproxy_map: null | ||
|
||
# Prefix to use in the formation of the subdomain or path for | ||
# interactive tools | ||
#interactivetools_prefix: interactivetool | ||
|
@@ -2110,10 +2115,6 @@ base_app_main: &BASE_APP_MAIN | |
# <config_dir>. | ||
job_metrics_config_file: "{{ galaxy_config_dir }}/job_metrics_conf.yml" | ||
|
||
# This option allows users to see the job metrics (except for | ||
# environment variables). | ||
expose_potentially_sensitive_job_metrics: true | ||
|
||
# Rather than specifying a job_metrics_config_file, the definition of | ||
# the metrics to enable can be embedded into Galaxy's config with this | ||
# option. This has no effect if a job_metrics_config_file is used. | ||
|
@@ -2126,7 +2127,7 @@ base_app_main: &BASE_APP_MAIN | |
|
||
# This option allows users to see the job metrics (except for | ||
# environment variables). | ||
#expose_potentially_sensitive_job_metrics: false | ||
expose_potentially_sensitive_job_metrics: true | ||
|
||
# Enable the API for sample tracking | ||
#enable_legacy_sample_tracking_api: false | ||
|
@@ -2444,6 +2445,19 @@ base_app_main: &BASE_APP_MAIN | |
# <config_dir>. | ||
workflow_schedulers_config_file: "{{ galaxy_config_dir }}/workflow_schedulers_conf.xml" | ||
|
||
# Workflows launched with URI/URL inputs that are not marked as | ||
# 'deferred' are "materialized" (or undeferred) by the workflow | ||
# scheduler. This might be a lengthy process. Setting this to 'True' | ||
# will place the invocation back in the queue after materialization | ||
# before scheduling the workflow so it is less likely to starve other | ||
# workflow scheduling. Ideally, Galaxy would allow more fine grain | ||
# control of handlers but until then, this provides a way to tip the | ||
# balance between "doing more work" and "being more fair". The default | ||
# here is pretty arbitrary - it has been to False to optimize Galaxy | ||
# for automated, single user applications where "fairness" is mostly | ||
# irrelevant. | ||
#workflow_scheduling_separate_materialization_iteration: false | ||
|
||
# If using job concurrency limits (configured in job_config_file), | ||
# several extra database queries must be performed to determine the | ||
# number of jobs a user has dispatched to a given destination. By | ||
|
@@ -2573,6 +2587,13 @@ base_app_main: &BASE_APP_MAIN | |
# as threshold (above threshold: regular select fields will be used) | ||
#select_type_workflow_threshold: -1 | ||
|
||
# API key for OpenAI (https://openai.com/) to enable the wizard (or | ||
# more?) | ||
#openai_api_key: null | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ToDo Bjoern, would be nice to put in here a Key. |
||
|
||
# OpenAI model to enable the wizard. | ||
#openai_model: gpt-4o | ||
|
||
# Allow the display of tool recommendations in workflow editor and | ||
# after tool execution. If it is enabled and set to true, please | ||
# enable 'tool_recommendation_model_path' as well | ||
|
@@ -2684,6 +2705,21 @@ base_app_main: &BASE_APP_MAIN | |
# This requires the help_forum_api_url to be set. | ||
enable_help_forum_tool_panel_integration: true | ||
|
||
# Directory to store temporary files for file sources. This defaults | ||
# to new_file_path if not set. | ||
#file_source_temp_dir: null | ||
|
||
# Default value for use_temp_files for webdav plugins that don't | ||
# explicitly declare this. | ||
#file_source_webdav_use_temp_files: true | ||
|
||
# Number of seconds before file source content listings are refreshed. | ||
# Shorter times will result in more queries while browsing a file | ||
# sources. Longer times will result in fewer requests to file sources | ||
# but outdated contents might be displayed to the user. Currently only | ||
# affects s3fs file sources. | ||
#file_source_listings_expiry_time: 60 | ||
|
||
# TODO(hxr): UNDOCUMENTED | ||
ucsc_build_sites: "{{ galaxy_config_dir }}/ucsc_build_sites.txt" | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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: '[email protected]' | ||
|
||
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ping @kysrpex
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's ok, keep it as it is. After Galaxy has been updated I can go through the guide and merge the migration PR that I prepared, it will take care of changing this line.