revert vendoring of six #6556
Merged
revert vendoring of six #6556
Conversation
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
This reverts commit 8fe495a. Go back to using external six, to fix bug at matplotlib#6537. Also - update six required version to 1.10 Conflicts: lib/matplotlib/artist.py lib/matplotlib/axes/_base.py lib/matplotlib/backend_tools.py lib/matplotlib/backends/backend_mixed.py lib/matplotlib/backends/backend_pdf.py lib/matplotlib/backends/backend_svg.py lib/matplotlib/colors.py lib/matplotlib/dates.py lib/matplotlib/font_manager.py lib/matplotlib/legend_handler.py lib/matplotlib/tests/test_artist.py lib/matplotlib/tests/test_axes.py lib/matplotlib/tests/test_backend_qt5.py lib/matplotlib/tests/test_dviread.py lib/matplotlib/tests/test_image.py lib/matplotlib/tests/test_lines.py lib/matplotlib/tests/test_spines.py lib/matplotlib/textpath.py lib/mpl_toolkits/axes_grid/colorbar.py lib/mpl_toolkits/axes_grid1/anchored_artists.py lib/mpl_toolkits/axes_grid1/inset_locator.py
References remaining after reverting original change.
757177f to
06b71fb
Compare
|
I was planning to backport the merge commit once it was in, but this is easier. |
This was referenced Jun 13, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Backport of #6545
This reverts commit 8fe495a.
Go back to using external six, to fix bug at #6537.
Also - update six required version to 1.10