Commit Graph
11094 Commits
Author SHA1 Message Date
John Chilton c60ddc241b Merge pull request #1599 from carlfeberhard/fix.hdca-copy
[16.01] Core, HDCAs: fix 'copy_item_annotation' error when copying a history …
2016-01-28 10:20:55 -05:00
carlfeberhard 55f67e59d6 Core, HDCAs: fix 'copy_item_annotation' error when copying a history with an hdca by adding UsesAnnotations mixin to HDCA model 2016-01-27 14:04:53 -05:00
carlfeberhard b1ae5d8c67 UI, users: allow '/user' and '/user/' to default controller and correctly return the user/index.mako template (preventing an internal error) 2016-01-27 08:54:13 -05:00
John Chilton c2d94c43bb Merge pull request #1560 from natefoo/conda-interop
[16.01] Add a requirements file suitable for use with `conda {create,install} --file`
2016-01-26 16:49:25 -05:00
Nate Coraor 1486af0ef9 Rename conda-requirements.txt to conda-environment.txt since it is not a
requirements file, include instructions on how to install remaining
dependencies from pip.
2016-01-26 16:46:20 -05:00
Martin Cech 35f90da20c Merge pull request #1542 from jmchilton/did_fix
[16.01] Attempt to fix #1531.
2016-01-26 16:24:42 -05:00
Nate Coraor c8b0057349 Add a requirements file suitable for use with conda {create,install} --file. 2016-01-21 16:03:51 -05:00
Dannon Baker e48388ef6c Merge pull request #1545 from jmchilton/subcollection_mapping_problem
[16.01] Fix #1538.
2016-01-21 10:46:57 -05:00
Dannon Baker 2fc982027c Merge pull request #1553 from jmchilton/logging_fix
[16.01] Logging fix.
2016-01-21 10:42:30 -05:00
John Chilton 093f1f2712 Make sciex sniffer tighter.
Otherwise a bed file easily could sniff as sciex.
2016-01-21 13:30:22 +00:00
John Chilton 1b43e8d68f Logging fix. 2016-01-21 10:34:05 +00:00
John Chilton cd95635197 Fix #1538.
Displaying subcollection mapping in tool forms was broken with #1308 - this fixes that I believe.
2016-01-20 13:26:08 +00:00
John Chilton 3f51101527 Attempt to fix #1531.
I was unable to reproduce #1531 in testing, but if the problem is something to do with stale state the following sledge hammer should fix it.

Runt the new test case with:

./run_tests.sh -api test/api/test_workflows.py:WorkflowsApiTestCase.test_delete_intermediate_datasets_pja_1
2016-01-20 12:46:05 +00:00
John Chilton f1394d250d Fix #1514.
Prior to PR #1302 workflows wouldn't validate call validate at all on inputs. 1302 was perhaps an over correction that causes validate to be called on datasets that aren't yet READY but require metadata. This rolls that back somewhat, other parameters will still validate - but validation asserting the existence of metadata won't get called in workflows. This is still not ideal but after 1302 and this - we are still in a better, more secure place than beforehand.

One might argue that since we need to introduce a new validation point (right before a job is scheduled and set to QUEUED) - that we would be better off rolling back #1302 entirely. I've considered that, but I still think it is better to fail fast on the other problems, also I would rather call the validation code too many times than not enough and it would be very late in the release cycle for such a change.
2016-01-19 13:50:53 +00:00
John Chilton 16e0bc08c8 Merge pull request #1526 from guerler/fix_unvalidated_001
[16.01] Handle unvalidated values in depth
2016-01-15 20:35:00 -05:00
Bjoern Gruening 0e9302127f sourcing Conda will write to stderr, we need to redirect it to stdout 2016-01-16 00:12:53 +01:00
guerler fc434d62e9 Handle unvalidated values in depth 2016-01-15 17:03:07 -05:00
Dannon Baker 817f36626d Merge pull request #1474 from jmchilton/workflow_copy
[16.01] Copy workflow objects when importing them.
2016-01-15 10:39:05 -05:00
John Chilton c143d659d4 Revise tool caching to be less broken.
Just switch the default for tool caching and only cache during initial loads of tool panels - as during a toolbox refresh. This should mean that all code from tool shed will ignore the cache and should fix #1515.

