Commit Graph
793 Commits
Author SHA1 Message Date
John Chilton 75283c7b6c Merge pull request #4178 from zipho/neo_datatype
Neostore Zip datatype support
2018-01-02 13:33:27 -05:00
John Chilton 8e93c2e070 Merge pull request #5247 from mvdbeek/job_rerun_fixes
Fix and enhance job resume functionality
2017-12-31 08:14:46 -06:00
mvdbeek c0dbace7bb Replace collection elements with re-run output
This specifically addresses the problem where some jobs of a mapped-over
collection have failed. Instead of filtering the failed collection and
restarting the workflow at this position (involving a lot of copy-paste ...)
the user can now limit the rerun to the problematic jobs and the workflow
should resume from there.
Should fix https://github.com/galaxyproject/galaxy/issues/2235.

This is one possible implementation, it would also be feasible to not
manipulate the original collection, but to copy the HDCA and then to replace
collection elements and replace all references for jobs that depend on the HDCA,
as we do for HDAs. This implementation seems simpler, but let me know if you
see problems with this approach.
2017-12-31 14:08:26 +02:00
mvdbeek 9fdf0a6269 Add job resume test with HDCA input to paused dataset
I am slightly surprised that this worked without change,
but it appears that the remapping occurs via the HDAs that
the HDCA is composed of.
2017-12-31 14:08:26 +02:00
John Chilton f017de30bf Tool-centric annotation of out of memory errors.
- Update explicit stdio definitions as well as detect_errors-based definitions to allow this.
- Update runner code to allow resubmission in such cases.
2017-12-22 09:08:18 -05:00
Nicola Soranzo 6f722861cf Python3: fix moved imports
Add `.ci/check_py3_compatibility.sh` script to find library modules
that have been moved in Python3. Fix errors found by the script.
2017-12-15 01:03:28 +00:00
John Chilton dc67206b21 Merge remote-tracking branch 'jmchilton/dev' into neo_datatype 2017-12-12 10:23:41 -05:00
Martin Cech fc18b504be Merge pull request #5108 from mvdbeek/merge_forward_17_09
Merge forward 17 09
2017-12-01 09:58:55 -05:00
mvdbeek 4dd05fc942 Merge branch 'release_17.09' into dev 2017-12-01 14:33:00 +01:00
Nicola Soranzo 48aca7dce8 Update to flake8-import-order 0.16 2017-12-01 11:09:57 +00:00
Dannon Baker 1385cf4f83 Merge remote-tracking branch 'jmchilton/citations' into dev 2017-11-30 15:09:56 -05:00
John Chilton ca09e803ae Dataset collection state UX test case. 2017-11-30 10:02:03 -05:00
John Chilton 9e471d3e97 Allow mapping over empty collections.
If one maps a tool over an empty collection, one should get an empty output collection for each of the tool's outputs.

This should have always been a valid operation I think, the code just wasn't quite structured right when the collection work was merged - there were too many places I was assuming the existence of at least one actual output or input that was mapped over to continue going. This reworks all of that and seems to handle empty collections appropriately.

Fixes #4025 (not being informing the user of the operation, but actually by allowing the operation - which it should be allowed I think).
2017-11-30 10:02:02 -05:00
John Chilton 55aa7bce55 Test cases for mapping for outputs with filter statements.
Checked through tools-iuc and I couldn't find any tools that use the actual input data parameters in filter statements so I think it is a fairly good approximation to assume that all mapped jobs will either filter or not at least with current execution model.
2017-11-30 10:02:01 -05:00
John Chilton 3c20f3285a Attempt to make data manager integration test more robust.
Increase the timeout - this test fails on Jenkins every now and then and reports the DM job is still queued. I assume this is because of conda_auto_install setting up the requirements for this data manager and the logs seem consistent with that assumption.

I also added data manager json type to the sample so this warning goes away:

