From 09ce51d490ef7c218e666902502324e5c754e9d6 Mon Sep 17 00:00:00 2001 From: Jody Klymak Date: Mon, 3 Dec 2018 13:03:31 -0800 Subject: [PATCH 1/5] MNT: remove py 3.5 from testing --- .appveyor.yml | 3 --- .circleci/config.yml | 34 ------------------------- .travis.yml | 6 +---- INSTALL.rst | 2 +- azure-pipelines.yml | 2 -- requirements/testing/travis36minver.txt | 6 +++++ 6 files changed, 8 insertions(+), 45 deletions(-) create mode 100644 requirements/testing/travis36minver.txt diff --git a/.appveyor.yml b/.appveyor.yml index 2a8f44ab043f..50f752a2e47d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -21,9 +21,6 @@ environment: # theoretically the CONDA_INSTALL_LOCN could be only two: one for 32bit, # one for 64bit because we construct envs anyway. But using one for the # right python version is hopefully making it fast due to package caching. - - PYTHON_VERSION: "3.5" - CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64" - TEST_ALL: "no" - PYTHON_VERSION: "3.6" CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64" TEST_ALL: "no" diff --git a/.circleci/config.yml b/.circleci/config.yml index d7c959ae0bde..8a298918679a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -121,39 +121,6 @@ jobs: name: "Deploy new docs" command: ./.circleci/deploy-docs.sh - docs-python35: - docker: - - image: circleci/python:3.5 - steps: - - checkout - - - run: *apt-install - - run: *fonts-install - - run: *pip-install - - - run: - <<: *deps-install - environment: - NUMPY_VERSION: "==1.11.0" - - run: *mpl-install - - - run: *doc-build - - # We don't build the LaTeX docs here, so linkchecker will complain - - run: touch doc/build/html/Matplotlib.pdf - - - run: *doc-bundle - - store_artifacts: - path: doc/build/sphinx-gallery-files.tar.gz - - - store_artifacts: - path: doc/build/html - - - run: - name: "Built documentation is available at:" - command: echo "${CIRCLE_BUILD_URL}/artifacts/${CIRCLE_NODE_INDEX}/${CIRCLE_WORKING_DIRECTORY/#\~/$HOME}/doc/build/html/index.html" - - ######################################### # Defining workflows gets us parallelism. # @@ -162,5 +129,4 @@ workflows: version: 2 build: jobs: - - docs-python35 - docs-python36 diff --git a/.travis.yml b/.travis.yml index c3a8c2114552..40609e31d86a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,13 +75,9 @@ matrix: - RUN_PYTEST= - RUN_FLAKE8=1 - EXTRAREQS='-r requirements/testing/travis_flake8.txt' - - python: 3.5 - dist: trusty - # pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124. - env: - - PINNEDVERS='-c requirements/testing/travis35.txt' - python: 3.6 env: + - PINNEDVERS='-c requirements/testing/travis36minver.txt' - DELETE_FONT_CACHE=1 - EXTRAREQS='-r requirements/testing/travis36.txt' - python: 3.7 diff --git a/INSTALL.rst b/INSTALL.rst index 358363bdde79..b8d940971513 100644 --- a/INSTALL.rst +++ b/INSTALL.rst @@ -133,7 +133,7 @@ Dependencies Matplotlib requires the following dependencies: -* `Python `_ (>= 3.5) +* `Python `_ (>= 3.6) * `FreeType `_ (>= 2.3) * `libpng `_ (>= 1.2) * `NumPy `_ (>= 1.11) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0f1b59707c22..b3ae38c8a57d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,8 +10,6 @@ jobs: vmImage: 'Ubuntu 16.04' strategy: matrix: - Python35: - python.version: '3.5' Python36: python.version: '3.6' Python37: diff --git a/requirements/testing/travis36minver.txt b/requirements/testing/travis36minver.txt new file mode 100644 index 000000000000..7e2f6208e9d3 --- /dev/null +++ b/requirements/testing/travis36minver.txt @@ -0,0 +1,6 @@ +# Extra pip requirements for the first travis python 3.6 build + +cycler==0.10 +python-dateutil==2.1 +numpy==1.11.0 +pyparsing==2.0.1 From b045ff2e5a9ba8af652457ea83f89ae201ffaf50 Mon Sep 17 00:00:00 2001 From: Jody Klymak Date: Tue, 4 Dec 2018 10:30:14 -0800 Subject: [PATCH 2/5] MNT: add circleci37 --- .circleci/config.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8a298918679a..a1d3f4f76178 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -94,6 +94,34 @@ jobs: steps: - checkout + - run: *apt-install + - run: *fonts-install + - run: *pip-install + - run: + <<: *deps-install + environment: + NUMPY_VERSION: "==1.11.0" + - run: *mpl-install + + - run: *doc-build + + - run: *doc-bundle + - store_artifacts: + path: doc/build/sphinx-gallery-files.tar.gz + + - store_artifacts: + path: doc/build/html + + - run: + name: "Built documentation is available at:" + command: echo "${CIRCLE_BUILD_URL}/artifacts/${CIRCLE_NODE_INDEX}/${CIRCLE_WORKING_DIRECTORY/#\~/$HOME}/doc/build/html/index.html" + + docs-python37: + docker: + - image: circleci/python:3.7 + steps: + - checkout + - run: *apt-install - run: *fonts-install - run: *pip-install From 6a6f41418595253535f985647b294170d7cfedfd Mon Sep 17 00:00:00 2001 From: Jody Klymak Date: Tue, 4 Dec 2018 11:30:15 -0800 Subject: [PATCH 3/5] MNT: remove trvis35.txt --- requirements/testing/travis35.txt | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 requirements/testing/travis35.txt diff --git a/requirements/testing/travis35.txt b/requirements/testing/travis35.txt deleted file mode 100644 index 9f32b5d9c754..000000000000 --- a/requirements/testing/travis35.txt +++ /dev/null @@ -1,12 +0,0 @@ -# Extra pip requirements for the first travis python 3.5 build - -cycler==0.10 -python-dateutil==2.1 -numpy==1.11 -pandas<0.21.0 -pyparsing==2.0.1 -pytest==3.6 -pytest-cov==2.3.1 -pytest-timeout==1.2.1 # Newer pytest-timeouts don't support pytest 3.4. -pytest-rerunfailures<5 # newer versions require pytest3.6 -sphinx==1.3 From 2bb34e591cb3ec5e041c6daa3359c023d00f5d1e Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Tue, 4 Dec 2018 14:49:03 -0500 Subject: [PATCH 4/5] Update config.yml --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index a1d3f4f76178..2ced5f47cf57 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -158,3 +158,4 @@ workflows: build: jobs: - docs-python36 + - docs-python37 From 85eef1938863e7b90507874358e296406e03bae9 Mon Sep 17 00:00:00 2001 From: Jody Klymak Date: Tue, 4 Dec 2018 13:53:01 -0800 Subject: [PATCH 5/5] MNT: fix test version check --- lib/matplotlib/tests/test_animation.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/matplotlib/tests/test_animation.py b/lib/matplotlib/tests/test_animation.py index a0cb521885fa..a99c673fa1d2 100644 --- a/lib/matplotlib/tests/test_animation.py +++ b/lib/matplotlib/tests/test_animation.py @@ -4,6 +4,7 @@ import sys import numpy as np +from pathlib import Path import pytest import matplotlib as mpl @@ -123,10 +124,8 @@ def isAvailable(cls): ('html', 'movie.html'), ('null', 'movie.null') ] -if sys.version_info >= (3, 6): - from pathlib import Path - WRITER_OUTPUT += [ - (writer, Path(output)) for writer, output in WRITER_OUTPUT] +WRITER_OUTPUT += [ + (writer, Path(output)) for writer, output in WRITER_OUTPUT] # Smoke test for saving animations. In the future, we should probably