From 292fb8683ab789c86b9db88a02b719f01f7e07c2 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Mon, 6 Aug 2018 21:33:20 -0400 Subject: [PATCH 1/3] Merge pull request #11533 from tacaswell/update_for_py37 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) --- .travis.yml | 4 +- doc/devel/testing.rst | 6 +- .../test_tightlayout/tight_layout4.svg | 456 +++++++++--------- setup.py | 1 + 4 files changed, 238 insertions(+), 229 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6539edac2fe1..6435c9d5c326 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: python -dist: trusty +dist: xenial sudo: false branches: @@ -87,6 +87,8 @@ matrix: env: PYTHON_ARGS=-OO - python: 3.6 env: DELETE_FONT_CACHE=1 PANDAS='pandas<0.21.0' PYTEST_PEP8=pytest-pep8 RUN_PEP8=--pep8 + - python: 3.7 + sudo: true - python: "nightly" env: PRE=--pre - os: osx diff --git a/doc/devel/testing.rst b/doc/devel/testing.rst index aafa5bd0b859..c27f1adc4078 100644 --- a/doc/devel/testing.rst +++ b/doc/devel/testing.rst @@ -264,10 +264,10 @@ Using tox `Tox `_ 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 altogether (e.g., CPython, PyPy, Jython, etc.) -Testing all versions of Python (2.6, 2.7, 3.*) requires +Testing all versions of Python (3.5, 3.6, ...) requires having multiple versions of Python installed on your system and on the PATH. Depending on your operating system, you may want to use your package manager (such as apt-get, yum or MacPorts) to do this. @@ -284,7 +284,7 @@ You can also run tox on a subset of environments: .. code-block:: bash - $ tox -e py26,py27 + $ tox -e py36,py37 Tox processes everything serially so it can take a long time to test several environments. To speed it up, you might try using a new, diff --git a/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout4.svg b/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout4.svg index e19b6b53d590..de5e5efd5a1a 100644 --- a/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout4.svg +++ b/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout4.svg @@ -1,7 +1,7 @@ - + - - - + + + - + - + @@ -146,24 +148,24 @@ Q 35.15625 39.890625 26.703125 39.890625 Q 22.75 39.890625 18.8125 39.015625 Q 14.890625 38.140625 10.796875 36.28125 z -" id="DejaVuSans-35"/> +" id="DejaVuSans-53"/> - - - + + + - + - + @@ -181,12 +183,12 @@ L 54.390625 8.296875 L 54.390625 0 L 12.40625 0 z -" id="DejaVuSans-31"/> +" id="DejaVuSans-49"/> - - - + + + @@ -206,19 +208,19 @@ L 15.28125 54.6875 L 29.78125 35.203125 L 44.28125 54.6875 z -" id="DejaVuSans-78"/> +" id="DejaVuSans-120"/> +" id="DejaVuSans-45"/> +" id="DejaVuSans-108"/> +z +" id="DejaVuSans-97"/> +" id="DejaVuSans-98"/> +" id="DejaVuSans-101"/> - - - - - - - - + + + + + + + + @@ -315,60 +320,60 @@ z +" id="m556f96d829" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m27e32ca04a" style="stroke:#000000;stroke-width:0.5;"/> - + - - - + + + - + - + - - - + + + - + - + @@ -396,12 +401,13 @@ Q 53.21875 48.921875 51.53125 44.890625 Q 49.859375 40.875 45.40625 35.40625 Q 44.1875 33.984375 37.640625 27.21875 Q 31.109375 20.453125 19.1875 8.296875 -" id="DejaVuSans-32"/> +z +" id="DejaVuSans-50"/> - - - + + + @@ -423,16 +429,16 @@ L 29.59375 11.921875 L 46.6875 54.6875 L 56.203125 54.6875 z -" id="DejaVuSans-79"/> +" id="DejaVuSans-121"/> - - - - - - - + + + + + + + @@ -448,7 +454,7 @@ L 25.59375 0 L 25.59375 64.59375 L -0.296875 64.59375 z -" id="DejaVuSans-54"/> +" id="DejaVuSans-84"/> +" id="DejaVuSans-105"/> +" id="DejaVuSans-116"/> - - - - - + + + + + @@ -500,7 +506,7 @@ z " style="fill:#ffffff;"/> - @@ -528,73 +534,73 @@ L 553.463437 26.8475 - + - + - - - + + + - + - + - - - + + + - + - + - - - + + + - - - - - - - + + + + + + + @@ -602,84 +608,84 @@ L 553.463437 26.8475 - + - + - - - + + + - + - + - - - + + + - + - + - - - + + + - - - - - - - + + + + + + + - - - - - + + + + + @@ -693,7 +699,7 @@ z " style="fill:#ffffff;"/> - @@ -721,73 +727,73 @@ L 365.783437 166.5275 - + - + - - - + + + - + - + - - - + + + - + - + - - - + + + - - - - - - - + + + + + + + @@ -795,84 +801,84 @@ L 365.783437 166.5275 - + - + - - - + + + - + - + - - - + + + - + - + - - - + + + - - - - - - - + + + + + + + - - - - - + + + + + @@ -886,7 +892,7 @@ z " style="fill:#ffffff;"/> - @@ -914,73 +920,73 @@ L 553.463437 166.5275 - + - + - - - + + + - + - + - - - + + + - + - + - - - + + + - - - - - - - + + + + + + + @@ -988,99 +994,99 @@ L 553.463437 166.5275 - + - + - - - + + + - + - + - - - + + + - + - + - - - + + + - - - - - - - + + + + + + + - - - - - + + + + + - + - + - + - + diff --git a/setup.py b/setup.py index e6e4b4dac2da..430b333c31d5 100644 --- a/setup.py +++ b/setup.py @@ -110,6 +110,7 @@ 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', 'Topic :: Scientific/Engineering :: Visualization', ] From 4f45346202bf5004aca8dd8751aeebeb6af16c8b Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Mon, 6 Aug 2018 23:35:26 -0400 Subject: [PATCH 2/3] TST: tweak an svg file --- .../tests/baseline_images/test_axes/contour_colorbar.svg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/matplotlib/tests/baseline_images/test_axes/contour_colorbar.svg b/lib/matplotlib/tests/baseline_images/test_axes/contour_colorbar.svg index def44e917861..0a39e4cf487b 100644 --- a/lib/matplotlib/tests/baseline_images/test_axes/contour_colorbar.svg +++ b/lib/matplotlib/tests/baseline_images/test_axes/contour_colorbar.svg @@ -17790,7 +17790,7 @@ Q 31.109375 20.453125 19.1875 8.296875 z " id="DejaVuSans-32"/> - + @@ -17824,7 +17824,7 @@ L 12.40625 0 z " id="DejaVuSans-31"/> - + From 291041b72afc8d46d69c663de76af124cd3e3f64 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Wed, 8 Aug 2018 14:49:36 -0400 Subject: [PATCH 3/3] DOC: put py27 back into the docs --- doc/devel/testing.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/devel/testing.rst b/doc/devel/testing.rst index c27f1adc4078..8334a132a74a 100644 --- a/doc/devel/testing.rst +++ b/doc/devel/testing.rst @@ -264,10 +264,10 @@ Using tox `Tox `_ is a tool for running tests against multiple Python environments, including multiple versions of Python -(e.g., 3.5, 3.6) and even different Python implementations +(e.g., 2.7, 3.5, 3.6) and even different Python implementations altogether (e.g., CPython, PyPy, Jython, etc.) -Testing all versions of Python (3.5, 3.6, ...) requires +Testing all versions of Python (2.7, 3.6, 3.7, ...) requires having multiple versions of Python installed on your system and on the PATH. Depending on your operating system, you may want to use your package manager (such as apt-get, yum or MacPorts) to do this. @@ -284,7 +284,7 @@ You can also run tox on a subset of environments: .. code-block:: bash - $ tox -e py36,py37 + $ tox -e py27,py36,py37 Tox processes everything serially so it can take a long time to test several environments. To speed it up, you might try using a new,