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

Bump vendored six to 1.11.0 #1602

Merged
merged 1 commit into from
Oct 22, 2018
Merged

Bump vendored six to 1.11.0 #1602

merged 1 commit into from
Oct 22, 2018

Conversation

jeffwidman
Copy link
Collaborator

@jeffwidman jeffwidman commented Oct 22, 2018

Bump six to 1.11.0. Most changes do not affect us, but it's good to
stay up to date. Also, we will likely start vendoring enum34 in which
case benjaminp/six#178 is needed.

Note that this preserves the kafka-python customization from #979
which has been submitted upstream as benjaminp/six#176 but not yet merged.


This change is Reviewable

Bump `six` to `1.11.0`. Most changes do not affect us, but it's good to
stay up to date. Also, we will likely start vendoring `enum34` in which
case benjaminp/six#178 is needed.

Note that this preserves the `kafka-python` customization from #979
which has been submitted upstream as benjaminp/six#176 but not yet merged.
@jeffwidman jeffwidman merged commit 477ab74 into master Oct 22, 2018
@jeffwidman jeffwidman deleted the bump-vendored-six-to-1.11.0 branch October 22, 2018 15:36
# Don't del it here, cause with gc disabled this "leaks" to garbage
# Don't del it here, cause with gc disabled this "leaks" to garbage.
# Note: This is a kafka-python customization, details at:
# https://github.com/dpkp/kafka-python/pull/979#discussion_r100403389
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fwiw -- if upstream doesn't want to merge this change, I don't think we should keep it.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed. I left a comment on the upstream PR to bump it so we'll see what happens...

@dpkp
Copy link
Owner

dpkp commented Oct 23, 2018

to the future!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants