Commit Graph
4166 Commits
Author SHA1 Message Date
Nicola Soranzo ed18d34f08 Merge pull request #7838 from mvdbeek/use_getfullargspec_on_python3
Use getfullargspec on python3
2019-04-29 13:50:45 +01:00
mvdbeek b68dcb4507 Use getfullargspec on python3
`getargspec` is marked for deprecation.
2019-04-29 11:52:33 +02:00
Nicola Soranzo 084296c92a Remove recursion from `expand_nested_tokens()`
Also add test for recursive nested token.
2019-04-27 00:09:31 +01:00
John Chilton 003cdb83fd Merge pull request #7823 from mvdbeek/fix_token_replacement_py3
Fix nested macro/token expansion on python 3
2019-04-26 10:59:38 -04:00
mvdbeek 60d87107ee Fix InputValueWrapper gt/ge/lt/le comparisons 2019-04-25 21:32:47 +02:00
mvdbeek 77ae679746 Fix nested macro/token expansion on python 3
I noticed that in multiqc @ESCAPE_IDENTIFIER@ wasn't being replaced.
It's surprising that this didn't cause any issues on python 2,
but might have to do with the iteration order changes.
2019-04-25 19:51:25 +02:00
John Chilton 75ec6dba53 Merge pull request #7594 from martenson/workflow-ux
improve workflow cog menu ux
2019-04-24 08:28:18 -04:00
Dannon 745ae6d298 Merge pull request #7804 from mvdbeek/nsoranzo-fix_deprecations
Fix 'postgres' dialect name has been renamed to 'postgresql' deprecat…
2019-04-24 08:00:37 -04:00
Marius van den Beek 4bd8644b24 Merge pull request #7800 from nsoranzo/fix_deprecations
Fix various Python deprecations
2019-04-24 10:52:34 +02:00
mvdbeek 1c38a4a075 Fix 'postgres' dialect name has been renamed to 'postgresql' deprecation warning 2019-04-24 10:49:23 +02:00
Nicola Soranzo d53112aa43 Use `yaml.safe_load() instead of load()`
See https://msg.pyyaml.org/load
2019-04-23 16:50:55 +01:00
Nate Coraor 1ce4c5fade Don't clean up jobs when running tests if $GALAXY_TEST_NO_CLEANUP is
set. `$GALAXY_CONFIG_OVERRIDE_CLEANUP_JOB` can be used to override this
behavior.
2019-04-23 11:01:08 -04:00
Nicola Soranzo faac99976b Fix deprecated `assertEquals()`
See https://docs.python.org/2/library/unittest.html#deprecated-aliases
2019-04-23 12:48:35 +01:00
mvdbeek 6b3aecdcc4 Restrict search to items in owned histories
This was an oversight in https://github.com/galaxyproject/galaxy/pull/7745.
This is the quick fix, but I think it's feasible to implement the
accessible logic as a query, which means we could push this down to
a Mixin, and treat it as a regular fiter (so admins could for instance
search/sort for the largest datasets, which is already possible in the
reports app).
2019-04-20 16:27:34 +02:00
John Chilton 32604d9b03 Merge pull request #7745 from mvdbeek/dataset_search_api
Extend dataset search and add search API endpoint
2019-04-19 09:00:28 -04:00
mvdbeek e7b0867602 Make sure orm filters operate on correct model
In practice we use ParsedFiler.filter_type to discriminate
the different filter types. Filters that require the correct
model class for a specific query are now functions that take
a model_class and generate the correct filter.
2019-04-18 18:55:14 +02:00
mvdbeek 885d9d1766 Fix err_msg assertion 2019-04-17 16:30:24 +02:00
mvdbeek ae5e781edf Make TaggableFilterMixin use orm_filters
This is way more peformant and also doesn't give
weird results when a limit is used.
2019-04-17 16:03:27 +02:00
John Chilton 1e731b7c03 Add HDCA support to model persistence script. 2019-04-17 08:51:18 -04:00
John Chilton ca1b1fd854 Fix nested composite files during history import/export.
Fixes #3628
2019-04-17 08:49:09 -04:00
mvdbeek 4469b9cbc0 Split up test and test searching by tool id 2019-04-17 12:56:46 +02:00
Martin Cech 93da1fc0bd Merge pull request #7684 from jmchilton/build_objects_script
Script to populate datasets/libraries directly into an objectstore and model store.
2019-04-16 22:16:31 -04:00
mvdbeek 48d9eaf78f Add some basic dataset search testing 2019-04-16 19:31:36 +02:00
mvdbeek 95fe0ffcf5 Adjust DatasetsApiTestCase.test_index to status code 200
And modernize test setup by using DatasetPopulator.
2019-04-16 19:31:03 +02:00
Martin Cech 51cbf440bf Merge pull request #7755 from jmchilton/job_error_reporting
Report a couple common errors in dataset/job report.
2019-04-16 13:30:12 -04:00
John Chilton 44856a3f75 Report a couple common errors in dataset/job report.
Report if empty inputs were used or if the same input was used more than once, these were identified as common sources of potential errors across many tools. Neither of these are definite problems, but both could be depending on the tool and both happen frequently. Outline a few more ideas as TODOs in the code.
2019-04-16 10:24:28 -04:00
Marius van den Beek 7c233a9c2d Merge pull request #7754 from jmchilton/fix_for_docker_on_mac_kubernetes_test
Fix Kubernetes integration tests for Docker on Mac.
2019-04-16 16:20:53 +02:00
John Chilton 74bf94f445 Fix kubernetes integration tests for Docker on Mac. 2019-04-16 08:28:36 -04:00
John Chilton c33b4d4364 Merge pull request #7724 from mvdbeek/dependent_jobs
Unpause dependent jobs when resuming jobs
2019-04-15 14:16:47 -04:00
Nicola Soranzo 1b1f6e9cda Fix comments 2019-04-14 18:02:42 +01:00
Nicola Soranzo bfc7b68848 Merge branch 'release_19.01' into dev 2019-04-12 23:18:49 +01:00
Nicola Soranzo d545e88703 Add test case and use assertRaises()
Also remove temporary directory.
2019-04-12 12:41:48 +01:00
mvdbeek 0b8dec5af0 Make sure dependent jobs are being unpaused
Fixes https://github.com/galaxyproject/galaxy/issues/6926
2019-04-11 19:35:20 +02:00
John Chilton 9dfa5d7041 Merge pull request #5495 from jmchilton/batch_operation_optimize
Batch bulk hide and delete operations when multi-selected.
2019-04-11 09:01:32 -04:00
John Chilton d89749bad7 Bulk delete and hide operations. 2019-04-10 20:59:33 -04:00
Nicola Soranzo a12db037ca Merge branch 'release_19.01' into dev 2019-04-11 00:43:45 +01:00
John Chilton fc68cb8449 Script to populate datasets/libraries directly into an objectstore and model store.
The included script takes in an object store definition to write to, model store output target (e.g. tar file or directory or bagit file/directory format matching the new history exports added in 7367), and a bunch of files in defined via an upload-2.0-style YAML - and writes the physical files into the object store and writes persisted metadata into the model store. The supplied script describes the input format as do the new unit tests in test_model_discover.py.

