Merge pull request #12538 from jklymak/mnt-drop35-travis

tacaswell · web-flow · commit e2045c3dff46 · 2018-12-05T10:31:34.000-05:00
API: drop 3.5 testing for 3.1 branch
diff --git 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
@@ -97,8 +97,10 @@ jobs:
       - run: *apt-install
       - run: *fonts-install
       - run: *pip-install
-
-      - run: *deps-install
+      - run:
+           <<: *deps-install
+           environment:
+             NUMPY_VERSION: "==1.11.0"
       - run: *mpl-install
 
       - run: *doc-build
@@ -114,34 +116,21 @@ jobs:
           name: "Built documentation is available at:"
           command: echo "${CIRCLE_BUILD_URL}/artifacts/${CIRCLE_NODE_INDEX}/${CIRCLE_WORKING_DIRECTORY/#\~/$HOME}/doc/build/html/index.html"
 
-      - add_ssh_keys:
-          fingerprints:
-            - "78:13:59:08:61:a9:e5:09:af:df:3a:d8:89:c2:84:c0"
-      - deploy:
-          name: "Deploy new docs"
-          command: ./.circleci/deploy-docs.sh
-
-  docs-python35:
+  docs-python37:
     docker:
-      - image: circleci/python:3.5
+      - image: circleci/python:3.7
     steps:
       - checkout
 
       - run: *apt-install
       - run: *fonts-install
       - run: *pip-install
 
-      - run:
-          <<: *deps-install
-          environment:
-            NUMPY_VERSION: "==1.11.0"
+      - run: *deps-install
       - 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
@@ -153,6 +142,12 @@ jobs:
           name: "Built documentation is available at:"
           command: echo "${CIRCLE_BUILD_URL}/artifacts/${CIRCLE_NODE_INDEX}/${CIRCLE_WORKING_DIRECTORY/#\~/$HOME}/doc/build/html/index.html"
 
+      - add_ssh_keys:
+          fingerprints:
+            - "78:13:59:08:61:a9:e5:09:af:df:3a:d8:89:c2:84:c0"
+      - deploy:
+          name: "Deploy new docs"
+          command: ./.circleci/deploy-docs.sh
 
 #########################################
 # Defining workflows gets us parallelism.
@@ -162,5 +157,5 @@ workflows:
   version: 2
   build:
     jobs:
-      - docs-python35
       - docs-python36
+      - docs-python37
diff --git 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
@@ -133,7 +133,7 @@ Dependencies
 
 Matplotlib requires the following dependencies:
 
-* `Python <https://www.python.org/downloads/>`_ (>= 3.5)
+* `Python <https://www.python.org/downloads/>`_ (>= 3.6)
 * `FreeType <https://www.freetype.org/>`_ (>= 2.3)
 * `libpng <http://www.libpng.org>`_ (>= 1.2)
 * `NumPy <http://www.numpy.org>`_ (>= 1.11)
diff --git 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/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
diff --git a/requirements/testing/travis35.txt b/requirements/testing/travis35.txt
diff --git a/requirements/testing/travis36minver.txt 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