Additionally, reloading the tool was broken since if would call the load tool code and then just trust the cache. This should fix tool reloading as well.
2016-01-14 16:55:04 +00:00
Dannon Baker 3d1ad5ad8d Merge pull request #1511 from martenson/log-user-exceptions-properly
[16.01] catch Exception and properly log errors
2016-01-14 12:55:27 -05:00
Martin Cech 12445a0524 use log.exception instead of log.error to retain the stacktrace 2016-01-14 12:53:23 -05:00
Martin Cech 3ee94d58e0 catch Exception and properly log errors 2016-01-14 11:35:11 -05:00
John Chilton e397ebba58 Merge pull request #1509 from dannon/release_16.01
Fix MIMEText usage in galaxy.util
2016-01-14 11:23:35 -05:00
Dannon Baker 95d00b4174 Fix MIMEText usage in galaxy.util 2016-01-14 11:04:33 -05:00
John Chilton 602dc7f664 Switch default job shell back to /bin/sh for 16.01. 2016-01-14 06:17:45 +00:00
John Chilton 3e47aa23b8 Switch to bash as default shell (for conda resolver).
I'm making more things configurable in case someday the BSD user wants to use Galaxy - the default shell for jobs can be configured at the galaxy or job destination level now.
2016-01-14 06:17:43 +00:00
Björn Grüning 1dac5f3bb6 Merge pull request #1502 from jmchilton/planemo_fix
[16.01] Fix a few problems discovered through planemo.
2016-01-14 11:31:00 +01:00
John Chilton 7de3bcdd7e Merge pull request #1495 from natefoo/pin-release-wheels
[16.01] Pin release wheel versions
2016-01-14 04:23:28 -05:00
John Chilton eb3fc642fc Merge pull request #1498 from blankenberg/tab_mime
[16.01] Set mime type when previewing tabular data that has > 50 columns, but < 1000000 bytes.
2016-01-14 04:12:27 -05:00
John Chilton f78756cb79 Fix a few problems discovered through planemo.
Including 'TypeError: _get_config_option() got multiple values for keyword argument 'prefix' and problem when planemo's cwltool is installed in Galaxy's virtualenv.
2016-01-13 22:32:56 +00:00
Daniel Blankenberg 0bcfa74ea1 Set mime type when previewing tabular data that has > 50 columns, but < 1000000 bytes. Fixes the issue of losing newlines and actual spacing (i.e. do not treat as html). 2016-01-13 16:28:59 -05:00
Nate Coraor 9d91be8dd3 Pin release wheel verisons. pinned-requirements.txt renamed to
pinned-hashed-requirements.txt as unfortunately even Galaxy pip does not
support --hash
2016-01-13 14:47:57 -05:00
Dannon Baker 2f1dbeee68 Address W503 and E721 errors now enforced by pep8 1.7. 2016-01-13 10:41:27 -05:00
John Chilton 55677f2d3d Fix to ensure integrity of tool_script.sh also.
Previously the job script underwent these checks and I had assumed since that got written later it would never be the case that tool_script.sh wouldn't be synchronized by the job script was - turns out file systems are more creative and less logical than one might expected.

Also increases the count for the number of syncs that will execute because 15 on rare occasion proved not to be enough as well as making both the count and sleep time configurable.
2016-01-13 14:58:28 +00:00
John Chilton 66c94125ee Copy workflow objects when importing them.
If not anywhere workflow.stored_workflow is checked will be broken.
2016-01-11 16:12:57 +00:00
John Chilton f8a7ac0820 Merge release_15.10 into release_16.01.
Conflicts:
	eggs.ini
	lib/galaxy/tools/__init__.py
	lib/galaxy/tools/actions/__init__.py
	lib/galaxy/tools/toolbox/base.py
	static/maps/mvc/collection/list-collection-creator.js.map
	static/maps/mvc/library/library-foldertoolbar-view.js.map
	static/maps/utils/uploadbox.js.map
	static/scripts/mvc/collection/list-collection-creator.js
	static/scripts/mvc/library/library-foldertoolbar-view.js
	static/scripts/utils/uploadbox.js
	test/base/twilltestcase.py
	test/functional/tools/samples_tool_conf.xml
2016-01-08 18:06:28 +00:00
John Chilton dff94d743f "Fix" collection outputs to hide the HDAs in the history.
Long term this is just not a solution, but it is the strategy we use for mapped over output HDAs also.

Rebased and fixed based on comments from @nsoranzo indicating the previous attempt did absolutely nothing to fix the problem.

xref https://github.com/galaxyproject/tools-iuc/pull/412/files

Conflicts:
	lib/galaxy/tools/actions/__init__.py
2016-01-08 17:04:51 +00:00
Dannon Baker 0403a3175c Fix refactoring from 7587809b 2016-01-08 16:35:52 -05:00
Nicola Soranzo e8e01bdfb1 When loading a tool from Tool Shed, check that the <installed_changeset_revision> element matches the tool path.
Workaround for issue #1283, which causes the loaded tool to have a
StockLineage instead of a ToolShedLineage, thus creating multiple entries
for the tool in the panel.

Conflicts:
	lib/galaxy/tools/toolbox/base.py
2016-01-08 14:17:12 +00:00
Nicola Soranzo 47361f12ec Reduce code duplication by reusing get_installed_repository() function.
Conflicts:
	lib/galaxy/tools/toolbox/base.py
2016-01-08 14:17:12 +00:00
John Chilton e611b8fdb8 Use a more typical optional default value for optional import in watcher.py.
Thanks to @nsoranzo for the advice - https://github.com/galaxyproject/galaxy/pull/1448#discussion_r49210125.
2016-01-08 12:00:50 +00:00
John Chilton 7a3cc41054 Fix optional watchdog handling.
Broken with 4086dd61da.

Thanks for bug report from @nsoranzo.
2016-01-08 11:45:42 +00:00
Nate Coraor a0610ecdc0 Update version to 16.01.rc1 2016-01-05 16:39:53 -05:00
Nate Coraor b4fe6e2c3d Merge pull request #1393 from erasche/requirements-hashes-round-3
Added hashes
2016-01-05 16:33:25 -05:00
Nate Coraor 0ae86f59a1 Merge pull request #1429 from dannon/interactive_tours
fix title_default to work as a default and not an override
2016-01-05 16:33:01 -05:00
Dannon Baker 1568c0db80 fix title_default to work as a default and not an override 2016-01-05 16:28:51 -05:00
Nate Coraor 8bd293683b Merge pull request #1427 from jmchilton/lib-deps
Revise galaxy-lib dependencies.
2016-01-05 16:12:42 -05:00
John Chilton 0bad80ebdf Merge pull request #1182 from yhoogstrate/bam_cram_index_via_pysam
cram datatype: crai index via pysam
2016-01-05 15:21:06 -05:00
Nate Coraor 634a5b7fd9 Merge pull request #1413 from jmchilton/lib_0
Copy pastescript's NiceConfigParser into galaxy.util.properties.
2016-01-05 14:56:21 -05:00
Dannon Baker 1876ea6bb2 Merge pull request #8 from jmchilton/interactive_tours
Minor tweaks to interactive tours backend.
2016-01-05 12:27:13 -05:00