Right now datasets for a history and whole libraries (including recursive folders and library datasets) can be described this way. These concepts have been extended to collections in #7058 but only in the context of discovering job outputs and writing them to an export model store current.

This script was created mostly by refactoring stuff out of output_collect.py that is used to create datasets during output discovery (i.e. parsing the same data out of galaxy.json files).
2019-04-10 11:01:09 -04:00
John Chilton 76b1bf3a85 Model store - configurable metadata file handling. 2019-04-10 10:58:28 -04:00
John Chilton 8657ad9afe Test case for copied_from chains that leave the history and come back. 2019-04-10 10:58:28 -04:00
Nate Coraor 8d5b155f1a Merge pull request #7694 from jmchilton/fix_pulsar_metadata
Fix pulsar remote metadata with metadata_strategy == 'directory'.
2019-04-10 09:02:31 -04:00
mvdbeek 4c9e4118f5 Restrict workflow invocation index to current user
If the user is not an admin.
Fixes https://github.com/galaxyproject/galaxy/issues/7710

An alternative would be to skip Accessibility / Ownership
exceptions, but given that we can just restrict the query
this seems like the better approach to me.
2019-04-10 11:13:59 +02:00
John Chilton da26bfdc75 Merge pull request #7683 from mvdbeek/implicit_conversion_for_collection_parameters
Implicit conversion for input collection parameters
2019-04-09 10:55:17 -04:00
Martin Cech 1075a0e6bc Merge pull request #7659 from jmchilton/format2_import_default
Allow import of format2 workflows by default for 19.05.
2019-04-09 10:50:45 -04:00
John Chilton 74a6615488 Fix pulsar with metadata_strategy == 'directory'. 2019-04-08 16:30:15 -04:00
Enis Afgan a8dc13da53 Merge pull request #7195 from machristie/keycloak-integration
Custos integration
2019-04-08 16:15:41 -04:00
mvdbeek 272a136970 Add test tools for implicit coversion of collection input 2019-04-08 18:33:57 +02:00
mvdbeek 54b9609896 Merge branch 'release_19.01' into dev 2019-04-08 18:29:11 +02:00
Martin Cech adfb7e65b3 Merge pull request #7682 from mvdbeek/fix_format_source_impicit_conversion
[19.01] Fix format_source for implicit conversion inputs and fasta.gz upload
2019-04-08 10:13:26 -04:00
Marius van den Beek 03b96f9eb3 Merge pull request #7650 from jmchilton/uuid_fixes
Fix composite data and metadata file handling for UUID object stores
2019-04-08 15:17:23 +02:00
Marius van den Beek 7ea8734796 Merge pull request #7367 from jmchilton/export_collections
Rework and Generalize History Import and Export
2019-04-08 14:24:45 +02:00