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

Options for multiple paths #997

Merged
merged 7 commits into from Dec 1, 2016

Conversation

Projects
None yet
3 participants
@mrksr
Contributor

mrksr commented Nov 30, 2016

This implements issue #995. I have not yet tested the PR with python 2.
I'm very interested in your thoughts concerning coding style, since I have tried to follow your lead.

for pathspec in pathspecs:
if pathspec not in parse:
parse[pathspec] = {}
cls._update_options(parse[pathspec], options)

This comment has been minimized.

@jlstevens

jlstevens Nov 30, 2016

Member

Perhaps something like:

parse[pathspec] = merged_options(parse.get(pathspec, {}), options)

would be nicer?

@classmethod
def _update_options(cls, old_opts, new_opts):

This comment has been minimized.

@jlstevens

jlstevens Nov 30, 2016

Member

As a last comment, maybe this should be called _merge_options as it now creates a new dictionary instead of updating an existing one?

@jlstevens

This comment has been minimized.

Member

jlstevens commented Nov 30, 2016

Looks great, thanks for the contribution and thanks for all the new unit tests!

You have already addressed most of my comments and I am ready to merge once you address my latest suggestion (renaming _update_options). The tests are passing so I think it looks good to go!

@mrksr

This comment has been minimized.

Contributor

mrksr commented Nov 30, 2016

Will do. Thank you for your guidance :-)

@mrksr

This comment has been minimized.

Contributor

mrksr commented Dec 1, 2016

Rename should be done now and I added one more test to reflect our decision on precedence in merges.

I had to replace the commits with new author information which includes my private mail, so do not be confused that everything is new.

@jlstevens

This comment has been minimized.

Member

jlstevens commented Dec 1, 2016

All looks good so I am now merging. Thanks once again for contributing!

@jlstevens jlstevens merged commit 69406c5 into ioam:master Dec 1, 2016

2 of 3 checks passed

s3-reference-data-cache Tests still building.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage increased (+0.02%) to 75.794%
Details

@philippjfr philippjfr added this to the v1.7.0 milestone Dec 7, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment