matplotlib · jklymak · Feb 28, 2018 · Feb 28, 2018 · Feb 28, 2018 · Feb 28, 2018
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -19,9 +19,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: "2.7"
-      CONDA_INSTALL_LOCN: "C:\\Miniconda-x64"
-      TEST_ALL: "no"
     - PYTHON_VERSION: "3.5"
       CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64"
       TEST_ALL: "no"
@@ -62,7 +59,7 @@ install:
   #
   - conda create -q -n test-environment python=%PYTHON_VERSION%
     msinttypes freetype=2.6 "libpng>=1.6.21,<1.7" zlib=1.2 tk=8.5
-    pip setuptools numpy mock pandas sphinx tornado
+    pip setuptools numpy pandas sphinx tornado
   - activate test-environment
   - echo %PYTHON_VERSION% %TARGET_ARCH%
   # pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -82,9 +82,9 @@ doc-bundle-run: &doc-bundle
 #
 
 jobs:
-  docs-python35:
+  docs-python36:
     docker:
-      - image: circleci/python:3.5
+      - image: circleci/python:3.6
     steps:
       - checkout
 
@@ -115,9 +115,9 @@ jobs:
           name: "Deploy new docs"
           command: ./.circleci/deploy-docs.sh
 
-  docs-python27:
+  docs-python35:
     docker:
-      - image: circleci/python:2.7
+      - image: circleci/python:3.5
     steps:
       - checkout
 
@@ -128,23 +128,14 @@ jobs:
       - run:
           <<: *deps-install
           environment:
-            NUMPY_VERSION: "==1.7.1"
-      # Linkchecker only works with python 2.7 for the time being.
-      # Linkchecker is currently broken with requests 2.10.0 so force an earlier version.
-      - run: pip install --user $PRE requests==2.9.2 linkchecker
+            NUMPY_VERSION: "==1.10.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
 
-      # Linkchecker only works with python 2.7 for the time being
-      - run:
-          name: linkchecker
-          command: ~/.local/bin/linkchecker build/html/index.html
-          working_directory: doc
-
       - run: *doc-bundle
       - store_artifacts:
           path: doc/build/sphinx-gallery-files.tar.gz
@@ -166,4 +157,4 @@ workflows:
   build:
     jobs:
       - docs-python35
-      - docs-python27
+      - docs-python36
diff --git a/.gitignore b/.gitignore
@@ -80,6 +80,7 @@ result_images
 
 # Nose/Pytest generated files #
 ###############################
+.pytest_cache/
 .cache/
 .coverage
 .coverage.*

diff --git a/.travis.yml b/.travis.yml
@@ -37,6 +37,7 @@ addons:
       - texlive-latex-extra
       - texlive-latex-recommended
       - texlive-xetex
+      - texlive-luatex
 
 env:
   global:
@@ -47,7 +48,6 @@ env:
     - secure: "dfjNqGKzQG5bu3FnDNwLG8H/C4QoieFo4PfFmZPdM2RY7WIzukwKFNT6kiDfOrpwt+2bR7FhzjOGlDECGtlGOtYPN8XuXGjhcP4a4IfakdbDfF+D3NPIpf5VlE6776k0VpvcZBTMYJKNFIMc7QPkOwjvNJ2aXyfe3hBuGlKJzQU="
     - CYCLER=cycler
     - DATEUTIL=python-dateutil
-    - MOCK=
     - NOSE=
     - NUMPY=numpy
     - PANDAS=
@@ -65,29 +65,26 @@ env:
 
 matrix:
   include:
-    - python: 2.7
+    - python: 3.5
       # pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124.
       env:
         - CYCLER=cycler==0.10
         - DATEUTIL=python-dateutil==2.1
-        - MOCK=mock
         - NOSE=nose
-        - NUMPY=numpy==1.7.1
+        - NUMPY=numpy==1.10.0
         - PANDAS='pandas<0.21.0'
         - PYPARSING=pyparsing==2.0.1
         - PYTEST=pytest==3.1.0
         - PYTEST_COV=pytest-cov==2.3.1
         - SPHINX=sphinx==1.3
-    - python: 3.4
+    - python: 3.5
       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: "nightly"
       env: PRE=--pre
     - os: osx
-      osx_image: xcode7.3
       language: generic  # https://github.com/travis-ci/travis-ci/issues/2312
-      env: MOCK=mock
       only: master
       cache:
         # As for now travis caches only "$HOME/.cache/pip"
@@ -109,61 +106,62 @@ before_install:
       export PATH=$PATH:/tmp/λ
       export PATH=/usr/lib/ccache:$PATH
     else
-      brew update
-      brew tap homebrew/gui
-      brew install python libpng ffmpeg imagemagick mplayer ccache
+      ci/travis/silence brew update
+      brew upgrade python
+      brew install ffmpeg imagemagick mplayer ccache
+      hash -r
+      which python
+      python --version
       # We could install ghostscript and inkscape here to test svg and pdf
       # but this makes the test time really long.
       # brew install ghostscript inkscape
