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

[17.09] Fix the PJA type issue when mapping renames over nested lists. #5414

Merged
merged 1 commit into from Jan 31, 2018

Conversation

Projects
None yet
4 participants
@jmchilton
Copy link
Member

jmchilton commented Jan 30, 2018

No description provided.

@galaxybot galaxybot added the triage label Jan 30, 2018

# Either a HDCA or a DCE - only HDCA has a name.
has_collection = input_assoc.dataset_collection
if hasattr(has_collection, "name"):
replacement = has_collection.name

This comment has been minimized.

Copy link
@nsoranzo

nsoranzo Jan 30, 2018

Member

I'd write it as:

                    if input_assoc.name == input_file_var:
                        # Either a HDCA or a DCE - only HDCA has a name.
                        has_collection = input_assoc.dataset_collection
                        if has_collection and hasattr(has_collection, "name"):
                            replacement = has_collection.name

This comment has been minimized.

Copy link
@jmchilton

jmchilton Jan 30, 2018

Author Member

Yes - a lot better - I missed the context here thanks!

@jmchilton jmchilton force-pushed the jmchilton:skip_invalid_pja branch from 65c15ca to 9fcac13 Jan 30, 2018

@nsoranzo nsoranzo added this to the 18.01 milestone Jan 30, 2018

@mvdbeek mvdbeek merged commit 8e5d2d3 into galaxyproject:release_17.09 Jan 31, 2018

6 checks passed

api test Build finished. 295 tests run, 4 skipped, 0 failed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished. 295 tests run, 4 skipped, 0 failed.
Details
integration test Build finished. 46 tests run, 0 skipped, 0 failed.
Details
selenium test Build finished. No test results found.
Details
toolshed test Build finished. 579 tests run, 0 skipped, 0 failed.
Details
@mvdbeek

This comment has been minimized.

Copy link
Member

mvdbeek commented Jan 31, 2018

Thanks @jmchilton !

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.