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

Relax python six dependency to allow 1.15. #7538

Merged
merged 1 commit into from Aug 13, 2020

Conversation

realzhtw
Copy link
Contributor

@realzhtw realzhtw commented Aug 11, 2020

Changelog: Fix: Relax python six dependency to allow 1.15.
Docs: omit

(Second attempt.)
The diff between six-1.14.0 and six-1.15.0 only changes the order of the checks isinstance(x, text_type) and isinstance(x, binary_type) in functions ensure_binary and ensure_string.

Since text_type and binary_type are disjoint types this can't affect any logic.
None of the two functions is used by conan right now.

@CLAassistant
Copy link

CLAassistant commented Aug 11, 2020

CLA assistant check
All committers have signed the CLA.

@jgsogo
Copy link
Member

jgsogo commented Aug 11, 2020

Hi, @realzhtw .

It says "Aleksej Lebedev seems not to be a GitHub user", I think your commits are associated with an email that is not the same as the one you use for your Github account (it is not even an email from a Github user account). You can run git config --list to see all the configuration you are using locally.

Another alternative would be to use the Github interface to make the change, it will create a branch in your repo and submit the PR (link to edit)

@realzhtw
Copy link
Contributor Author

realzhtw commented Aug 12, 2020

Indeed. I fixed the email. Thank you.

@jgsogo jgsogo added this to the 1.29 milestone Aug 12, 2020
jgsogo
jgsogo approved these changes Aug 12, 2020
@memsharded memsharded merged commit 8ab46a8 into conan-io:develop Aug 13, 2020
2 checks passed
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.

None yet

5 participants