-      export PATH=/usr/local/opt/ccache/libexec:$PATH
+      export PATH=/usr/local/opt/python/libexec/bin:/usr/local/opt/ccache/libexec:$PATH
     fi
 
 install:
-  # Upgrade pip and setuptools. Mock has issues with the default version of
-  # setuptools
   - |
-    # Setup environment
+    # Setup environment.
     ccache -s
     git describe
-    # Upgrade pip and setuptools and wheel to get as clean an install as possible
-    pip install --upgrade pip setuptools wheel
+    # Upgrade pip and setuptools and wheel to get as clean an install as possible.
+    python -mpip install --upgrade pip setuptools wheel
   - |
-    # Install dependencies from PyPI
-    pip install --upgrade $PRE \
+    # Install dependencies from PyPI.
+    python -mpip install --upgrade $PRE \
         codecov \
         coverage \
         $CYCLER \
-        $MOCK \
+        $DATEUTIL \
         $NOSE \
         $NUMPY \
         $PANDAS \
         codecov \
         coverage \
         pillow \
         $PYPARSING \
-        $DATEUTIL \
-        $SPHINX
+        $SPHINX \
+        tornado
     # GUI toolkits are pip-installable only for some versions of Python so
     # don't fail if we can't install them.  Make it easier to check whether the
     # install was successful by trying to import the toolkit (sometimes, the
     # install appears to be successful but shared libraries cannot be loaded at
     # runtime, so an actual import is a better check).
-    pip install cairocffi pgi &&
+    python -mpip install cairocffi pgi &&
       python -c 'import pgi as gi; gi.require_version("Gtk", "3.0"); from pgi.repository import Gtk' &&
       echo 'pgi is available' ||
       echo 'pgi is not available'
-    pip install pyqt5==5.9 &&
+    python -mpip install pyqt5==5.9 &&
       python -c 'import PyQt5.QtCore' &&
       echo 'PyQt5 is available' ||
       echo 'PyQt5 is not available'
-    pip install -U --pre \
+    python -mpip install -U \
       --no-index -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-14.04 \
       wxPython &&
       python -c 'import wx' &&
       echo 'wxPython is available' ||
       echo 'wxPython is not available'
 
-    pip install $PRE \
+    python -mpip install $PRE \
         $PYTEST \
         $PYTEST_COV \
         pytest-faulthandler \
@@ -176,7 +174,7 @@ install:
     cp ci/travis/setup.cfg .
   - |
     # Install matplotlib
-    pip install -ve .
+    python -mpip install -ve .
 
 before_script:
   - |

diff --git a/INSTALL.rst b/INSTALL.rst
@@ -32,43 +32,14 @@ Although not required, we suggest also installing ``IPython`` for
 interactive use.  To easily install a complete Scientific Python
 stack, see :ref:`install_scipy_dists` below.
 
-.. _installing_windows:
-
-Windows
--------
-
-In case Python 2.7 or 3.4 are not installed for all users,
-the Microsoft Visual C++ 2008
-(`64 bit <https://www.microsoft.com/en-us/download/details.aspx?id=15336>`__
-or
-`32 bit <https://www.microsoft.com/en-us/download/details.aspx?id=29>`__
-for Python 2.7) or Microsoft Visual C++ 2010
-(`64 bit <https://www.microsoft.com/en-us/download/details.aspx?id=14632>`__
-or
-`32 bit <https://www.microsoft.com/en-us/download/details.aspx?id=5555>`__
-for Python 3.4) redistributable packages need to be installed.
 
 macOS
 -----
 
-If you are using Python 2.7 on a Mac you may need to do::
-
-  xcode-select --install
-
-so that *subprocess32*, a dependency, may be compiled.
-
 To use the native OSX backend you will need :ref:`a framework build
 <osxframework-faq>` build of Python.
 
 
-Linux
------
-
-On extremely old versions of Linux and Python 2.7 you may need to
-install the master version of *subprocess32* (`see comments
-<https://github.com/google/python-subprocess32/issues/12#issuecomment-304724113>`__).
-
-
 Test Data
 ---------
 
@@ -83,9 +54,9 @@ To run the test suite:
  * extract the :file:`lib\\matplotlib\\tests` or
    :file:`lib\\mpl_toolkits\\tests` directories from the source distribution;
  * install test dependencies: `pytest <https://pypi.python.org/pypi/pytest>`_,
-   `mock <https://pypi.python.org/pypi/mock>`_, Pillow, MiKTeX, GhostScript,
-   ffmpeg, avconv, ImageMagick, and `Inkscape <https://inkscape.org/>`_;
- * run ``py.test path\to\tests\directory``.
+   Pillow, MiKTeX, GhostScript, ffmpeg, avconv, ImageMagick, and `Inkscape
+   <https://inkscape.org/>`_;
+ * run ``pytest path\to\tests\directory``.
 
 
 Third-party distributions of Matplotlib
@@ -168,7 +139,7 @@ Dependencies
 
 Matplotlib requires a large number of dependencies:
 
-  * `Python <https://www.python.org/downloads/>`_ (>= 2.7 or >= 3.4)
+  * `Python <https://www.python.org/downloads/>`_ (>= 3.5)
   * `NumPy <http://www.numpy.org>`_ (>= |minimum_numpy_version|)
   * `setuptools <https://setuptools.readthedocs.io/en/latest/>`__
   * `dateutil <https://pypi.python.org/pypi/python-dateutil>`_ (>= 2.1)
@@ -178,10 +149,6 @@ Matplotlib requires a large number of dependencies:
   * FreeType (>= 2.3)
   * `cycler <http://matplotlib.org/cycler/>`__ (>= 0.10.0)
   * `six <https://pypi.python.org/pypi/six>`_
-  * `backports.functools_lru_cache <https://pypi.python.org/pypi/backports.functools_lru_cache>`_
-    (for Python 2.7 only)
-  * `subprocess32 <https://pypi.python.org/pypi/subprocess32/>`_ (for Python
-    2.7 only, on Linux and macOS only)
   * `kiwisolver <https://github.com/nucleic/kiwi>`__ (>= 1.0.0)
 
 Optionally, you can also install a number of packages to enable better user
@@ -192,7 +159,6 @@ optional Matplotlib backends and the capabilities they provide.
   * `PyQt4 <https://pypi.python.org/pypi/PyQt4>`_ (>= 4.4) or
     `PySide <https://pypi.python.org/pypi/PySide>`_: for the Qt4Agg backend;
   * `PyQt5 <https://pypi.python.org/pypi/PyQt5>`_: for the Qt5Agg backend;
-  * :term:`pygtk` (>= 2.4): for the GTK and the GTKAgg backend;
   * :term:`wxpython` (>= 2.9 or later): for the WX or WXAgg backend;
   * `cairocffi <https://cairocffi.readthedocs.io/en/latest/>`__ (>=
     v0.8): for cairo based backends;
@@ -326,8 +292,6 @@ without fiddling with environment variables::
   conda install pyqt
   # this package is only available in the conda-forge channel
   conda install -c conda-forge msinttypes
-  # for Python 2.7
-  conda install -c conda-forge backports.functools_lru_cache
 
   # copy the libs which have "wrong" names
   set LIBRARY_LIB=%CONDA_DEFAULT_ENV%\Library\lib

diff --git a/README.rst b/README.rst
@@ -33,6 +33,9 @@ platforms. Matplotlib can be used in Python scripts, the Python and IPython
 shell (à la MATLAB or Mathematica), web application servers, and various
 graphical user interface toolkits.
 
+NOTE: The current master branch is now Python 3 only.  Python 2 support is
+being dropped.
+
 `Home page <http://matplotlib.org/>`_
 
 Installation
@@ -49,16 +52,16 @@ Testing
 
 After installation, you can launch the test suite::
 
-  py.test
+  pytest
 
 Or from the Python interpreter::
 
   import matplotlib
   matplotlib.test()
 
-Consider reading http://matplotlib.org/devel/coding_guide.html#testing for
-more information. Note that the test suite requires pytest and, on Python 2.7,
-mock. Please install with pip or your package manager of choice.
+Consider reading http://matplotlib.org/devel/coding_guide.html#testing for more
+information. Note that the test suite requires pytest. Please install with pip
+or your package manager of choice.
 
 Contact
 =======

diff --git a/build_alllocal.cmd b/build_alllocal.cmd
@@ -6,8 +6,6 @@
 :: conda install pyqt
 :: # this package is only available in the conda-forge channel
 :: conda install -c conda-forge msinttypes
-:: if you build on py2.7:
-:: conda install -c conda-forge backports.functools_lru_cache
 
 set TARGET=bdist_wheel
 IF [%1]==[] (

diff --git a/ci/travis/silence b/ci/travis/silence
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Run a command, hiding its standard output and error if its exit
+# status is zero.
+
+stdout=$(mktemp -t stdout) || exit 1
+stderr=$(mktemp -t stderr) || exit 1
+"$@" >$stdout 2>$stderr
+code=$?
+if [[ $code != 0 ]]; then
+    cat $stdout
+    cat $stderr >&2
+    exit $code
+fi
diff --git a/ci/travis/test_script.sh b/ci/travis/test_script.sh
@@ -17,4 +17,4 @@ fi
 
 echo The following args are passed to pytest $PYTEST_ARGS $RUN_PEP8
 
-pytest $PYTEST_ARGS $RUN_PEP8
+python -mpytest $PYTEST_ARGS $RUN_PEP8
diff --git a/doc-requirements.txt b/doc-requirements.txt
@@ -10,7 +10,6 @@ sphinx>=1.3,!=1.5.0,!=1.6.4
 colorspacious
 ipython
 ipywidgets
-mock
 numpydoc>=0.4
 pillow
 sphinx-gallery>=0.1.12
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,4 +17,4 @@ fi

		echo The following args are passed to pytest $PYTEST_ARGS $RUN_PEP8

		pytest $PYTEST_ARGS $RUN_PEP8
		python -mpytest $PYTEST_ARGS $RUN_PEP8