Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multi-data collection reductions in repeat blocks are broken. #2233

Merged
merged 1 commit into from Apr 23, 2016

Conversation

Projects
None yet
6 participants
@jmchilton
Copy link
Member

commented Apr 22, 2016

I've added test cases to demonstrates this, they can be executed with

./run_tests.sh -api test/api/test_tools.py:ToolsTestCase.test_reduce_collections_in_repeat
./run_tests.sh -api test/api/test_tools.py:ToolsTestCase.test_reduce_collections_in_repeat_legacy

Or the tool can be executed on a collection interactively by starting Galaxy with the command:

GALAXY_RUN_WITH_TEST_TOOLS=1 sh run.sh

These tests are both working in a 16.01 as demonstrated by this branch dev...jmchilton:repeat_multidata_16.01.

Once these test cases pass, this will fix #2224.

Tests demonstrating multi-data params in repeats are broken.
A test cases and a tool that can be tested directory.

@jmchilton jmchilton added the kind/bug label Apr 22, 2016

@jmchilton jmchilton added this to the 16.04 milestone Apr 22, 2016

@guerler

This comment has been minimized.

Copy link
Contributor

commented Apr 23, 2016

Thanks for the test cases. They are actually both good and pass with #2238. 👍 Legacy descriptions are handled at https://github.com/galaxyproject/galaxy/blob/dev/lib/galaxy/tools/parameters/basic.py#L1712.

@guerler guerler changed the title [WIP][16.04] Multi-data collection reductions in repeat blocks are broken. [16.04] Multi-data collection reductions in repeat blocks are broken. Apr 23, 2016

@guerler guerler merged commit 18a6393 into galaxyproject:dev Apr 23, 2016

3 of 4 checks passed

api test Build finished.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished.
Details
toolshed test Build finished.
Details
@martenson

This comment has been minimized.

Copy link
Member

commented Apr 24, 2016

This has been merged before the tests pass and broke the API build.
https://jenkins.galaxyproject.org/job/docker-api/
@guerler @jmchilton

@guerler

This comment has been minimized.

Copy link
Contributor

commented Apr 25, 2016

Ah sorry I did not see that this targets dev since its tagged as 16.04 while #2238 targets 16.04.

@nsoranzo nsoranzo changed the title [16.04] Multi-data collection reductions in repeat blocks are broken. Multi-data collection reductions in repeat blocks are broken. Apr 25, 2016

@nsoranzo nsoranzo modified the milestones: 16.07, 16.04 Apr 25, 2016

@martenson

This comment has been minimized.

Copy link
Member

commented Apr 25, 2016

to properly solve this we need to merge 16.04 into dev (which is given) but we also probably want to port this to the 16.04 in order for the functionality to be tested?

@jmchilton

This comment has been minimized.

Copy link
Member Author

commented Apr 25, 2016

Thanks for merging. For future reference though - this was a violation of our procedures. I don't care, I'm glad it was merged, so I hesitate even bringing it up but the rules explicitly say:

Pull requests marked [WIP](i.e. work in progress) in the title by the author(s), or tagged WIP via GitHub tags, may not be merged without coordinating the removal of that tag with the pull request author(s), and completing the removal of that tag from wherever it is present in the open pull request.

@guerler

This comment has been minimized.

Copy link
Contributor

commented Apr 26, 2016

Ok will make sure next time. Thanks again for the test cases. I had read too much out of: I turned https://github.com/galaxyproject/galaxy/issues/2224 into a minimal example and test cases and verified it broke in 16.04. Any interest in taking over from here?

@guerler guerler removed the status/WIP label Apr 26, 2016

@dannon

This comment has been minimized.

Copy link
Member

commented Apr 26, 2016

Just out of curiosity, looking at the history of this issue, I see @galaxybot actually added the WIP label. Is that something automated now? What are the criteria?

@martenson

This comment has been minimized.

Copy link
Member

commented Apr 27, 2016

It does add the label if there is [WIP] in the title. Rules are at p4 repo.

On Tue, Apr 26, 2016, 18:58 Dannon Baker notifications@github.com wrote:

Just out of curiosity, looking at the history of this issue, I see
@galaxybot https://github.com/galaxybot actually added the WIP label.
Is that something automated now? What are the criteria?


You are receiving this because you commented.

Reply to this email directly or view it on GitHub
#2233 (comment)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.