TEST: Merge pull request #6442 from matthew-brett/dynamic-tkagg#6474
Closed
efiring wants to merge 1 commit into
matplotlib:v1.5.xmatplotlib/matplotlib:v1.5.xfrom
efiring:backport_tk_to_v1.5.xefiring/matplotlib:backport_tk_to_v1.5.xCopy head branch name to clipboard
Closed
TEST: Merge pull request #6442 from matthew-brett/dynamic-tkagg#6474efiring wants to merge 1 commit intomatplotlib:v1.5.xmatplotlib/matplotlib:v1.5.xfrom efiring:backport_tk_to_v1.5.xefiring/matplotlib:backport_tk_to_v1.5.xCopy head branch name to clipboard
efiring wants to merge 1 commit into
matplotlib:v1.5.xmatplotlib/matplotlib:v1.5.xfrom
efiring:backport_tk_to_v1.5.xefiring/matplotlib:backport_tk_to_v1.5.xCopy head branch name to clipboard
Conversation
MRG: loading TCL / Tk symbols dynamically cherry-pick of commit f3e5576 Conflicts resolved: .travis.yml appveyor.yml setupext.py
Member
Author
|
I am testing this backport of #6442 via this PR so that all the checks will be run on it. If it works, I can push it directly. |
Contributor
|
OSX builds from this branch passing here. |
Contributor
|
Download OSX wheels from this branch for testing: Python 2.7, Python 3.4 Python 3.5 |
Member
Author
|
I fixed the backport by removing appveyor.yml, and pushed b80e0f1 to v1.5.x. Closing. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
MRG: loading TCL / Tk symbols dynamically
cherry-pick of commit f3e5576
Conflicts resolved:
.travis.yml
appveyor.yml
setupext.py