diff --git a/client/src/components/Workflow/Editor/Node.vue b/client/src/components/Workflow/Editor/Node.vue index 115f51317ee..eda35629761 100644 --- a/client/src/components/Workflow/Editor/Node.vue +++ b/client/src/components/Workflow/Editor/Node.vue @@ -70,6 +70,7 @@ v-for="output in outputs" :key="output.name" :output="output" + :post-job-actions="postJobActions" :get-node="getNode" :get-manager="getManager" @onAdd="onAddOutput" diff --git a/client/src/components/Workflow/Editor/NodeInput.vue b/client/src/components/Workflow/Editor/NodeInput.vue index eabe07a0f26..12950a113f7 100644 --- a/client/src/components/Workflow/Editor/NodeInput.vue +++ b/client/src/components/Workflow/Editor/NodeInput.vue @@ -61,10 +61,11 @@ export default { oldTerminal.destroyInvalidConnections(); } else { // create new terminal, connect like old terminal, destroy old terminal + // this might be a little buggy, the terminals and connectors should be vue components this.$emit("onRemove", this.input); const newTerminal = this.createTerminal(newInput); newTerminal.connectors = this.terminal.connectors.map((c) => { - return new Connector(this.getManager(), c.outputHandle, newTerminal); + return new Connector(this.getManager().canvasManager, c.outputHandle, newTerminal); }); newTerminal.destroyInvalidConnections(); this.terminal = newTerminal; diff --git a/client/src/components/Workflow/Editor/NodeOutput.vue b/client/src/components/Workflow/Editor/NodeOutput.vue index cfa11eb3490..0a28967de1a 100644 --- a/client/src/components/Workflow/Editor/NodeOutput.vue +++ b/client/src/components/Workflow/Editor/NodeOutput.vue @@ -34,6 +34,10 @@ export default { type: Function, required: true, }, + postJobActions: { + type: Object, + required: true, + }, }, data() { return { @@ -46,12 +50,8 @@ export default { return `node-${node.id}-output-${this.output.name}`; }, label() { - let extensions = this.output.extensions || this.output.type || "unspecified"; - if (Array.isArray(extensions)) { - extensions = extensions.join(", "); - } const activeLabel = this.output.activeLabel || this.output.label || this.output.name; - return `${activeLabel} (${extensions})`; + return `${activeLabel} (${this.extensions.join(", ")})`; }, activeClass() { return this.output.activeOutput && "mark-terminal-active"; @@ -67,6 +67,19 @@ export default { } return cls; }, + forcedExtension() { + const changeDatatype = + this.postJobActions[`ChangeDatatypeAction${this.output.label}`] || + this.postJobActions[`ChangeDatatypeAction${this.output.name}`]; + return changeDatatype?.action_arguments.newtype; + }, + extensions() { + let extensions = this.forcedExtension || this.output.extensions || this.output.type || "unspecified"; + if (!Array.isArray(extensions)) { + extensions = [extensions]; + } + return extensions; + }, }, watch: { label() { @@ -78,14 +91,15 @@ export default { output(newOutput) { const oldTerminal = this.terminal; if (oldTerminal instanceof this.terminalClassForOutput(newOutput)) { - oldTerminal.update(newOutput); + oldTerminal.update({ ...newOutput, extensions: this.extensions }); oldTerminal.destroyInvalidConnections(); } else { // create new terminal, connect like old terminal, destroy old terminal + // this might be a little buggy, we should replace this with proper vue components this.$emit("onRemove", this.output); this.createTerminal(newOutput); this.terminal.connectors = oldTerminal.connectors.map((c) => { - return new Connector(this.getManager(), this.terminal, c.inputHandle); + return new Connector(this.getManager().canvasManager, this.terminal, c.inputHandle); }); this.terminal.destroyInvalidConnections(); oldTerminal.destroy(); @@ -124,7 +138,7 @@ export default { ...parameters, collection_type: collection_type, collection_type_source: collection_type_source, - datatypes: output.extensions, + datatypes: this.extensions, }); } else if (output.parameter) { this.terminal = new terminalClass({ @@ -134,7 +148,7 @@ export default { } else { this.terminal = new terminalClass({ ...parameters, - datatypes: output.extensions, + datatypes: this.extensions, }); } new OutputDragging(this.getManager(), { diff --git a/client/src/components/Workflow/Editor/modules/connector.js b/client/src/components/Workflow/Editor/modules/connector.js index 7de6360f1d4..932cbcabb63 100644 --- a/client/src/components/Workflow/Editor/modules/connector.js +++ b/client/src/components/Workflow/Editor/modules/connector.js @@ -1,4 +1,3 @@ -import $ from "jquery"; import * as d3 from "d3"; import { Toast } from "ui/toast"; @@ -13,9 +12,17 @@ const ribbonOuterSingle = 6; const ribbonInnerMultiple = 1; const ribbonOuterMultiple = 3; +function offset(element) { + const rect = element.getBoundingClientRect(); + return { + top: rect.top + window.scrollY, + left: rect.left + window.scrollX, + }; +} + class Connector { - constructor(manager = {}, outputHandle = null, inputHandle = null) { - this.manager = manager; + constructor(canvasManager = {}, outputHandle = null, inputHandle = null) { + this.manager = canvasManager; this.dragging = false; this.innerClass = "ribbon-inner"; this.canvas = document.createElement("div"); @@ -59,31 +66,33 @@ class Connector { } redraw() { // Identify handles - const canvasContainer = $("#canvas-container"); + const canvasContainer = document.getElementById("canvas-container"); const outputHandle = this.outputHandle; const inputHandle = this.inputHandle; - if (!canvasContainer.length || !outputHandle || !inputHandle) { + if (!canvasContainer || !outputHandle || !inputHandle) { return; } - const canvasZoom = this.manager.canvasZoom; if (this.dragging) { this.canvas.style.zIndex = zIndex; } - const relativeLeft = (e) => ($(e).offset().left - canvasContainer.offset().left) / canvasZoom; - const relativeTop = (e) => ($(e).offset().top - canvasContainer.offset().top) / canvasZoom; if (!outputHandle || !inputHandle) { return; } - // Set handle ids, used in test cases this.canvas.setAttribute("output-handle-id", outputHandle.element.getAttribute("id")); this.canvas.setAttribute("input-handle-id", inputHandle.element.getAttribute("id")); // Find the position of each handle - let start_x = relativeLeft(outputHandle.element) + handleMarginX; - let start_y = relativeTop(outputHandle.element) + 0.5 * $(outputHandle.element).height(); - let end_x = relativeLeft(inputHandle.element) + handleMarginX; - let end_y = relativeTop(inputHandle.element) + 0.5 * $(inputHandle.element).height(); + const canvasZoom = this.manager.canvasZoom; + + const relativeLeft = (e) => (offset(e).left - offset(canvasContainer).left) / canvasZoom + handleMarginX; + const relativeTop = (e) => + (offset(e).top - offset(canvasContainer).top) / canvasZoom + 0.5 * inputHandle.element.offsetHeight; + + let start_x = relativeLeft(outputHandle.element); + let start_y = relativeTop(outputHandle.element); + let end_x = relativeLeft(inputHandle.element); + let end_y = relativeTop(inputHandle.element); // Calculate canvas area const canvas_min_x = Math.min(start_x, end_x); diff --git a/client/src/components/Workflow/Editor/modules/terminals.js b/client/src/components/Workflow/Editor/modules/terminals.js index 359c1c736bb..918c4ed963c 100644 --- a/client/src/components/Workflow/Editor/modules/terminals.js +++ b/client/src/components/Workflow/Editor/modules/terminals.js @@ -333,34 +333,37 @@ class BaseInputTerminal extends Terminal { } _producesAcceptableDatatype(other) { // other is a non-collection output... - for (var t in this.datatypes) { - var thisDatatype = this.datatypes[t]; + for (const t in this.datatypes) { + const thisDatatype = this.datatypes[t]; if (thisDatatype == "input") { return new ConnectionAcceptable(true, null); } - var cat_outputs = []; - const other_datatypes = other.force_datatype ? [other.force_datatype] : other.datatypes; - cat_outputs = cat_outputs.concat(other_datatypes); // FIXME: No idea what to do about case when datatype is 'input' - for (var other_datatype_i in cat_outputs) { - var other_datatype = cat_outputs[other_datatype_i]; - if ( + const validMatch = other.datatypes.some( + (other_datatype) => other_datatype == "input" || other_datatype == "_sniff_" || - this._isSubType(cat_outputs[other_datatype_i], thisDatatype) - ) { - return new ConnectionAcceptable(true, null); - } else if (!this.datatypesMapper.datatypes.includes(other_datatype)) { - return new ConnectionAcceptable( - false, - `Effective output data type [${other_datatype}] unknown. This tool cannot be executed on this Galaxy Server at this moment, please contact the Administrator.` - ); - } + this._isSubType(other_datatype, thisDatatype) + ); + if (validMatch) { + return new ConnectionAcceptable(true, null); } } + const datatypesSet = new Set(this.datatypesMapper.datatypes); + const invalidDatatypes = other.datatypes.filter((datatype) => !datatypesSet.has(datatype)); + if (invalidDatatypes.length) { + return new ConnectionAcceptable( + false, + `Effective output data type(s) [${invalidDatatypes.join( + ", " + )}] unknown. This tool cannot be executed on this Galaxy Server at this moment, please contact the Administrator.` + ); + } return new ConnectionAcceptable( false, - `Effective output data type(s) [${cat_outputs}] do not appear to match input type(s) [${this.datatypes}].` + `Effective output data type(s) [${other.datatypes.join( + ", " + )}] do not appear to match input type(s) [${this.datatypes.join(", ")}].` ); } _isSubType(child, parent) { @@ -606,10 +609,6 @@ class BaseOutputTerminal extends Terminal { this.setMapOver(this.node.mapOver); } } - get force_datatype() { - const changeOutputDatatype = this.node.postJobActions["ChangeDatatypeAction" + this.name]; - return changeOutputDatatype ? changeOutputDatatype.action_arguments["newtype"] : null; - } update(output) { this.datatypes = output.datatypes || output.extensions; this.optional = output.optional; diff --git a/client/src/utils/navigation/navigation.yml b/client/src/utils/navigation/navigation.yml index 196db78dcc4..f920f0fecd6 100644 --- a/client/src/utils/navigation/navigation.yml +++ b/client/src/utils/navigation/navigation.yml @@ -580,6 +580,10 @@ workflow_editor: destroy: '${_} .node-destroy' clone: '${_} .node-clone' + + output_data_row: + type: xpath + selector: '//div[contains(@class, "output-data-row") and contains(string(), "${output_name} (${extension})")]' output_terminal: "${_} [output-name='${name}']" input_terminal: "${_} [input-name='${name}']" diff --git a/client/tests/qunit/tests/workflow_editor_tests.js b/client/tests/qunit/tests/workflow_editor_tests.js index bf4f43b7317..7d67f2282d1 100644 --- a/client/tests/qunit/tests/workflow_editor_tests.js +++ b/client/tests/qunit/tests/workflow_editor_tests.js @@ -148,7 +148,7 @@ QUnit.test("test destroy", function (assert) { }); QUnit.test("can accept exact datatype", function (assert) { - const other = { node: {}, datatypes: ["txt"], force_datatype: null }; // input also txt + const other = { node: {}, datatypes: ["txt"] }; // input also txt assert.ok(this.test_accept(other)); }); @@ -162,16 +162,6 @@ QUnit.test("cannot accept incorrect datatype", function (assert) { assert.ok(!this.test_accept(other)); }); -QUnit.test("can accept incorrect datatype if converted with PJA", function (assert) { - const other = { node: {}, datatypes: ["binary"], force_datatype: "txt", name: "out1" }; // Was binary but converted to txt - assert.ok(this.test_accept(other)); -}); - -QUnit.test("cannot accept incorrect datatype if converted with PJA to incompatible type", function (assert) { - const other = { node: {}, datatypes: ["binary"], force_datatype: "bam", name: "out1" }; - assert.ok(!this.test_accept(other)); -}); - QUnit.test("can accept inputs", function (assert) { // Other is data input module - always accept (currently - could be // more intelligent by looking at what else input is connected to. @@ -324,11 +314,11 @@ QUnit.module("Input collection terminal model test", { QUnit.test("Collection output can connect to same collection input type", function (assert) { const inputTerminal = this.input_terminal; const outputTerminal = new Terminals.OutputCollectionTerminal({ - datatypes: "txt", + datatypes: ["txt"], collection_type: "list", node: {}, }); - outputTerminal.node = {postJobActions: {}}; + outputTerminal.node = { postJobActions: {} }; assert.ok( inputTerminal.canAccept(outputTerminal).canAccept, "Input terminal " + inputTerminal + " can not accept " + outputTerminal @@ -338,7 +328,7 @@ QUnit.test("Collection output can connect to same collection input type", functi QUnit.test("Optional collection output can not connect to required collection input", function (assert) { const inputTerminal = this.input_terminal; const outputTerminal = new Terminals.OutputCollectionTerminal({ - datatypes: "txt", + datatypes: ["txt"], collection_type: "list", optional: true, node: {}, @@ -350,7 +340,7 @@ QUnit.test("Optional collection output can not connect to required collection in QUnit.test("Collection output cannot connect to different collection input type", function (assert) { const inputTerminal = this.input_terminal; const outputTerminal = new Terminals.OutputCollectionTerminal({ - datatypes: "txt", + datatypes: ["txt"], collection_type: "paired", node: {}, }); @@ -519,7 +509,7 @@ QUnit.test("update_field_data destroys old terminals", function (assert) { this.update_field_data_with_new_input(); Vue.nextTick(() => { assert.ok(destroy_spy.called); - }) + }); }); }); @@ -698,37 +688,38 @@ QUnit.test("replacing terminal on data input with collection changes mapping vie }); }); -QUnit.test("replacing terminal on data collection input with simple input changes mapping view type", function ( - assert -) { - const node = this.node; - node.inputs.push({ name: "TestName", extensions: ["txt"], input_type: "parameter" }); - this.connectAttachedMappedOutput((connector) => { - const connector_destroy_spy = sinon.spy(connector, "destroy"); - const data = { - inputs: [{ name: "TestName", extensions: ["txt"], input_type: "dataset" }], - outputs: [], - }; - node.setNode(data); - Vue.nextTick(() => { - $(node.element).find(".input-terminal")[0].terminal; - assert.ok(connector_destroy_spy.called); +QUnit.test( + "replacing terminal on data collection input with simple input changes mapping view type", + function (assert) { + const node = this.node; + node.inputs.push({ name: "TestName", extensions: ["txt"], input_type: "parameter" }); + this.connectAttachedMappedOutput((connector) => { + const connector_destroy_spy = sinon.spy(connector, "destroy"); + const data = { + inputs: [{ name: "TestName", extensions: ["txt"], input_type: "dataset" }], + outputs: [], + }; + node.setNode(data); + Vue.nextTick(() => { + $(node.element).find(".input-terminal")[0].terminal; + assert.ok(connector_destroy_spy.called); + }); }); - }); -}); + } +); // global InputTerminalView QUnit.module("Input terminal view", { beforeEach: function () { this.node = buildNode({ type: "tool", name: "newnode" }); - this.input = { name: "i1", extensions: "txt", multiple: false }; + this.input = { name: "i1", extensions: ["txt"], multiple: false }; this.node.initData({ inputs: [this.input], outputs: [] }); }, }); QUnit.test("terminal added to node", function (assert) { assert.ok(this.node.inputTerminals.i1); - assert.equal(this.node.inputTerminals.i1.datatypes, ["txt"]); + assert.equal(this.node.inputTerminals.i1.datatypes[0], "txt"); assert.equal(this.node.inputTerminals.i1.multiple, false); }); @@ -746,14 +737,14 @@ QUnit.test("terminal element", function (assert) { QUnit.module("Output terminal view", { beforeEach: function () { this.node = buildNode({ type: "tool", name: "newnode" }); - this.output = { name: "o1", extensions: "txt" }; + this.output = { name: "o1", extensions: ["txt"] }; this.node.initData({ inputs: [], outputs: [this.output] }); }, }); QUnit.test("terminal added to node", function (assert) { assert.ok(this.node.outputTerminals.o1); - assert.equal(this.node.outputTerminals.o1.datatypes, ["txt"]); + assert.equal(this.node.outputTerminals.o1.datatypes[0], "txt"); }); QUnit.test("terminal element", function (assert) { @@ -1022,7 +1013,7 @@ QUnit.module("terminal mapping logic", { verifyNotMappedOver: function (assert, terminal) { assert.ok(!terminal.mapOver.isCollection); }, - verifyDefaultMapOver: function(assert, terminal) { + verifyDefaultMapOver: function (assert, terminal) { const outputCollectionTerminal = this.newOutputCollectionTerminal("list"); assert.ok(!terminal.node.mapOver); const connector = new Connector({}, outputCollectionTerminal, terminal); @@ -1030,7 +1021,7 @@ QUnit.module("terminal mapping logic", { assert.ok(terminal.node.mapOver); terminal.disconnect(connector); assert.ok(!terminal.node.mapOver); - } + }, }); QUnit.test("unconstrained input can be mapped over", function (assert) { @@ -1046,14 +1037,15 @@ QUnit.test("unmapped input can be mapped over if matching connected input termin this.verifyAttachable(assert, this.inputTerminal1, "list"); }); -QUnit.test("unmapped input cannot be mapped over if not matching connected input terminals map type", function ( - assert -) { - this.inputTerminal1 = this.newInputTerminal(); - const connectedInput = this.addConnectedInput(this.inputTerminal1); - connectedInput.setMapOver(new Terminals.CollectionTypeDescription("paired")); - this.verifyNotAttachable(assert, this.inputTerminal1, "list"); -}); +QUnit.test( + "unmapped input cannot be mapped over if not matching connected input terminals map type", + function (assert) { + this.inputTerminal1 = this.newInputTerminal(); + const connectedInput = this.addConnectedInput(this.inputTerminal1); + connectedInput.setMapOver(new Terminals.CollectionTypeDescription("paired")); + this.verifyNotAttachable(assert, this.inputTerminal1, "list"); + } +); QUnit.test( "unmapped input can be attached to by output collection if matching connected input terminals map type", @@ -1137,17 +1129,18 @@ QUnit.test("unmapped input with connected mapped outputs can be mapped over if m this.verifyAttachable(assert, this.inputTerminal1, "list"); }); -QUnit.test("unmapped input with connected mapped outputs cannot be mapped over if mapover not matching", function ( - assert -) { - // It would invalidate the connections - someday maybe we could try to - // recursively map over everything down the DAG - it would be expensive - // to check that though. - this.inputTerminal1 = this.newInputTerminal(); - const connectedOutput = this.addConnectedOutput(this.inputTerminal1); - connectedOutput.setMapOver(new Terminals.CollectionTypeDescription("paired")); - this.verifyNotAttachable(assert, this.inputTerminal1, "list"); -}); +QUnit.test( + "unmapped input with connected mapped outputs cannot be mapped over if mapover not matching", + function (assert) { + // It would invalidate the connections - someday maybe we could try to + // recursively map over everything down the DAG - it would be expensive + // to check that though. + this.inputTerminal1 = this.newInputTerminal(); + const connectedOutput = this.addConnectedOutput(this.inputTerminal1); + connectedOutput.setMapOver(new Terminals.CollectionTypeDescription("paired")); + this.verifyNotAttachable(assert, this.inputTerminal1, "list"); + } +); QUnit.test("explicitly constrained input can not be mapped over by incompatible collection type", function (assert) { this.inputTerminal1 = this.newInputTerminal(); @@ -1245,15 +1238,16 @@ QUnit.test("resetMappingIfNeeded an input resets node outputs if they not connec this.verifyNotMappedOver(assert, output); }); -QUnit.test("resetMappingIfNeeded an input resets node collection outputs if they not connected to anything", function ( - assert -) { - this.inputTerminal1 = this.newInputTerminal("list"); - const output = this.addCollectionOutput(this.inputTerminal1); - output.setMapOver(new Terminals.CollectionTypeDescription("list")); - this.inputTerminal1.resetMappingIfNeeded(); - this.verifyNotMappedOver(assert, output); -}); +QUnit.test( + "resetMappingIfNeeded an input resets node collection outputs if they not connected to anything", + function (assert) { + this.inputTerminal1 = this.newInputTerminal("list"); + const output = this.addCollectionOutput(this.inputTerminal1); + output.setMapOver(new Terminals.CollectionTypeDescription("list")); + this.inputTerminal1.resetMappingIfNeeded(); + this.verifyNotMappedOver(assert, output); + } +); QUnit.test("resetMappingIfNeeded resets if not last mapped over input", function (assert) { // Idea here is that other nodes are forcing output to still be mapped diff --git a/cron/updateucsc.sh.sample b/cron/updateucsc.sh.sample index 8d0090913fd..4691293716a 100644 --- a/cron/updateucsc.sh.sample +++ b/cron/updateucsc.sh.sample @@ -60,7 +60,7 @@ then cp -f "${GALAXY}/tool-data/shared/ucsc/new/ucsc_build_sites.txt" "${GALAXY}/tool-data/shared/ucsc/ucsc_build_sites.txt" fi else - echo "Failed to update builds.txt" >&2 + echo "Failed to update ucsc_build_sites.txt" >&2 fi # Try to build chromInfo tables diff --git a/doc/source/admin/config.rst b/doc/source/admin/config.rst index 0d95c1595a2..a2ffed2b8af 100644 --- a/doc/source/admin/config.rst +++ b/doc/source/admin/config.rst @@ -93,7 +93,7 @@ Configuration Basics ---------------------------- - Edit ``config/galaxy.yml`` (copy it from ``config/galaxy.yml.sample`` if it does not exist) to make configuration - changes. This is a `YAML configuration file`_ and should contain one or two sections, one named ``gravity`` for + changes. This is a YAML configuration file and should contain one or two sections, one named ``gravity`` for process management via `Gravity`_ (optional) and one named ``galaxy`` for Galaxy (required). - The `gravity` section contain several important options about how to diff --git a/doc/source/admin/config_logging.rst b/doc/source/admin/config_logging.rst index cd6e4460a9a..33348695a9a 100644 --- a/doc/source/admin/config_logging.rst +++ b/doc/source/admin/config_logging.rst @@ -9,22 +9,19 @@ There are two ways in which you can configure logging for Galaxy servers: 1. Basic/automatic configuration with control over log level and log destination (standard output or a named log file). 2. More complex configuration using the Python :mod:`logging` module's :func:`logging.config.dictConfig` or :func:`logging.config.fileConfig`. -By default, Galaxy logs all messages to standard output at the ``DEBUG`` logging level, unless the ``--daemon`` argument -is passed to ``run.sh``, in which case, output is logged to a location configured in `gravity`_. - -Gravity and related terminology are explained in detail in the :doc:`Scaling and Load Balancing ` documentation. - Basic Configuration ---------------------------- -Basic logging configuration can be used to modify the level of log messages and the file to which Galaxy logs. The level -is controlled by the ``log_level`` configuration option. +Basic logging configuration can be used to modify the level of log messages and the file to which Galaxy logs. -If not set, Galaxy logs all messages at the ``DEBUG`` level (versions prior to 18.01 defaulted to ``INFO`` if unset, but -the default config file shipped with ``log_level`` explicitly set to ``DEBUG`` for development purposes). +The logging level is controlled by the ``log_level`` configuration option. By default, Galaxy logs all messages at the +``DEBUG`` level. -Galaxy logs all messages to standard output by default if running in the foreground. If running in the background, the -log is written to a location configured in `gravity`_. +Galaxy logs all messages to standard output by default if running in the foreground. If running in the background (e.g. +by passing the ``--daemon`` argument to ``run.sh``), the log is written to a location configured in +`gravity `_. + +Gravity and related terminology are explained in detail in the :doc:`Scaling and Load Balancing ` documentation. **Setting the log level:** diff --git a/doc/source/lib/galaxy.app_unittest_utils.rst b/doc/source/lib/galaxy.app_unittest_utils.rst index b7102289a47..03d8255bcae 100644 --- a/doc/source/lib/galaxy.app_unittest_utils.rst +++ b/doc/source/lib/galaxy.app_unittest_utils.rst @@ -9,14 +9,6 @@ galaxy.app\_unittest\_utils package Submodules ---------- -galaxy.app\_unittest\_utils.celery\_helper module -------------------------------------------------- - -.. automodule:: galaxy.app_unittest_utils.celery_helper - :members: - :undoc-members: - :show-inheritance: - galaxy.app\_unittest\_utils.galaxy\_mock module ----------------------------------------------- diff --git a/doc/source/lib/galaxy.containers.rst b/doc/source/lib/galaxy.containers.rst deleted file mode 100644 index 6a1a6952015..00000000000 --- a/doc/source/lib/galaxy.containers.rst +++ /dev/null @@ -1,42 +0,0 @@ -galaxy.containers package -========================= - -.. automodule:: galaxy.containers - :members: - :undoc-members: - :show-inheritance: - -Submodules ----------- - -galaxy.containers.docker module -------------------------------- - -.. automodule:: galaxy.containers.docker - :members: - :undoc-members: - :show-inheritance: - -galaxy.containers.docker\_decorators module -------------------------------------------- - -.. automodule:: galaxy.containers.docker_decorators - :members: - :undoc-members: - :show-inheritance: - -galaxy.containers.docker\_model module --------------------------------------- - -.. automodule:: galaxy.containers.docker_model - :members: - :undoc-members: - :show-inheritance: - -galaxy.containers.docker\_swarm module --------------------------------------- - -.. automodule:: galaxy.containers.docker_swarm - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/lib/galaxy.datatypes.rst b/doc/source/lib/galaxy.datatypes.rst index ba4f5c2ed25..6975459123f 100644 --- a/doc/source/lib/galaxy.datatypes.rst +++ b/doc/source/lib/galaxy.datatypes.rst @@ -268,6 +268,14 @@ galaxy.datatypes.proteomics module :undoc-members: :show-inheritance: +galaxy.datatypes.qiime2 module +------------------------------ + +.. automodule:: galaxy.datatypes.qiime2 + :members: + :undoc-members: + :show-inheritance: + galaxy.datatypes.qualityscore module ------------------------------------ diff --git a/doc/source/lib/galaxy.files.rst b/doc/source/lib/galaxy.files.rst index 47b7e4bf13d..8d98f0d70b8 100644 --- a/doc/source/lib/galaxy.files.rst +++ b/doc/source/lib/galaxy.files.rst @@ -14,3 +14,14 @@ Subpackages galaxy.files.sources galaxy.files.unittest_utils + +Submodules +---------- + +galaxy.files.uris module +------------------------ + +.. automodule:: galaxy.files.uris + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/lib/galaxy.job_metrics.instrumenters.rst b/doc/source/lib/galaxy.job_metrics.instrumenters.rst index 54615895b99..c6312d28484 100644 --- a/doc/source/lib/galaxy.job_metrics.instrumenters.rst +++ b/doc/source/lib/galaxy.job_metrics.instrumenters.rst @@ -17,14 +17,6 @@ galaxy.job\_metrics.instrumenters.cgroup module :undoc-members: :show-inheritance: -galaxy.job\_metrics.instrumenters.collectl module -------------------------------------------------- - -.. automodule:: galaxy.job_metrics.instrumenters.collectl - :members: - :undoc-members: - :show-inheritance: - galaxy.job\_metrics.instrumenters.core module --------------------------------------------- diff --git a/doc/source/lib/galaxy.job_metrics.rst b/doc/source/lib/galaxy.job_metrics.rst index f8c01bd1cb5..73af55fcaf0 100644 --- a/doc/source/lib/galaxy.job_metrics.rst +++ b/doc/source/lib/galaxy.job_metrics.rst @@ -24,3 +24,11 @@ galaxy.job\_metrics.formatting module :members: :undoc-members: :show-inheritance: + +galaxy.job\_metrics.safety module +--------------------------------- + +.. automodule:: galaxy.job_metrics.safety + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/lib/galaxy.managers.rst b/doc/source/lib/galaxy.managers.rst index 0a1c0bebbc1..426630b05c1 100644 --- a/doc/source/lib/galaxy.managers.rst +++ b/doc/source/lib/galaxy.managers.rst @@ -273,6 +273,14 @@ galaxy.managers.metrics module :undoc-members: :show-inheritance: +galaxy.managers.model\_stores module +------------------------------------ + +.. automodule:: galaxy.managers.model_stores + :members: + :undoc-members: + :show-inheritance: + galaxy.managers.pages module ---------------------------- diff --git a/doc/source/lib/galaxy.model.migrate.rst b/doc/source/lib/galaxy.model.migrate.rst deleted file mode 100644 index 7f78af9078c..00000000000 --- a/doc/source/lib/galaxy.model.migrate.rst +++ /dev/null @@ -1,27 +0,0 @@ -galaxy.model.migrate package -============================ - -.. automodule:: galaxy.model.migrate - :members: - :undoc-members: - :show-inheritance: - -Subpackages ------------ - -.. toctree:: - :maxdepth: 4 - - galaxy.model.migrate.triggers - galaxy.model.migrate.versions - -Submodules ----------- - -galaxy.model.migrate.check module ---------------------------------- - -.. automodule:: galaxy.model.migrate.check - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/lib/galaxy.model.migrate.triggers.rst b/doc/source/lib/galaxy.model.migrate.triggers.rst deleted file mode 100644 index 7297f66154f..00000000000 --- a/doc/source/lib/galaxy.model.migrate.triggers.rst +++ /dev/null @@ -1,26 +0,0 @@ -galaxy.model.migrate.triggers package -===================================== - -.. automodule:: galaxy.model.migrate.triggers - :members: - :undoc-members: - :show-inheritance: - -Submodules ----------- - -galaxy.model.migrate.triggers.history\_update\_time\_field module ------------------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.triggers.history_update_time_field - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.triggers.update\_audit\_table module ---------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.triggers.update_audit_table - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/lib/galaxy.model.migrate.versions.rst b/doc/source/lib/galaxy.model.migrate.versions.rst deleted file mode 100644 index 07d2348277c..00000000000 --- a/doc/source/lib/galaxy.model.migrate.versions.rst +++ /dev/null @@ -1,1458 +0,0 @@ -galaxy.model.migrate.versions package -===================================== - -.. automodule:: galaxy.model.migrate.versions - :members: - :undoc-members: - :show-inheritance: - -Submodules ----------- - -galaxy.model.migrate.versions.0001\_initial\_tables module ----------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0001_initial_tables - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0002\_metadata\_file\_table module ----------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0002_metadata_file_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0003\_security\_and\_libraries module -------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0003_security_and_libraries - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0004\_indexes\_and\_defaults module ------------------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.0004_indexes_and_defaults - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0005\_cleanup\_datasets\_fix module ------------------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.0005_cleanup_datasets_fix - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0006\_change\_qual\_datatype module ------------------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.0006_change_qual_datatype - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0007\_sharing\_histories module -------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0007_sharing_histories - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0008\_galaxy\_forms module --------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0008_galaxy_forms - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0009\_request\_table module ---------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0009_request_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0010\_hda\_display\_at\_authz\_table module -------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0010_hda_display_at_authz_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0011\_v0010\_mysql\_index\_fix module -------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0011_v0010_mysql_index_fix - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0012\_user\_address module --------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0012_user_address - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0013\_change\_lib\_item\_templates\_to\_forms module ----------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0013_change_lib_item_templates_to_forms - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0014\_pages module ------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0014_pages - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0015\_tagging module --------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0015_tagging - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0016\_v0015\_mysql\_index\_fix module -------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0016_v0015_mysql_index_fix - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0017\_library\_item\_indexes module ------------------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.0017_library_item_indexes - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0018\_ordered\_tags\_and\_page\_tags module -------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0018_ordered_tags_and_page_tags - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0019\_request\_library\_folder module -------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0019_request_library_folder - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0020\_library\_upload\_job module ---------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0020_library_upload_job - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0021\_user\_prefs module ------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0021_user_prefs - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0022\_visualization\_tables module ----------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0022_visualization_tables - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0023\_page\_published\_and\_deleted\_columns module ---------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0023_page_published_and_deleted_columns - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0024\_page\_slug\_unique\_constraint module -------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0024_page_slug_unique_constraint - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0025\_user\_info module ------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.0025_user_info - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0026\_cloud\_tables module --------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0026_cloud_tables - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0027\_request\_events module ----------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0027_request_events - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0028\_external\_metadata\_file\_override module ------------------------------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.0028_external_metadata_file_override - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0029\_user\_actions module --------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0029_user_actions - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0030\_history\_slug\_column module ----------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0030_history_slug_column - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0031\_community\_and\_workflow\_tags module -------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0031_community_and_workflow_tags - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0032\_stored\_workflow\_slug\_column module -------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0032_stored_workflow_slug_column - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0033\_published\_cols\_for\_histories\_and\_workflows module ------------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0033_published_cols_for_histories_and_workflows - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0034\_page\_user\_share\_association module -------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0034_page_user_share_association - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0035\_item\_annotations\_and\_workflow\_step\_tags module ---------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0035_item_annotations_and_workflow_step_tags - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0036\_add\_deleted\_column\_to\_library\_template\_assoc\_tables module ------------------------------------------------------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.0036_add_deleted_column_to_library_template_assoc_tables - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0037\_samples\_library module ------------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.0037_samples_library - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0038\_add\_inheritable\_column\_to\_library\_template\_assoc\_tables module ---------------------------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0038_add_inheritable_column_to_library_template_assoc_tables - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0039\_add\_synopsis\_column\_to\_library\_table module ------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0039_add_synopsis_column_to_library_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0040\_page\_annotations module ------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0040_page_annotations - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0041\_workflow\_invocation module ---------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0041_workflow_invocation - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0042\_workflow\_invocation\_fix module --------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0042_workflow_invocation_fix - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0043\_visualization\_sharing\_tagging\_annotating module --------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0043_visualization_sharing_tagging_annotating - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0044\_add\_notify\_column\_to\_request\_table module ----------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0044_add_notify_column_to_request_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0045\_request\_type\_permissions\_table module ----------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0045_request_type_permissions_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0046\_post\_job\_actions module -------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0046_post_job_actions - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0047\_job\_table\_user\_id\_column module ------------------------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.0047_job_table_user_id_column - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0048\_dataset\_instance\_state\_column module ---------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0048_dataset_instance_state_column - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0049\_api\_keys\_table module ------------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.0049_api_keys_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0050\_drop\_cloud\_tables module --------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0050_drop_cloud_tables - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0051\_imported\_col\_for\_jobs\_table module --------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0051_imported_col_for_jobs_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0052\_sample\_dataset\_table module ------------------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.0052_sample_dataset_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0053\_item\_ratings module --------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0053_item_ratings - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0054\_visualization\_dbkey module ---------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0054_visualization_dbkey - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0055\_add\_pja\_assoc\_for\_jobs module ---------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0055_add_pja_assoc_for_jobs - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0056\_workflow\_outputs module ------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0056_workflow_outputs - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0057\_request\_notify module ----------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0057_request_notify - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0058\_history\_import\_export module ------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0058_history_import_export - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0059\_sample\_dataset\_file\_path module ----------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0059_sample_dataset_file_path - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0060\_history\_archive\_import module -------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0060_history_archive_import - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0061\_tasks module ------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0061_tasks - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0062\_user\_openid\_table module --------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0062_user_openid_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0063\_sequencer\_table module ------------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.0063_sequencer_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0064\_add\_run\_and\_sample\_run\_association\_tables module ------------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0064_add_run_and_sample_run_association_tables - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0065\_add\_name\_to\_form\_fields\_and\_values module ------------------------------------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.0065_add_name_to_form_fields_and_values - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0066\_deferred\_job\_and\_transfer\_job\_tables module ------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0066_deferred_job_and_transfer_job_tables - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0067\_populate\_sequencer\_table module ---------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0067_populate_sequencer_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0068\_rename\_sequencer\_to\_external\_services module ------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0068_rename_sequencer_to_external_services - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0069\_rename\_sequencer\_form\_type module ------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0069_rename_sequencer_form_type - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0070\_add\_info\_column\_to\_deferred\_job\_table module --------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0070_add_info_column_to_deferred_job_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0071\_add\_history\_and\_workflow\_to\_sample module ----------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0071_add_history_and_workflow_to_sample - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0072\_add\_pid\_and\_socket\_columns\_to\_transfer\_job\_table module ---------------------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0072_add_pid_and_socket_columns_to_transfer_job_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0073\_add\_ldda\_to\_implicit\_conversion\_table module -------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0073_add_ldda_to_implicit_conversion_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0074\_add\_purged\_column\_to\_library\_dataset\_table module -------------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0074_add_purged_column_to_library_dataset_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0075\_add\_subindex\_column\_to\_run\_table module --------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0075_add_subindex_column_to_run_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0076\_fix\_form\_values\_data\_corruption module ------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0076_fix_form_values_data_corruption - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0077\_create\_tool\_tag\_association\_table module --------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0077_create_tool_tag_association_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0078\_add\_columns\_for\_disk\_usage\_accounting module -------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0078_add_columns_for_disk_usage_accounting - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0079\_input\_library\_to\_job\_table module -------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0079_input_library_to_job_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0080\_quota\_tables module --------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0080_quota_tables - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0081\_add\_tool\_version\_to\_hda\_ldda module ----------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0081_add_tool_version_to_hda_ldda - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0082\_add\_tool\_shed\_repository\_table module ------------------------------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.0082_add_tool_shed_repository_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0083\_add\_prepare\_files\_to\_task module ------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0083_add_prepare_files_to_task - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0084\_add\_ldda\_id\_to\_implicit\_conversion\_table module ------------------------------------------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.0084_add_ldda_id_to_implicit_conversion_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0085\_add\_task\_info module ----------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0085_add_task_info - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0086\_add\_tool\_shed\_repository\_table\_columns module --------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0086_add_tool_shed_repository_table_columns - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0087\_tool\_id\_guid\_map\_table module ---------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0087_tool_id_guid_map_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0088\_add\_installed\_changeset\_revison\_column module -------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0088_add_installed_changeset_revison_column - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0089\_add\_object\_store\_id\_columns module --------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0089_add_object_store_id_columns - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0090\_add\_tool\_shed\_repository\_table\_columns module --------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0090_add_tool_shed_repository_table_columns - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0091\_add\_tool\_version\_tables module ---------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0091_add_tool_version_tables - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0092\_add\_migrate\_tools\_table module ---------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0092_add_migrate_tools_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0093\_add\_job\_params\_col module ----------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0093_add_job_params_col - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0094\_add\_job\_handler\_col module ------------------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.0094_add_job_handler_col - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0095\_hda\_subsets module -------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0095_hda_subsets - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0096\_openid\_provider module ------------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.0096_openid_provider - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0097\_add\_ctx\_rev\_column module ----------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0097_add_ctx_rev_column - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0098\_genome\_index\_tool\_data\_table module ---------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0098_genome_index_tool_data_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0099\_add\_tool\_dependency\_table module ------------------------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.0099_add_tool_dependency_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0100\_alter\_tool\_dependency\_table\_version\_column module ------------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0100_alter_tool_dependency_table_version_column - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0101\_drop\_installed\_changeset\_revision\_column module ---------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0101_drop_installed_changeset_revision_column - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0102\_add\_tool\_dependency\_status\_columns module ---------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0102_add_tool_dependency_status_columns - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0103\_add\_tool\_shed\_repository\_status\_columns module ---------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0103_add_tool_shed_repository_status_columns - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0104\_update\_genome\_downloader\_job\_parameters module --------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0104_update_genome_downloader_job_parameters - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0105\_add\_cleanup\_event\_table module ---------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0105_add_cleanup_event_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0106\_add\_missing\_indexes module ----------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0106_add_missing_indexes - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0107\_add\_exit\_code\_to\_job\_and\_task module ------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0107_add_exit_code_to_job_and_task - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0108\_add\_extended\_metadata module ------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0108_add_extended_metadata - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0109\_add\_repository\_dependency\_tables module ------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0109_add_repository_dependency_tables - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0110\_add\_dataset\_uuid module -------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0110_add_dataset_uuid - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0111\_add\_job\_destinations module ------------------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.0111_add_job_destinations - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0112\_add\_data\_manager\_history\_association\_and\_data\_manager\_job\_association\_tables module ---------------------------------------------------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0112_add_data_manager_history_association_and_data_manager_job_association_tables - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0113\_update\_migrate\_tools\_table module ------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0113_update_migrate_tools_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0114\_update\_migrate\_tools\_table\_again module -------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0114_update_migrate_tools_table_again - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0115\_longer\_user\_password\_field module ------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0115_longer_user_password_field - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0116\_drop\_update\_available\_col\_add\_tool\_shed\_status\_col module ------------------------------------------------------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.0116_drop_update_available_col_add_tool_shed_status_col - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0117\_add\_user\_activation module ----------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0117_add_user_activation - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0118\_add\_hda\_extended\_metadata module ------------------------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.0118_add_hda_extended_metadata - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0119\_job\_metrics module -------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0119_job_metrics - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0120\_dataset\_collections module ---------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0120_dataset_collections - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0121\_workflow\_uuids module ----------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0121_workflow_uuids - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0122\_grow\_mysql\_blobs module -------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0122_grow_mysql_blobs - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0123\_add\_workflow\_request\_tables module -------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0123_add_workflow_request_tables - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0124\_job\_state\_history module --------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0124_job_state_history - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0125\_workflow\_step\_tracking module -------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0125_workflow_step_tracking - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0126\_password\_reset module ----------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0126_password_reset - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0127\_output\_collection\_adjustments module --------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0127_output_collection_adjustments - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0128\_session\_timeout module ------------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.0128_session_timeout - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0129\_job\_external\_output\_metadata\_validity module ------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0129_job_external_output_metadata_validity - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0130\_change\_pref\_datatype module ------------------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.0130_change_pref_datatype - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0131\_subworkflow\_and\_input\_parameter\_modules module --------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0131_subworkflow_and_input_parameter_modules - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0132\_add\_lastpasswordchange\_to\_user module ----------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0132_add_lastpasswordchange_to_user - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0133\_add\_dependency\_column\_to\_job module ---------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0133_add_dependency_column_to_job - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0134\_hda\_set\_deleted\_if\_purged module ------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0134_hda_set_deleted_if_purged - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0135\_add\_library\_tags module -------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0135_add_library_tags - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0136\_collection\_and\_workflow\_state module ---------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0136_collection_and_workflow_state - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0137\_add\_copied\_from\_job\_id\_column module ------------------------------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.0137_add_copied_from_job_id_column - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0138\_add\_hda\_version module ------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0138_add_hda_version - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0139\_add\_history\_dataset\_association\_history\_table module ---------------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0139_add_history_dataset_association_history_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0140\_add\_dataset\_version\_to\_job\_to\_input\_dataset\_association\_table module ------------------------------------------------------------------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.0140_add_dataset_version_to_job_to_input_dataset_association_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0141\_add\_oidc\_tables module ------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0141_add_oidc_tables - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0142\_change\_numeric\_metric\_precision module ------------------------------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.0142_change_numeric_metric_precision - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0143\_add\_cloudauthz\_tables module ------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0143_add_cloudauthz_tables - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0144\_add\_cleanup\_event\_user\_table module ---------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0144_add_cleanup_event_user_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0145\_add\_workflow\_step\_input module ---------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0145_add_workflow_step_input - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0146\_workflow\_paths module ----------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0146_workflow_paths - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0147\_job\_messages module --------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0147_job_messages - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0148\_add\_checksum\_table module ---------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0148_add_checksum_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0149\_dynamic\_tools module ---------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0149_dynamic_tools - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0150\_add\_create\_time\_field\_for\_cloudauthz module ------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0150_add_create_time_field_for_cloudauthz - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0151\_add\_worker\_process module ---------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0151_add_worker_process - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0152\_add\_metadata\_file\_uuid module --------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0152_add_metadata_file_uuid - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0153\_add\_custos\_authnz\_token\_table module ----------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0153_add_custos_authnz_token_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0154\_created\_from\_basename module ------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0154_created_from_basename - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0155\_job\_galaxy\_version module ---------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0155_job_galaxy_version - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0156\_add\_interactivetools module ----------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0156_add_interactivetools - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0157\_rework\_dataset\_validation module ----------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0157_rework_dataset_validation - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0158\_workflow\_reports module ------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0158_workflow_reports - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0159\_add\_job\_external\_id\_index module ------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0159_add_job_external_id_index - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0160\_hda\_set\_deleted\_if\_purged\_again module -------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0160_hda_set_deleted_if_purged_again - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0161\_add\_workflow\_invocation\_output\_table module ------------------------------------------------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.0161_add_workflow_invocation_output_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0162\_job\_only\_pjas module ----------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0162_job_only_pjas - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0163\_worker\_process\_pid module ---------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0163_worker_process_pid - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0164\_page\_format module -------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0164_page_format - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0165\_add\_content\_update\_time module ---------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0165_add_content_update_time - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0166\_job\_state\_summary\_view module --------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0166_job_state_summary_view - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0167\_add\_job\_to\_input\_dataset\_collection\_element\_association module ---------------------------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0167_add_job_to_input_dataset_collection_element_association - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0168\_stored\_workflow\_hidden\_col module ------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0168_stored_workflow_hidden_col - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0169\_add\_missing\_indexes module ----------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0169_add_missing_indexes - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0170\_add\_more\_missing\_indexes module ----------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0170_add_more_missing_indexes - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0171\_schemaorg\_metadata module --------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0171_schemaorg_metadata - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0172\_it\_entrypoint\_requires\_domain module ---------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0172_it_entrypoint_requires_domain - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0173\_add\_job\_id\_to\_dataset module --------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0173_add_job_id_to_dataset - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0174\_readd\_update\_time\_triggers module ------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0174_readd_update_time_triggers - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0175\_history\_audit module ---------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0175_history_audit - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0176\_add\_indexes\_on\_update\_time module -------------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0176_add_indexes_on_update_time - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0177\_update\_job\_state\_summary module ----------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0177_update_job_state_summary - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0178\_drop\_deferredjob\_table module -------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0178_drop_deferredjob_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0179\_drop\_transferjob\_table module -------------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0179_drop_transferjob_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.0180\_add\_vault\_table module ------------------------------------------------------------- - -.. automodule:: galaxy.model.migrate.versions.0180_add_vault_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.migrate.versions.util module ------------------------------------------ - -.. automodule:: galaxy.model.migrate.versions.util - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/lib/galaxy.model.migrations.rst b/doc/source/lib/galaxy.model.migrations.rst new file mode 100644 index 00000000000..4212e1dc003 --- /dev/null +++ b/doc/source/lib/galaxy.model.migrations.rst @@ -0,0 +1,26 @@ +galaxy.model.migrations package +=============================== + +.. automodule:: galaxy.model.migrations + :members: + :undoc-members: + :show-inheritance: + +Submodules +---------- + +galaxy.model.migrations.scripts module +-------------------------------------- + +.. automodule:: galaxy.model.migrations.scripts + :members: + :undoc-members: + :show-inheritance: + +galaxy.model.migrations.util module +----------------------------------- + +.. automodule:: galaxy.model.migrations.util + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/lib/galaxy.model.orm.rst b/doc/source/lib/galaxy.model.orm.rst index 726abd3e20a..d5d891d5614 100644 --- a/doc/source/lib/galaxy.model.orm.rst +++ b/doc/source/lib/galaxy.model.orm.rst @@ -32,3 +32,11 @@ galaxy.model.orm.scripts module :members: :undoc-members: :show-inheritance: + +galaxy.model.orm.util module +---------------------------- + +.. automodule:: galaxy.model.orm.util + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/lib/galaxy.model.rst b/doc/source/lib/galaxy.model.rst index 5805dce314f..a99d4400332 100644 --- a/doc/source/lib/galaxy.model.rst +++ b/doc/source/lib/galaxy.model.rst @@ -13,10 +13,11 @@ Subpackages :maxdepth: 4 galaxy.model.dataset_collections - galaxy.model.migrate + galaxy.model.migrations galaxy.model.orm galaxy.model.store galaxy.model.tool_shed_install + galaxy.model.triggers galaxy.model.unittest_utils galaxy.model.view @@ -55,6 +56,22 @@ galaxy.model.database\_utils module :undoc-members: :show-inheritance: +galaxy.model.deferred module +---------------------------- + +.. automodule:: galaxy.model.deferred + :members: + :undoc-members: + :show-inheritance: + +galaxy.model.index\_filter\_util module +--------------------------------------- + +.. automodule:: galaxy.model.index_filter_util + :members: + :undoc-members: + :show-inheritance: + galaxy.model.item\_attrs module ------------------------------- diff --git a/doc/source/lib/galaxy.model.store.rst b/doc/source/lib/galaxy.model.store.rst index 84e3b2fcb3f..6a7baa50222 100644 --- a/doc/source/lib/galaxy.model.store.rst +++ b/doc/source/lib/galaxy.model.store.rst @@ -24,3 +24,11 @@ galaxy.model.store.discover module :members: :undoc-members: :show-inheritance: + +galaxy.model.store.load\_objects module +--------------------------------------- + +.. automodule:: galaxy.model.store.load_objects + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/lib/galaxy.model.tool_shed_install.migrate.rst b/doc/source/lib/galaxy.model.tool_shed_install.migrate.rst deleted file mode 100644 index 6fbecd637b3..00000000000 --- a/doc/source/lib/galaxy.model.tool_shed_install.migrate.rst +++ /dev/null @@ -1,26 +0,0 @@ -galaxy.model.tool\_shed\_install.migrate package -================================================ - -.. automodule:: galaxy.model.tool_shed_install.migrate - :members: - :undoc-members: - :show-inheritance: - -Subpackages ------------ - -.. toctree:: - :maxdepth: 4 - - galaxy.model.tool_shed_install.migrate.versions - -Submodules ----------- - -galaxy.model.tool\_shed\_install.migrate.check module ------------------------------------------------------ - -.. automodule:: galaxy.model.tool_shed_install.migrate.check - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/lib/galaxy.model.tool_shed_install.migrate.versions.rst b/doc/source/lib/galaxy.model.tool_shed_install.migrate.versions.rst deleted file mode 100644 index 9c39abe91a3..00000000000 --- a/doc/source/lib/galaxy.model.tool_shed_install.migrate.versions.rst +++ /dev/null @@ -1,146 +0,0 @@ -galaxy.model.tool\_shed\_install.migrate.versions package -========================================================= - -.. automodule:: galaxy.model.tool_shed_install.migrate.versions - :members: - :undoc-members: - :show-inheritance: - -Submodules ----------- - -galaxy.model.tool\_shed\_install.migrate.versions.0001\_add\_tool\_shed\_repository\_table module -------------------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.tool_shed_install.migrate.versions.0001_add_tool_shed_repository_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.tool\_shed\_install.migrate.versions.0002\_add\_tool\_shed\_repository\_table\_columns module ----------------------------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.tool_shed_install.migrate.versions.0002_add_tool_shed_repository_table_columns - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.tool\_shed\_install.migrate.versions.0003\_tool\_id\_guid\_map\_table module ------------------------------------------------------------------------------------------ - -.. automodule:: galaxy.model.tool_shed_install.migrate.versions.0003_tool_id_guid_map_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.tool\_shed\_install.migrate.versions.0004\_add\_installed\_changeset\_revison\_column module ---------------------------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.tool_shed_install.migrate.versions.0004_add_installed_changeset_revison_column - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.tool\_shed\_install.migrate.versions.0005\_add\_tool\_shed\_repository\_table\_columns module ----------------------------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.tool_shed_install.migrate.versions.0005_add_tool_shed_repository_table_columns - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.tool\_shed\_install.migrate.versions.0006\_add\_tool\_version\_tables module ------------------------------------------------------------------------------------------ - -.. automodule:: galaxy.model.tool_shed_install.migrate.versions.0006_add_tool_version_tables - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.tool\_shed\_install.migrate.versions.0007\_add\_migrate\_tools\_table module ------------------------------------------------------------------------------------------ - -.. automodule:: galaxy.model.tool_shed_install.migrate.versions.0007_add_migrate_tools_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.tool\_shed\_install.migrate.versions.0008\_add\_ctx\_rev\_column module ------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.tool_shed_install.migrate.versions.0008_add_ctx_rev_column - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.tool\_shed\_install.migrate.versions.0009\_add\_tool\_dependency\_table module -------------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.tool_shed_install.migrate.versions.0009_add_tool_dependency_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.tool\_shed\_install.migrate.versions.0010\_alter\_tool\_dependency\_table\_version\_column module --------------------------------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.tool_shed_install.migrate.versions.0010_alter_tool_dependency_table_version_column - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.tool\_shed\_install.migrate.versions.0011\_drop\_installed\_changeset\_revision\_column module ------------------------------------------------------------------------------------------------------------ - -.. automodule:: galaxy.model.tool_shed_install.migrate.versions.0011_drop_installed_changeset_revision_column - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.tool\_shed\_install.migrate.versions.0012\_add\_tool\_dependency\_status\_columns module ------------------------------------------------------------------------------------------------------ - -.. automodule:: galaxy.model.tool_shed_install.migrate.versions.0012_add_tool_dependency_status_columns - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.tool\_shed\_install.migrate.versions.0013\_add\_tool\_shed\_repository\_status\_columns module ------------------------------------------------------------------------------------------------------------ - -.. automodule:: galaxy.model.tool_shed_install.migrate.versions.0013_add_tool_shed_repository_status_columns - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.tool\_shed\_install.migrate.versions.0014\_add\_repository\_dependency\_tables module --------------------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.tool_shed_install.migrate.versions.0014_add_repository_dependency_tables - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.tool\_shed\_install.migrate.versions.0015\_update\_migrate\_tools\_table module --------------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.tool_shed_install.migrate.versions.0015_update_migrate_tools_table - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.tool\_shed\_install.migrate.versions.0016\_update\_migrate\_tools\_table\_again module ---------------------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.tool_shed_install.migrate.versions.0016_update_migrate_tools_table_again - :members: - :undoc-members: - :show-inheritance: - -galaxy.model.tool\_shed\_install.migrate.versions.0017\_drop\_update\_available\_col\_add\_tool\_shed\_status\_col module -------------------------------------------------------------------------------------------------------------------------- - -.. automodule:: galaxy.model.tool_shed_install.migrate.versions.0017_drop_update_available_col_add_tool_shed_status_col - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/lib/galaxy.model.tool_shed_install.rst b/doc/source/lib/galaxy.model.tool_shed_install.rst index 464c6ec817e..310da54edfa 100644 --- a/doc/source/lib/galaxy.model.tool_shed_install.rst +++ b/doc/source/lib/galaxy.model.tool_shed_install.rst @@ -6,14 +6,6 @@ galaxy.model.tool\_shed\_install package :undoc-members: :show-inheritance: -Subpackages ------------ - -.. toctree:: - :maxdepth: 4 - - galaxy.model.tool_shed_install.migrate - Submodules ---------- diff --git a/doc/source/lib/galaxy.model.triggers.rst b/doc/source/lib/galaxy.model.triggers.rst new file mode 100644 index 00000000000..8b533245807 --- /dev/null +++ b/doc/source/lib/galaxy.model.triggers.rst @@ -0,0 +1,34 @@ +galaxy.model.triggers package +============================= + +.. automodule:: galaxy.model.triggers + :members: + :undoc-members: + :show-inheritance: + +Submodules +---------- + +galaxy.model.triggers.history\_update\_time\_field module +--------------------------------------------------------- + +.. automodule:: galaxy.model.triggers.history_update_time_field + :members: + :undoc-members: + :show-inheritance: + +galaxy.model.triggers.update\_audit\_table module +------------------------------------------------- + +.. automodule:: galaxy.model.triggers.update_audit_table + :members: + :undoc-members: + :show-inheritance: + +galaxy.model.triggers.utils module +---------------------------------- + +.. automodule:: galaxy.model.triggers.utils + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/lib/galaxy.model.unittest_utils.rst b/doc/source/lib/galaxy.model.unittest_utils.rst index b6b8fc19959..b99b4ecfeaf 100644 --- a/doc/source/lib/galaxy.model.unittest_utils.rst +++ b/doc/source/lib/galaxy.model.unittest_utils.rst @@ -16,3 +16,11 @@ galaxy.model.unittest\_utils.data\_app module :members: :undoc-members: :show-inheritance: + +galaxy.model.unittest\_utils.store\_fixtures module +--------------------------------------------------- + +.. automodule:: galaxy.model.unittest_utils.store_fixtures + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/lib/galaxy.rst b/doc/source/lib/galaxy.rst index 5220a7fd12b..29c593de677 100644 --- a/doc/source/lib/galaxy.rst +++ b/doc/source/lib/galaxy.rst @@ -18,7 +18,6 @@ Subpackages galaxy.authnz galaxy.celery galaxy.config - galaxy.containers galaxy.datatypes galaxy.dependencies galaxy.exceptions diff --git a/doc/source/lib/galaxy.schema.rst b/doc/source/lib/galaxy.schema.rst index 0e245468d5d..3f1420b256b 100644 --- a/doc/source/lib/galaxy.schema.rst +++ b/doc/source/lib/galaxy.schema.rst @@ -9,6 +9,14 @@ galaxy.schema package Submodules ---------- +galaxy.schema.fetch\_data module +-------------------------------- + +.. automodule:: galaxy.schema.fetch_data + :members: + :undoc-members: + :show-inheritance: + galaxy.schema.fields module --------------------------- @@ -33,6 +41,14 @@ galaxy.schema.schema module :undoc-members: :show-inheritance: +galaxy.schema.tasks module +-------------------------- + +.. automodule:: galaxy.schema.tasks + :members: + :undoc-members: + :show-inheritance: + galaxy.schema.types module -------------------------- diff --git a/doc/source/lib/galaxy.tool_shed.galaxy_install.rst b/doc/source/lib/galaxy.tool_shed.galaxy_install.rst index bc765a12beb..63b17d56508 100644 --- a/doc/source/lib/galaxy.tool_shed.galaxy_install.rst +++ b/doc/source/lib/galaxy.tool_shed.galaxy_install.rst @@ -15,7 +15,6 @@ Subpackages galaxy.tool_shed.galaxy_install.datatypes galaxy.tool_shed.galaxy_install.metadata galaxy.tool_shed.galaxy_install.repository_dependencies - galaxy.tool_shed.galaxy_install.tool_dependencies galaxy.tool_shed.galaxy_install.tools Submodules diff --git a/doc/source/lib/galaxy.tool_shed.galaxy_install.tool_dependencies.recipe.rst b/doc/source/lib/galaxy.tool_shed.galaxy_install.tool_dependencies.recipe.rst deleted file mode 100644 index 78eb081a3cd..00000000000 --- a/doc/source/lib/galaxy.tool_shed.galaxy_install.tool_dependencies.recipe.rst +++ /dev/null @@ -1,58 +0,0 @@ -galaxy.tool\_shed.galaxy\_install.tool\_dependencies.recipe package -=================================================================== - -.. automodule:: galaxy.tool_shed.galaxy_install.tool_dependencies.recipe - :members: - :undoc-members: - :show-inheritance: - -Submodules ----------- - -galaxy.tool\_shed.galaxy\_install.tool\_dependencies.recipe.asynchronous\_reader module ---------------------------------------------------------------------------------------- - -.. automodule:: galaxy.tool_shed.galaxy_install.tool_dependencies.recipe.asynchronous_reader - :members: - :undoc-members: - :show-inheritance: - -galaxy.tool\_shed.galaxy\_install.tool\_dependencies.recipe.env\_file\_builder module -------------------------------------------------------------------------------------- - -.. automodule:: galaxy.tool_shed.galaxy_install.tool_dependencies.recipe.env_file_builder - :members: - :undoc-members: - :show-inheritance: - -galaxy.tool\_shed.galaxy\_install.tool\_dependencies.recipe.install\_environment module ---------------------------------------------------------------------------------------- - -.. automodule:: galaxy.tool_shed.galaxy_install.tool_dependencies.recipe.install_environment - :members: - :undoc-members: - :show-inheritance: - -galaxy.tool\_shed.galaxy\_install.tool\_dependencies.recipe.recipe\_manager module ----------------------------------------------------------------------------------- - -.. automodule:: galaxy.tool_shed.galaxy_install.tool_dependencies.recipe.recipe_manager - :members: - :undoc-members: - :show-inheritance: - -galaxy.tool\_shed.galaxy\_install.tool\_dependencies.recipe.step\_handler module --------------------------------------------------------------------------------- - -.. automodule:: galaxy.tool_shed.galaxy_install.tool_dependencies.recipe.step_handler - :members: - :undoc-members: - :show-inheritance: - -galaxy.tool\_shed.galaxy\_install.tool\_dependencies.recipe.tag\_handler module -------------------------------------------------------------------------------- - -.. automodule:: galaxy.tool_shed.galaxy_install.tool_dependencies.recipe.tag_handler - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/lib/galaxy.tool_shed.galaxy_install.tool_dependencies.rst b/doc/source/lib/galaxy.tool_shed.galaxy_install.tool_dependencies.rst deleted file mode 100644 index f577255f4ea..00000000000 --- a/doc/source/lib/galaxy.tool_shed.galaxy_install.tool_dependencies.rst +++ /dev/null @@ -1,26 +0,0 @@ -galaxy.tool\_shed.galaxy\_install.tool\_dependencies package -============================================================ - -.. automodule:: galaxy.tool_shed.galaxy_install.tool_dependencies - :members: - :undoc-members: - :show-inheritance: - -Subpackages ------------ - -.. toctree:: - :maxdepth: 4 - - galaxy.tool_shed.galaxy_install.tool_dependencies.recipe - -Submodules ----------- - -galaxy.tool\_shed.galaxy\_install.tool\_dependencies.env\_manager module ------------------------------------------------------------------------- - -.. automodule:: galaxy.tool_shed.galaxy_install.tool_dependencies.env_manager - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/lib/galaxy.tool_util.deps.rst b/doc/source/lib/galaxy.tool_util.deps.rst index 947dddb4f28..11b9620b43a 100644 --- a/doc/source/lib/galaxy.tool_util.deps.rst +++ b/doc/source/lib/galaxy.tool_util.deps.rst @@ -67,6 +67,14 @@ galaxy.tool\_util.deps.container\_classes module :undoc-members: :show-inheritance: +galaxy.tool\_util.deps.container\_volumes module +------------------------------------------------ + +.. automodule:: galaxy.tool_util.deps.container_volumes + :members: + :undoc-members: + :show-inheritance: + galaxy.tool\_util.deps.containers module ---------------------------------------- diff --git a/doc/source/lib/galaxy.tool_util.ontologies.rst b/doc/source/lib/galaxy.tool_util.ontologies.rst new file mode 100644 index 00000000000..a637bad8e76 --- /dev/null +++ b/doc/source/lib/galaxy.tool_util.ontologies.rst @@ -0,0 +1,18 @@ +galaxy.tool\_util.ontologies package +==================================== + +.. automodule:: galaxy.tool_util.ontologies + :members: + :undoc-members: + :show-inheritance: + +Submodules +---------- + +galaxy.tool\_util.ontologies.ontology\_data module +-------------------------------------------------- + +.. automodule:: galaxy.tool_util.ontologies.ontology_data + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/lib/galaxy.tool_util.rst b/doc/source/lib/galaxy.tool_util.rst index e8150cd1d9c..c0ae09c08dc 100644 --- a/doc/source/lib/galaxy.tool_util.rst +++ b/doc/source/lib/galaxy.tool_util.rst @@ -18,6 +18,7 @@ Subpackages galaxy.tool_util.deps galaxy.tool_util.linters galaxy.tool_util.locations + galaxy.tool_util.ontologies galaxy.tool_util.parser galaxy.tool_util.toolbox galaxy.tool_util.unittest_utils diff --git a/doc/source/lib/galaxy.tours.rst b/doc/source/lib/galaxy.tours.rst index 56232296de6..6acee82e903 100644 --- a/doc/source/lib/galaxy.tours.rst +++ b/doc/source/lib/galaxy.tours.rst @@ -5,3 +5,14 @@ galaxy.tours package :members: :undoc-members: :show-inheritance: + +Submodules +---------- + +galaxy.tours.validate module +---------------------------- + +.. automodule:: galaxy.tours.validate + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/lib/galaxy.util.pastescript.rst b/doc/source/lib/galaxy.util.pastescript.rst deleted file mode 100644 index 1eabd88f0c9..00000000000 --- a/doc/source/lib/galaxy.util.pastescript.rst +++ /dev/null @@ -1,26 +0,0 @@ -galaxy.util.pastescript package -=============================== - -.. automodule:: galaxy.util.pastescript - :members: - :undoc-members: - :show-inheritance: - -Submodules ----------- - -galaxy.util.pastescript.loadwsgi module ---------------------------------------- - -.. automodule:: galaxy.util.pastescript.loadwsgi - :members: - :undoc-members: - :show-inheritance: - -galaxy.util.pastescript.serve module ------------------------------------- - -.. automodule:: galaxy.util.pastescript.serve - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/lib/galaxy.util.rst b/doc/source/lib/galaxy.util.rst index 8a7703a412d..c685d84751c 100644 --- a/doc/source/lib/galaxy.util.rst +++ b/doc/source/lib/galaxy.util.rst @@ -13,7 +13,6 @@ Subpackages :maxdepth: 4 galaxy.util.custom_logging - galaxy.util.pastescript galaxy.util.path galaxy.util.tool_shed @@ -388,14 +387,6 @@ galaxy.util.watcher module :undoc-members: :show-inheritance: -galaxy.util.web\_compat module ------------------------------- - -.. automodule:: galaxy.util.web_compat - :members: - :undoc-members: - :show-inheritance: - galaxy.util.xml\_macros module ------------------------------ diff --git a/doc/source/lib/galaxy.visualization.plugins.rst b/doc/source/lib/galaxy.visualization.plugins.rst index 6209b4d1398..2910013437e 100644 --- a/doc/source/lib/galaxy.visualization.plugins.rst +++ b/doc/source/lib/galaxy.visualization.plugins.rst @@ -17,14 +17,6 @@ galaxy.visualization.plugins.config\_parser module :undoc-members: :show-inheritance: -galaxy.visualization.plugins.interactive\_environments module -------------------------------------------------------------- - -.. automodule:: galaxy.visualization.plugins.interactive_environments - :members: - :undoc-members: - :show-inheritance: - galaxy.visualization.plugins.plugin module ------------------------------------------ diff --git a/doc/source/lib/galaxy.web.framework.middleware.rst b/doc/source/lib/galaxy.web.framework.middleware.rst index f86afbd143d..7eccd1d39b3 100644 --- a/doc/source/lib/galaxy.web.framework.middleware.rst +++ b/doc/source/lib/galaxy.web.framework.middleware.rst @@ -9,14 +9,6 @@ galaxy.web.framework.middleware package Submodules ---------- -galaxy.web.framework.middleware.batch module --------------------------------------------- - -.. automodule:: galaxy.web.framework.middleware.batch - :members: - :undoc-members: - :show-inheritance: - galaxy.web.framework.middleware.error module -------------------------------------------- diff --git a/doc/source/lib/galaxy.web.rst b/doc/source/lib/galaxy.web.rst index d32dba66462..0fa754d7f88 100644 --- a/doc/source/lib/galaxy.web.rst +++ b/doc/source/lib/galaxy.web.rst @@ -15,18 +15,11 @@ Subpackages galaxy.web.framework galaxy.web.legacy_framework galaxy.web.proxy + galaxy.web.short_term_storage Submodules ---------- -galaxy.web.buildapp module --------------------------- - -.. automodule:: galaxy.web.buildapp - :members: - :undoc-members: - :show-inheritance: - galaxy.web.form\_builder module ------------------------------- diff --git a/doc/source/lib/galaxy.web.short_term_storage.rst b/doc/source/lib/galaxy.web.short_term_storage.rst new file mode 100644 index 00000000000..576245fa1c4 --- /dev/null +++ b/doc/source/lib/galaxy.web.short_term_storage.rst @@ -0,0 +1,7 @@ +galaxy.web.short\_term\_storage package +======================================= + +.. automodule:: galaxy.web.short_term_storage + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/lib/galaxy.webapps.galaxy.api.rst b/doc/source/lib/galaxy.webapps.galaxy.api.rst index 54995bc1dd9..8682f4468c5 100644 --- a/doc/source/lib/galaxy.webapps.galaxy.api.rst +++ b/doc/source/lib/galaxy.webapps.galaxy.api.rst @@ -337,6 +337,14 @@ galaxy.webapps.galaxy.api.search module :undoc-members: :show-inheritance: +galaxy.webapps.galaxy.api.short\_term\_storage module +----------------------------------------------------- + +.. automodule:: galaxy.webapps.galaxy.api.short_term_storage + :members: + :undoc-members: + :show-inheritance: + galaxy.webapps.galaxy.api.tags module ------------------------------------- @@ -345,6 +353,14 @@ galaxy.webapps.galaxy.api.tags module :undoc-members: :show-inheritance: +galaxy.webapps.galaxy.api.tasks module +-------------------------------------- + +.. automodule:: galaxy.webapps.galaxy.api.tasks + :members: + :undoc-members: + :show-inheritance: + galaxy.webapps.galaxy.api.tool\_data module ------------------------------------------- diff --git a/doc/source/lib/galaxy.webapps.galaxy.controllers.rst b/doc/source/lib/galaxy.webapps.galaxy.controllers.rst index d60ce2330bd..f3fe0a6ca33 100644 --- a/doc/source/lib/galaxy.webapps.galaxy.controllers.rst +++ b/doc/source/lib/galaxy.webapps.galaxy.controllers.rst @@ -81,14 +81,6 @@ galaxy.webapps.galaxy.controllers.history module :undoc-members: :show-inheritance: -galaxy.webapps.galaxy.controllers.interactive\_environments module ------------------------------------------------------------------- - -.. automodule:: galaxy.webapps.galaxy.controllers.interactive_environments - :members: - :undoc-members: - :show-inheritance: - galaxy.webapps.galaxy.controllers.library module ------------------------------------------------ diff --git a/doc/source/lib/galaxy.webapps.galaxy.services.rst b/doc/source/lib/galaxy.webapps.galaxy.services.rst index 871a56dad7e..b784e52d468 100644 --- a/doc/source/lib/galaxy.webapps.galaxy.services.rst +++ b/doc/source/lib/galaxy.webapps.galaxy.services.rst @@ -9,6 +9,14 @@ galaxy.webapps.galaxy.services package Submodules ---------- +galaxy.webapps.galaxy.services.authenticate module +-------------------------------------------------- + +.. automodule:: galaxy.webapps.galaxy.services.authenticate + :members: + :undoc-members: + :show-inheritance: + galaxy.webapps.galaxy.services.base module ------------------------------------------ @@ -49,6 +57,22 @@ galaxy.webapps.galaxy.services.history\_contents module :undoc-members: :show-inheritance: +galaxy.webapps.galaxy.services.invocations module +------------------------------------------------- + +.. automodule:: galaxy.webapps.galaxy.services.invocations + :members: + :undoc-members: + :show-inheritance: + +galaxy.webapps.galaxy.services.jobs module +------------------------------------------ + +.. automodule:: galaxy.webapps.galaxy.services.jobs + :members: + :undoc-members: + :show-inheritance: + galaxy.webapps.galaxy.services.libraries module ----------------------------------------------- @@ -97,6 +121,22 @@ galaxy.webapps.galaxy.services.sharable module :undoc-members: :show-inheritance: +galaxy.webapps.galaxy.services.tools module +------------------------------------------- + +.. automodule:: galaxy.webapps.galaxy.services.tools + :members: + :undoc-members: + :show-inheritance: + +galaxy.webapps.galaxy.services.users module +------------------------------------------- + +.. automodule:: galaxy.webapps.galaxy.services.users + :members: + :undoc-members: + :show-inheritance: + galaxy.webapps.galaxy.services.visualizations module ---------------------------------------------------- @@ -104,3 +144,11 @@ galaxy.webapps.galaxy.services.visualizations module :members: :undoc-members: :show-inheritance: + +galaxy.webapps.galaxy.services.workflows module +----------------------------------------------- + +.. automodule:: galaxy.webapps.galaxy.services.workflows + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/lib/galaxy.webapps.openapi.rst b/doc/source/lib/galaxy.webapps.openapi.rst new file mode 100644 index 00000000000..7af8dd005b7 --- /dev/null +++ b/doc/source/lib/galaxy.webapps.openapi.rst @@ -0,0 +1,18 @@ +galaxy.webapps.openapi package +============================== + +.. automodule:: galaxy.webapps.openapi + :members: + :undoc-members: + :show-inheritance: + +Submodules +---------- + +galaxy.webapps.openapi.utils module +----------------------------------- + +.. automodule:: galaxy.webapps.openapi.utils + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/lib/galaxy.webapps.rst b/doc/source/lib/galaxy.webapps.rst index e8f02a396c3..df681fd888a 100644 --- a/doc/source/lib/galaxy.webapps.rst +++ b/doc/source/lib/galaxy.webapps.rst @@ -14,6 +14,7 @@ Subpackages galaxy.webapps.base galaxy.webapps.galaxy + galaxy.webapps.openapi galaxy.webapps.reports Submodules diff --git a/doc/source/lib/galaxy_ext.container_monitor.rst b/doc/source/lib/galaxy_ext.container_monitor.rst new file mode 100644 index 00000000000..16c2596f199 --- /dev/null +++ b/doc/source/lib/galaxy_ext.container_monitor.rst @@ -0,0 +1,18 @@ +galaxy\_ext.container\_monitor package +====================================== + +.. automodule:: galaxy_ext.container_monitor + :members: + :undoc-members: + :show-inheritance: + +Submodules +---------- + +galaxy\_ext.container\_monitor.monitor module +--------------------------------------------- + +.. automodule:: galaxy_ext.container_monitor.monitor + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/lib/galaxy_ext.rst b/doc/source/lib/galaxy_ext.rst index 22bf2e82487..fbc02806749 100644 --- a/doc/source/lib/galaxy_ext.rst +++ b/doc/source/lib/galaxy_ext.rst @@ -12,5 +12,6 @@ Subpackages .. toctree:: :maxdepth: 4 + galaxy_ext.container_monitor galaxy_ext.expressions galaxy_ext.metadata diff --git a/doc/source/lib/galaxy_test.api.rst b/doc/source/lib/galaxy_test.api.rst index 12049df9da5..0486930b82e 100644 --- a/doc/source/lib/galaxy_test.api.rst +++ b/doc/source/lib/galaxy_test.api.rst @@ -17,14 +17,6 @@ Subpackages Submodules ---------- -galaxy\_test.api.conftest module --------------------------------- - -.. automodule:: galaxy_test.api.conftest - :members: - :undoc-members: - :show-inheritance: - galaxy\_test.api.sharable module -------------------------------- @@ -33,14 +25,6 @@ galaxy\_test.api.sharable module :undoc-members: :show-inheritance: -galaxy\_test.api.test\_api\_batch module ----------------------------------------- - -.. automodule:: galaxy_test.api.test_api_batch - :members: - :undoc-members: - :show-inheritance: - galaxy\_test.api.test\_authenticate module ------------------------------------------ diff --git a/doc/source/lib/galaxy_test.performance.rst b/doc/source/lib/galaxy_test.performance.rst index 5930228cd0b..11d091b4191 100644 --- a/doc/source/lib/galaxy_test.performance.rst +++ b/doc/source/lib/galaxy_test.performance.rst @@ -9,14 +9,6 @@ galaxy\_test.performance package Submodules ---------- -galaxy\_test.performance.conftest module ----------------------------------------- - -.. automodule:: galaxy_test.performance.conftest - :members: - :undoc-members: - :show-inheritance: - galaxy\_test.performance.test\_workflow\_framework\_performance module ---------------------------------------------------------------------- diff --git a/doc/source/lib/galaxy_test.rst b/doc/source/lib/galaxy_test.rst index 00eb52df606..00fa7466c4c 100644 --- a/doc/source/lib/galaxy_test.rst +++ b/doc/source/lib/galaxy_test.rst @@ -17,3 +17,14 @@ Subpackages galaxy_test.driver galaxy_test.performance galaxy_test.selenium + +Submodules +---------- + +galaxy\_test.conftest module +---------------------------- + +.. automodule:: galaxy_test.conftest + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/lib/galaxy_test.selenium.rst b/doc/source/lib/galaxy_test.selenium.rst index fbfa28b243c..85de6c7db3b 100644 --- a/doc/source/lib/galaxy_test.selenium.rst +++ b/doc/source/lib/galaxy_test.selenium.rst @@ -97,6 +97,14 @@ galaxy\_test.selenium.test\_data\_source\_tools module :undoc-members: :show-inheritance: +galaxy\_test.selenium.test\_dataset\_metadata\_download module +-------------------------------------------------------------- + +.. automodule:: galaxy_test.selenium.test_dataset_metadata_download + :members: + :undoc-members: + :show-inheritance: + galaxy\_test.selenium.test\_histories\_list module -------------------------------------------------- @@ -185,6 +193,14 @@ galaxy\_test.selenium.test\_history\_structure module :undoc-members: :show-inheritance: +galaxy\_test.selenium.test\_invocation\_grid module +--------------------------------------------------- + +.. automodule:: galaxy_test.selenium.test_invocation_grid + :members: + :undoc-members: + :show-inheritance: + galaxy\_test.selenium.test\_jupyter module ------------------------------------------ diff --git a/doc/source/lib/tool_shed.test.functional.rst b/doc/source/lib/tool_shed.test.functional.rst index 557c9a025f0..3bbb84a4631 100644 --- a/doc/source/lib/tool_shed.test.functional.rst +++ b/doc/source/lib/tool_shed.test.functional.rst @@ -441,14 +441,6 @@ tool\_shed.test.functional.test\_1410\_update\_manager module :undoc-members: :show-inheritance: -tool\_shed.test.functional.test\_1420\_tool\_dependency\_environment\_inheritance module ----------------------------------------------------------------------------------------- - -.. automodule:: tool_shed.test.functional.test_1420_tool_dependency_environment_inheritance - :members: - :undoc-members: - :show-inheritance: - tool\_shed.test.functional.test\_1430\_repair\_installed\_repository module --------------------------------------------------------------------------- @@ -457,14 +449,6 @@ tool\_shed.test.functional.test\_1430\_repair\_installed\_repository module :undoc-members: :show-inheritance: -tool\_shed.test.functional.test\_1440\_missing\_env\_sh\_files module ---------------------------------------------------------------------- - -.. automodule:: tool_shed.test.functional.test_1440_missing_env_sh_files - :members: - :undoc-members: - :show-inheritance: - tool\_shed.test.functional.test\_1450\_installing\_datatypes\_sniffers module ----------------------------------------------------------------------------- diff --git a/lib/galaxy/config/sample/datatypes_conf.xml.sample b/lib/galaxy/config/sample/datatypes_conf.xml.sample index 8d897106910..8ab4db2c0db 100644 --- a/lib/galaxy/config/sample/datatypes_conf.xml.sample +++ b/lib/galaxy/config/sample/datatypes_conf.xml.sample @@ -180,6 +180,7 @@ + diff --git a/lib/galaxy/managers/workflows.py b/lib/galaxy/managers/workflows.py index d7b492bb967..cc214a19469 100644 --- a/lib/galaxy/managers/workflows.py +++ b/lib/galaxy/managers/workflows.py @@ -1092,7 +1092,7 @@ class WorkflowContentsManager(UsesAnnotations): "outputs": module.get_all_outputs(), "config_form": config_form, "annotation": annotation_str, - "post_job_actions": {}, + "post_job_actions": module.get_post_job_actions({}), "uuid": str(step.uuid) if step.uuid else None, "workflow_outputs": [], } diff --git a/lib/galaxy/model/orm/util.py b/lib/galaxy/model/orm/util.py index f8b064a9ba9..795af1616fb 100644 --- a/lib/galaxy/model/orm/util.py +++ b/lib/galaxy/model/orm/util.py @@ -8,12 +8,13 @@ def add_object_to_object_session(object, object_with_session): https://docs.sqlalchemy.org/en/14/changelog/migration_14.html#cascade-backrefs-behavior-deprecated-for-removal-in-2-0 This function preserves SQLAlchemy's pre-2.0 logic and should be used when: + 1. foo and bar are model instances, that are associated (via SQLAlchemy's relationship), AND 2. bar is assigned to foo's bar relationship (e.g. foo.bar = bar), AND 3. bar is in a session and foo is not, AND 4. foo is implicitly added to bar's session upon assignment(2), as indicated - by a RemovedIn20Warning specifying that the '"foo" object is being merged into a Session - along the backref cascade path...' + by a RemovedIn20Warning specifying that the '"foo" object is being merged into a Session + along the backref cascade path...' """ if object_with_session: session = get_object_session(object_with_session) diff --git a/lib/galaxy/tool_util/deps/requirements.py b/lib/galaxy/tool_util/deps/requirements.py index 628e245efd4..7f59be7fa47 100644 --- a/lib/galaxy/tool_util/deps/requirements.py +++ b/lib/galaxy/tool_util/deps/requirements.py @@ -340,7 +340,7 @@ def parse_requirements_from_xml(xml_root, parse_resources=False): containers = [container_from_element(c) for c in container_elems] if parse_resources: - resource_elems = requirements_elem.findall("resource") if requirements_elem else [] + resource_elems = requirements_elem.findall("resource") if requirements_elem is not None else [] resources = [resource_from_element(r) for r in resource_elems] return requirements, containers, resources diff --git a/lib/galaxy/tool_util/linters/inputs.py b/lib/galaxy/tool_util/linters/inputs.py index 6f5ab7fa28b..6a7e602f7c0 100644 --- a/lib/galaxy/tool_util/linters/inputs.py +++ b/lib/galaxy/tool_util/linters/inputs.py @@ -57,6 +57,7 @@ PARAMETER_VALIDATOR_TYPE_COMPATIBILITY = { "float": ["in_range", "expression"], "data": [ "metadata", + "no_options", "unspecified_build", "dataset_ok_validator", "dataset_metadata_in_range", @@ -67,6 +68,7 @@ PARAMETER_VALIDATOR_TYPE_COMPATIBILITY = { ], "data_collection": [ "metadata", + "no_options", "unspecified_build", "dataset_ok_validator", "dataset_metadata_in_range", diff --git a/lib/galaxy/tool_util/linters/tests.py b/lib/galaxy/tool_util/linters/tests.py index b70ee0dbd23..54ee1bf9d10 100644 --- a/lib/galaxy/tool_util/linters/tests.py +++ b/lib/galaxy/tool_util/linters/tests.py @@ -38,7 +38,7 @@ def lint_tsts(tool_xml, lint_ctx): if len(assertions) == 0: continue if len(assertions) > 1: - lint_ctx.error("Test {test_idx}: More than one {ta} found. Only the first is considered.") + lint_ctx.error(f"Test {test_idx}: More than one {ta} found. Only the first is considered.") has_test = True _check_asserts(test_idx, assertions, lint_ctx) _check_asserts(test_idx, test.findall(".//assert_contents"), lint_ctx) diff --git a/lib/galaxy/tool_util/parser/util.py b/lib/galaxy/tool_util/parser/util.py index 2c43c51e5b4..9ecec25559f 100644 --- a/lib/galaxy/tool_util/parser/util.py +++ b/lib/galaxy/tool_util/parser/util.py @@ -15,7 +15,7 @@ def _parse_name(name, argument): all remaining dashes are replaced by underscores. """ if name is None: - if not argument: + if argument is None: raise ValueError("parameter must specify a 'name' or 'argument'.") name = argument.lstrip("-").replace("-", "_") return name diff --git a/lib/galaxy/tool_util/xsd/galaxy.xsd b/lib/galaxy/tool_util/xsd/galaxy.xsd index 576c6673458..785c23dc1f2 100644 --- a/lib/galaxy/tool_util/xsd/galaxy.xsd +++ b/lib/galaxy/tool_util/xsd/galaxy.xsd @@ -4172,7 +4172,7 @@ used to generate dynamic options. - Ignore lines starting with the given string. + Keep only lines starting with the given string. @@ -7002,7 +7002,7 @@ and ``contains``. In addtion there is ``sim_size`` which is discouraged in fafou Number of bytes alowing for suffix (k|K|M|G|P|E)i? - + diff --git a/lib/galaxy/tools/__init__.py b/lib/galaxy/tools/__init__.py index ec4232030e3..aa1255d592c 100644 --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -277,7 +277,7 @@ WORKFLOW_SAFE_TOOL_VERSION_UPDATES = { "__BUILD_LIST__": safe_update(packaging.version.parse("1.0.0"), packaging.version.parse("1.1.0")), "__APPLY_RULES__": safe_update(packaging.version.parse("1.0.0"), packaging.version.parse("1.1.0")), "__EXTRACT_DATASET__": safe_update(packaging.version.parse("1.0.0"), packaging.version.parse("1.0.1")), - "Grep1": safe_update(packaging.version.parse("1.0.1"), packaging.version.parse("1.0.3")), + "Grep1": safe_update(packaging.version.parse("1.0.1"), packaging.version.parse("1.0.4")), "Show beginning1": safe_update(packaging.version.parse("1.0.0"), packaging.version.parse("1.0.1")), "Show tail1": safe_update(packaging.version.parse("1.0.0"), packaging.version.parse("1.0.1")), "sort1": safe_update(packaging.version.parse("1.1.0"), packaging.version.parse("1.2.0")), diff --git a/lib/galaxy/tools/parameters/dynamic_options.py b/lib/galaxy/tools/parameters/dynamic_options.py index 572406389e1..6e99da51b5c 100644 --- a/lib/galaxy/tools/parameters/dynamic_options.py +++ b/lib/galaxy/tools/parameters/dynamic_options.py @@ -655,7 +655,7 @@ class DynamicOptions: rval = [] field_count = None for line in reader: - if line.startswith("#") or (self.line_startswith and line.startswith(self.line_startswith)): + if line.startswith("#") or (self.line_startswith and not line.startswith(self.line_startswith)): continue line = line.rstrip("\n\r") if line: diff --git a/lib/galaxy/webapps/galaxy/api/common.py b/lib/galaxy/webapps/galaxy/api/common.py index 6b53eab1877..b74daf0d70c 100644 --- a/lib/galaxy/webapps/galaxy/api/common.py +++ b/lib/galaxy/webapps/galaxy/api/common.py @@ -18,6 +18,7 @@ from galaxy.schema import ( ValueFilterQueryParams, ) from galaxy.schema.schema import UpdateDatasetPermissionsPayload +from galaxy.util import listify SerializationViewQueryParam: Optional[str] = Query( None, @@ -142,3 +143,43 @@ def get_query_parameters_from_request_excluding(request: Request, exclude: Set[s for param_name in exclude: extra_params.pop(param_name, None) return extra_params + + +def query_parameter_as_list(query): + """Used as FastAPI dependable for query parameters that need to behave as a list of values separated by comma + or as multiple instances of the same parameter. + + .. important:: the ``query`` annotation provided must define the ``alias`` exactly as the name of the actual parameter name. + + Usage example:: + + ValueQueryParam = Query( + default=None, + alias="value", # Important! this is the parameter name that will be displayed in the API docs + title="My Value", + description="A single value, a comma-separated list of values or a list of values.", + ) + + @router.get("/api/my_route") + def index( + self, + values: Optional[List[str]] = Depends(query_parameter_as_list(ValueQueryParam)), + ): + ... + + This will render in the API docs as a single string query parameter but will make the following requests equivalent: + + - ``api/my_route?value=val1,val2,val3`` + - ``api/my_route?value=val1&value=val2&value=val3`` + """ + + def parse_elements( + elements: Optional[List[str]] = query, + ) -> Optional[List[Any]]: + if query.default != Ellipsis and not elements: + return query.default + if elements and len(elements) == 1: + return listify(elements[0]) + return elements + + return parse_elements diff --git a/lib/galaxy/webapps/galaxy/api/jobs.py b/lib/galaxy/webapps/galaxy/api/jobs.py index 1eb13167b58..46390412b7f 100644 --- a/lib/galaxy/webapps/galaxy/api/jobs.py +++ b/lib/galaxy/webapps/galaxy/api/jobs.py @@ -17,7 +17,10 @@ from typing import ( Union, ) -from fastapi import Query +from fastapi import ( + Depends, + Query, +) from galaxy import ( exceptions, @@ -39,20 +42,13 @@ from galaxy.managers.jobs import ( from galaxy.schema.fields import EncodedDatabaseIdField from galaxy.schema.schema import JobIndexSortByEnum from galaxy.schema.types import OffsetNaiveDatetime -from galaxy.util import listify from galaxy.web import ( expose_api, expose_api_anonymous, require_admin, ) from galaxy.webapps.base.controller import UsesVisualizationMixin -from galaxy.webapps.galaxy.services.jobs import ( - JobIndexPayload, - JobIndexViewEnum, - JobsService, -) -from galaxy.work.context import WorkRequestContext -from . import ( +from galaxy.webapps.galaxy.api import ( BaseGalaxyAPIController, depends, DependsOnTrans, @@ -60,16 +56,24 @@ from . import ( Router, search_query_param, ) +from galaxy.webapps.galaxy.api.common import query_parameter_as_list +from galaxy.webapps.galaxy.services.jobs import ( + JobIndexPayload, + JobIndexViewEnum, + JobsService, +) +from galaxy.work.context import WorkRequestContext log = logging.getLogger(__name__) router = Router(tags=["jobs"]) -StateQueryParam: Optional[str] = Query( +StateQueryParam = Query( default=None, + alias="state", title="States", - description="Comma-separated list of states to filter job query on. If unspecified, jobs of any state may be returned.", + description="A list or comma-separated list of states to filter job query on. If unspecified, jobs of any state may be returned.", ) UserDetailsQueryParam: bool = Query( @@ -91,15 +95,17 @@ ViewQueryParam: JobIndexViewEnum = Query( ) -ToolIdQueryParam: Optional[str] = Query( +ToolIdQueryParam = Query( default=None, + alias="tool_id", title="Tool ID(s)", description="Limit listing of jobs to those that match one of the included tool_ids. If none, all are returned", ) -ToolIdLikeQueryParam: Optional[str] = Query( +ToolIdLikeQueryParam = Query( default=None, + alias="tool_id_like", title="Tool ID Pattern(s)", description="Limit listing of jobs to those that match one of the included tool ID sql-like patterns. If none, all are returned", ) @@ -186,12 +192,12 @@ class FastAPIJobs: def index( self, trans: ProvidesUserContext = DependsOnTrans, - state: Optional[str] = StateQueryParam, + states: Optional[List[str]] = Depends(query_parameter_as_list(StateQueryParam)), user_details: bool = UserDetailsQueryParam, user_id: Optional[EncodedDatabaseIdField] = UserIdQueryParam, view: JobIndexViewEnum = ViewQueryParam, - tool_id: Optional[str] = ToolIdQueryParam, - tool_id_like: Optional[str] = ToolIdLikeQueryParam, + tool_ids: Optional[List[str]] = Depends(query_parameter_as_list(ToolIdQueryParam)), + tool_ids_like: Optional[List[str]] = Depends(query_parameter_as_list(ToolIdLikeQueryParam)), date_range_min: Optional[Union[datetime, date]] = DateRangeMinQueryParam, date_range_max: Optional[Union[datetime, date]] = DateRangeMaxQueryParam, history_id: Optional[EncodedDatabaseIdField] = HistoryIdQueryParam, @@ -202,16 +208,6 @@ class FastAPIJobs: limit: int = LimitQueryParam, offset: int = OffsetQueryParam, ) -> List[Dict[str, Any]]: - def optional_list(input: Optional[str]) -> Optional[List[str]]: - if input is None: - return None - else: - return listify(input) - - states = optional_list(state) - tool_ids = optional_list(tool_id) - tool_ids_like = optional_list(tool_id_like) - payload = JobIndexPayload( states=states, user_details=user_details, diff --git a/lib/galaxy/workflow/modules.py b/lib/galaxy/workflow/modules.py index abc19362029..889e869f529 100644 --- a/lib/galaxy/workflow/modules.py +++ b/lib/galaxy/workflow/modules.py @@ -227,7 +227,7 @@ class WorkflowModule: return self.get_all_outputs(data_only=True) def get_post_job_actions(self, incoming): - return [] + return {} def check_and_update_state(self): """ @@ -428,6 +428,10 @@ class SubWorkflowModule(WorkflowModule): _modules: Optional[List[Any]] = None subworkflow: Workflow + def __init__(self, trans, content_id=None, **kwds): + super().__init__(trans, content_id, **kwds) + self.post_job_actions: Optional[Dict[str, Any]] = None + @classmethod def from_dict(Class, trans, d, **kwds): module = super().from_dict(trans, d, **kwds) @@ -510,6 +514,7 @@ class SubWorkflowModule(WorkflowModule): def get_all_outputs(self, data_only=False): outputs = [] + self.post_job_actions = {} if hasattr(self.subworkflow, "workflow_outputs"): from galaxy.managers.workflows import WorkflowContentsManager @@ -535,7 +540,7 @@ class SubWorkflowModule(WorkflowModule): data_output["name"] == workflow_output["output_name"] or data_output_uuid == workflow_output_uuid ): - data_output["name"] = label + data_output["label"] = label # That's the right data_output break else: @@ -546,9 +551,21 @@ class SubWorkflowModule(WorkflowModule): f"Workflow output '{workflow_output['output_name']}' defined, but not listed among data outputs" ) continue + post_job_actions = step["post_job_actions"].copy() + change_datatype_action = post_job_actions.pop(f"ChangeDatatypeAction{data_output['name']}", None) + # Post job actions are referred to by tool output name, + # but that's not guaranteed to be unique within a workflow, + # but the label is unique. + if change_datatype_action: + post_job_actions[f"ChangeDatatypeAction{label}"] = change_datatype_action + + self.post_job_actions.update(post_job_actions) outputs.append(data_output) return outputs + def get_post_job_actions(self, incoming): + return self.post_job_actions + def get_content_id(self): return self.trans.security.encode_id(self.subworkflow.id) diff --git a/lib/galaxy/workflow/refactor/execute.py b/lib/galaxy/workflow/refactor/execute.py index 1d8535daced..f583b797b7b 100644 --- a/lib/galaxy/workflow/refactor/execute.py +++ b/lib/galaxy/workflow/refactor/execute.py @@ -517,7 +517,7 @@ class WorkflowRefactorExecutor: # TODO: find workflow outputs that need to be dropped and report them upgrade_inputs = step.module.get_all_inputs() upgrade_outputs = step.module.get_all_outputs() - upgrade_output_names = [u["name"] for u in upgrade_outputs] + upgrade_output_names = [u.get("label") or u["name"] for u in upgrade_outputs] upgrade_order_index = step_def["id"] upgrade_label = step_def.get("label") all_input_connections = step_def.get("input_connections") diff --git a/lib/galaxy_test/selenium/test_workflow_editor.py b/lib/galaxy_test/selenium/test_workflow_editor.py index a71f6d30583..11dde9b0304 100644 --- a/lib/galaxy_test/selenium/test_workflow_editor.py +++ b/lib/galaxy_test/selenium/test_workflow_editor.py @@ -1,6 +1,7 @@ import json import yaml +from selenium.webdriver.common.action_chains import ActionChains from selenium.webdriver.common.keys import Keys from galaxy_test.base.workflow_fixtures import ( @@ -531,6 +532,64 @@ steps: element.wait_for_and_send_keys(Keys.BACKSPACE) element.wait_for_and_send_keys(value) + @selenium_test + def test_change_datatype(self): + self.open_in_workflow_editor( + """ +class: GalaxyWorkflow +inputs: [] +steps: + - tool_id: create_2 + label: create_2 + - tool_id: checksum + label: checksum + in: + input: create_2/out_file1 +""" + ) + editor = self.components.workflow_editor + self.assert_connected("create_2#out_file1", "checksum#input") + node = editor.node._(label="create_2") + node.wait_for_and_click() + editor.configure_output(output="out_file1").wait_for_and_click() + editor.change_datatype.wait_for_and_click() + editor.select_dataype_text_search.wait_for_and_send_keys("bam") + editor.select_datatype(datatype="bam").wait_for_and_click() + editor.node.output_data_row(output_name="out_file1", extension="bam").wait_for_visible() + self.assert_not_connected("create_2#out_file1", "checksum#input") + + def test_change_datatype_in_subworkflow(self): + self.open_in_workflow_editor( + """ +class: GalaxyWorkflow +inputs: [] +steps: + nested_workflow: + run: + class: GalaxyWorkflow + inputs: [] + steps: + - tool_id: create_2 + label: create_2 + outputs: + out_file1: + change_datatype: bam + outputs: + workflow_output: + outputSource: create_2/out_file1 + metadata_bam: + tool_id: metadata_bam +""" + ) + editor = self.components.workflow_editor + node = editor.node._(label="nested_workflow") + node.wait_for_and_click() + node.output_data_row(output_name="workflow_output", extension="bam").wait_for_visible() + # Move canvas, so terminals are in viewport + self.move_center_of_canvas(xoffset=100, yoffset=100) + self.workflow_editor_connect("nested_workflow#out_file1", "metadata_bam#input_bam") + self.assert_connected("nested_workflow#out_file1", "metadata_bam#input_bam") + @selenium_test def test_editor_duplicate_node(self): workflow_id = self.workflow_populator.upload_yaml_workflow(WORKFLOW_SIMPLE_CAT_TWICE) @@ -784,3 +843,8 @@ steps: modal_element = self.components.workflow_editor.state_modal_body.wait_for_visible() text = modal_element.text assert expected_text in text, f"Failed to find expected text [{expected_text}] in modal text [{text}]" + + def move_center_of_canvas(self, xoffset=0, yoffset=0): + canvas = self.find_element_by_id("canvas-container") + chains = ActionChains(self.driver) + chains.click_and_hold(canvas).move_by_offset(xoffset=xoffset, yoffset=yoffset).release().perform() diff --git a/test/functional/tools/select_from_csvdataset.xml b/test/functional/tools/select_from_csvdataset.xml index 6ca646a1db3..e1e1aac443d 100644 --- a/test/functional/tools/select_from_csvdataset.xml +++ b/test/functional/tools/select_from_csvdataset.xml @@ -6,7 +6,7 @@ echo select_single '$select_single' > '$output' - + @@ -29,11 +29,15 @@ echo select_single '$select_single' > '$output' - + + + + + diff --git a/test/unit/webapps/test_query_params_lists.py b/test/unit/webapps/test_query_params_lists.py new file mode 100644 index 00000000000..6d50e07b6ab --- /dev/null +++ b/test/unit/webapps/test_query_params_lists.py @@ -0,0 +1,56 @@ +from typing import List + +from fastapi.applications import FastAPI +from fastapi.param_functions import ( + Depends, + Query, +) +from fastapi.testclient import TestClient + +from galaxy.webapps.galaxy.api.common import query_parameter_as_list + +app = FastAPI() + +client = TestClient(app) + + +@app.get("/test/get_value_as_list") +async def get_value_as_list( + values: List[str] = Depends(query_parameter_as_list(Query(alias="value"))), +): + return values + + +def test_single_value(): + query_params = "value=val" + result = _get_result_for_params(query_params) + assert len(result) == 1 + assert result[0] == "val" + + +def test_list_as_comma_separated_values(): + query_params = "value=val1,val2,val3" + result = _get_result_for_params(query_params) + + assert len(result) == 3 + assert result[0] == "val1" + assert result[1] == "val2" + assert result[2] == "val3" + + +def test_list_as_multiple_query_entries(): + query_params = "value=val1&value=val2&value=val3" + result = _get_result_for_params(query_params) + + assert len(result) == 3 + assert result[0] == "val1" + assert result[1] == "val2" + assert result[2] == "val3" + + +def _get_result_for_params(query_params: str): + response = client.get(f"/test/get_value_as_list?{query_params}") + + assert response.status_code == 200 + result = response.json() + return result diff --git a/test/unit/workflows/test_modules.py b/test/unit/workflows/test_modules.py index 77ad7802146..b72ee0c1e9e 100644 --- a/test/unit/workflows/test_modules.py +++ b/test/unit/workflows/test_modules.py @@ -244,9 +244,9 @@ def test_subworkflow_new_outputs(): outputs = subworkflow_module.get_data_outputs() assert len(outputs) == 2, len(outputs) output1, output2 = outputs - assert output1["name"] == "out1" + assert output1["label"] == "out1" assert output1["extensions"] == ["input"] - assert output2["name"] == "4:out_file1", output2["name"] + assert output2["label"] == "4:out_file1", output2["label"] class MapOverTestCase(NamedTuple): diff --git a/tools/filters/grep.xml b/tools/filters/grep.xml index b3343f5bd93..2bb530446dc 100644 --- a/tools/filters/grep.xml +++ b/tools/filters/grep.xml @@ -1,4 +1,4 @@ - + lines that match an expression grep @@ -17,7 +17,7 @@ #else cat '$input' #end if - | grep -P -f '$pattern_file' $invert > '$out_file1' + | grep -P -f '$pattern_file' $invert >> '$out_file1' ]]> $pattern @@ -51,9 +51,21 @@ + + + + + + + + + + + +