Merge pull request #11533 from tacaswell/update_for_py37 #11817
Merged
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
MNT: updates for python 3.7
Conflicts:
.travis.yml
- mostly keep 2.2.x version, but add py37 section
INSTALL.rst
- kept v2.2.x wording
lib/matplotlib/tests/test_figure.py
- removed non-existent on 2.2.x test (feature tested
is only on master)
dopplershift
previously approved these changes
Aug 7, 2018
|
Why is nothing easy.... |
|
This is a super filtered diff, but change in the 6th digit of a translation which are part of a letter. 23:26 $ diff -u result_images/test_axes/contour_colorbar-expected.svg result_images/test_axes/contour_colorbar.svg | grep -v url | grep -v clipPath | grep ^[+-]
--- result_images/test_axes/contour_colorbar-expected.svg 2018-08-06 23:12:14.668132987 -0400
+++ result_images/test_axes/contour_colorbar.svg 2018-08-06 23:12:14.668132987 -0400
- <g transform="translate(107.794688 401.918125)scale(0.12 -0.12)">
+ <g transform="translate(107.794687 401.918125)scale(0.12 -0.12)">
- <g transform="translate(152.434688 401.918125)scale(0.12 -0.12)">
+ <g transform="translate(152.434687 401.918125)scale(0.12 -0.12)">
Pushed the minimal change, lets see if that passes.... |
dstansby
reviewed
Aug 7, 2018
doc/devel/testing.rst
Outdated
| @@ -264,10 +264,10 @@ Using tox | |||
| `Tox <https://tox.readthedocs.io/en/latest/>`_ is a tool for running | |||
| tests against | |||
| multiple Python environments, including multiple versions of Python | |||
| (e.g., 2.7, 3.4, 3.5) and even different Python implementations | |||
| (e.g., 3.5, 3.6) and even different Python implementations | |||
There was a problem hiding this comment.
The 2.2.x series still supports python 2, so I that maybe these bits should still have 2.7 in them.
There was a problem hiding this comment.
I looked at this when I did the backport, decided it was just prose to illustrate what 'multiple versions of python' meant and left it (because I was feeling lazy.....)
2e2f8db to
291041b
Compare
dopplershift
approved these changes
Aug 8, 2018
dstansby
approved these changes
Aug 8, 2018
|
ok, 2 approvals and CI passed, so self-merging. |
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.
MNT: updates for python 3.7
Conflicts:
.travis.yml
- mostly keep 2.2.x version, but add py37 section
INSTALL.rst
- kept v2.2.x wording
lib/matplotlib/tests/test_figure.py
- removed non-existent on 2.2.x test (feature tested
is only on master)
Intend to self-merge when CI passes. 🤞