```
galaxy.model WARNING 2017-11-30 06:39:59,335 Datatype class not found for extension 'data_manager_json'
```
2017-11-30 06:41:12 -05:00
John Chilton ca2eb5b2a5 Simple tool test for citations. 2017-11-24 15:25:19 -05:00
John Chilton a7c8edbaa4 Bug fix - expose proper element_identifier in tool action template expansions. (#5049)
xref https://github.com/galaxyproject/tools-iuc/commit/f57f1bf4816f212b83c08e0e3c3782ebba8b7d9a
2017-11-20 23:11:00 +01:00
Nate Coraor c270614fac Merge remote-tracking branch 'origin/dev' into job-handler-mules 2017-11-16 12:13:28 -05:00
Marius van den Beek a9685d3acd Merge pull request #5017 from jmchilton/test_renaming_multiple_workflows
Test renaming multiple different outputs in workflows.
2017-11-16 17:51:59 +01:00
John Chilton d3b5fac751 Test renaming multiple different outputs in workflows.
Attempting to exercise a bug reported by @lparsons.
2017-11-15 13:46:01 -05:00
Nate Coraor 418fd53739 Merge remote-tracking branch 'origin/dev' into job-handler-mules 2017-11-15 12:42:20 -05:00
Dannon Baker e27a16953d Merge pull request #4961 from jmchilton/job_delete_api
Add DELETE /api/jobs/<job_id> as a job cancellation API endpoint.
2017-11-15 08:12:19 -05:00
John Chilton cecef90915 Merge remote-tracking branch 'jmchilton/dev' into tdt_tests 2017-11-14 21:49:15 -05:00
John Chilton c52ebfca26 Improvements for tour generator Selenium tests.
- Replace test using Cut1 with two tests each using framework test tools loaded with Selenium tests by default.
- Create a symbolic link so that tour generator is configured with default test webhooks.
- Establish and use components and navigates_galaxy.py abstractions for tour generation and navigation.
- In one of the tool tests actually walk the tour (previously we only verified the initial tour popover).
2017-11-14 21:41:09 -05:00
Nicola Soranzo 2cd95c48f6 Fix import order everywhere
- Add flake8-import-order to flake8 Pipfile and remove py27-lint-imports
  and py27-lint-imports-include-list tox envs
- Fix most E201 and E202 errors reported by flake8-import-order v0.15,
  but pin flake8-import-order to v0.14.3 until
  https://github.com/PyCQA/flake8-import-order/issues/123
  is fixed

This let us drop 2 jobs on Travis per each job.
2017-11-14 19:42:39 +00:00
Nate Coraor 30266c5221 Merge remote-tracking branch 'origin/dev' into job-handler-mules 2017-11-09 13:11:46 -05:00
John Chilton 140a0a49d3 Add DELETE /api/jobs/<job_id> as a job cancellation API endpoint. 2017-11-08 15:54:15 -05:00
John Chilton 162bddd96c Simple tests for data source responses.
- Verify a simple data source works when responding via the API.
- Verify a data source sending back a file:// parameter is blocked (GX-2017-0004/GX-2017-0003 - it is tracked different ways in the commit message and in the security issue tracker).
2017-10-25 14:46:16 -04:00
Nicola Soranzo 9b4de72ca6 Fix all E722 errors and ignore E741
Introduced in flake8 3.5.0
Fix import order.
2017-10-24 11:29:09 +01:00
E Rasche 0f311470d9 Backport of hardening fixes to 17.09 2017-10-18 13:03:49 -04:00
John Chilton eab674173c MacOS X fix for a test tool. 2017-10-13 19:30:33 -04:00
John Chilton d65a060b06 Fix to respect galaxy.json supplied metadata for empty outputs.
With a test case to verify this and a empty datasets in general (e.g. collecting empty datasets from work dir).
2017-09-28 11:18:09 -04:00
Nicola Soranzo 9b1832abb1 Fix import order for cron/, scripts/ and test/ 2017-09-25 23:44:39 +01:00
E Rasche a68d6be3a1 reorder imports 2017-09-25 11:39:13 +02:00
Martin Cech 9b4cd096e1 Merge pull request #4505 from jmchilton/composite_upload_refine
Tests and clarifications for composite uploads.
2017-09-04 21:02:40 -04:00
John Chilton aba726a89f Move twilltestcase from `base to functional` module.
This way nothing in ``base`` has any dependencies on Twill anymore.
2017-09-01 12:30:18 -04:00
John Chilton 7343463dac Rework hack to inject database contexts into Tool Shed tests.
Rather than depend on something in ``functional`` test module from ``base.driver_util``, just set these global hacks up in ``driver_util`` itself. This eliminates a dependency of ``functional`` on ``base`` - ideally ``base`` would not depend on any other test modules.
2017-09-01 12:30:18 -04:00
John Chilton 6e17ff57ea Remove test/functional/test_library_templates.py.
Hasn't been run in forever and it seems like we are deprecating these features.
2017-09-01 12:30:07 -04:00
John Chilton 259e12d760 Continue separation of FunctionalTestCase from TwillTestCase.
Move non-twill stuff out into its own module including FunctionalTestCase.
2017-09-01 12:30:07 -04:00
Nate Coraor 3f0082515a Improvements for mule job handler testing. Ensure that the server
running the job is a mule. Added a test tool that will write Galaxy
app.config attributes to the output dataset.
2017-08-31 14:30:46 -04:00
John Chilton 5a7a15d161 Test and clarifications for composite uploads.
- Add an API test for datatype-defined composite uploads - including exercising newline conversion and the space_to_tab parameter.
- Add a test decorator skip_without_datatype to mirror skip_without_tool for this test, improve both decorators.
- The ftype parameter in the composite test tools does nothing - drop it and drop it from the XSD spec.
- Slightly improve the documentation for these composite_data elements in the XSD.
2017-08-31 12:47:40 -04:00
Nicola Soranzo 8dc0e697d3 Fix vcf_bgzip datatype
In https://github.com/galaxyproject/galaxy/pull/4254 `vcf_bgzip` was made
a proper datatype with the introduction of the `VcfGz` class, but was
still described as a subclass in `datatypes_conf.xml` .

Also fix `file_ext` attribute in `BaseVcf` and subclasses.
2017-08-22 17:53:40 +01:00
John Chilton a8bec7a275 Allow override of provided metadata location.
Eliminates that terrible circular dependency between tools and jobs.
2017-08-17 15:41:11 -04:00
John Chilton 39d4411f8c Move determining tool provided metadata style to tool parser.
Allow override by specifying "provided_metadata_style=" attribute on outputs in tool XML - this should allow newer profile tools to use the older style JSON providing a clear path for upgrades.
2017-08-17 15:41:11 -04:00
John Chilton 6563e387a5 Allow discovering dataset collections in galaxy.json in a nested fashion.
Fixes #2658.
2017-08-17 15:41:11 -04:00
John Chilton 72e361bcf1 Allow discovering datasets directly from galaxy.json...
without needing to specify a discovered dataset pattern. If the ``discovered_datasets`` tag includes ``from_tool_provided_metadata="true"`` the datsets listed in galaxy.json will just be used directly without needing to be "discovered" using a dataset pattern. Metadata and such can continue to be specified either in that file or on the discovered_dataset element except things like pattern (which is not used) and sort_by (since the json should describe the order I suppose).
2017-08-17 15:41:10 -04:00
John Chilton 517f248ac4 Overhaul of tool provided job metadata.
- Add another test to demonstrate referencing entries in galaxy.json for datasets by dataset path basename instead of ID.
- Add a bit more documentation to test tools.
- Redo the structure of galaxy.json for profile >= 17.09 tools with two new test tools to demonstrate the new structure - for both output dataset metadata and discovered dataset metadata.
- Improved abstractions for interaction between tools and jobs to enable different tool provided metadata collection depending on tool profile version.
2017-08-17 15:41:10 -04:00
Nicola Soranzo a353b2e88f Fix E127 errors introduced by previous commit
using:
```
autopep8 -i -r --exclude $(sed -e 's|^|./|' -e 's|/$||' .ci/flake8_blacklist.txt | paste -sd,) --select E127 .
```
2017-08-17 11:35:39 +01:00
Nicola Soranzo 21b44bf348 Fix all E201 and E202 style errors
using the following command:
```
autopep8 -i -r --exclude $(sed -e 's|^|./|' -e 's|/$||' .ci/flake8_blacklist.txt | paste -sd,) --select E201,E202 .
```
2017-08-17 11:35:39 +01:00
John Chilton 06ca789f92 Configuration tests for the last few upload enhancements. 2017-08-12 07:13:05 -04:00