matplotlib · as691454 · Oct 31, 2017 · Oct 31, 2017 · Oct 31, 2017 · Oct 29, 2017
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -12,10 +12,8 @@ environment:
 
   global:
     PYTHONIOENCODING: UTF-8
-    PYTEST_ARGS: -rawR --timeout=300 --durations=25 --cov-report= --cov=lib -m "not network"
-    PYTHONHASHSEED: 0  # Workaround for pytest-xdist flaky collection order
-                       # https://github.com/pytest-dev/pytest/issues/920
-                       # https://github.com/pytest-dev/pytest/issues/1075
+    PYTEST_ARGS: -rawR --numprocesses=auto --timeout=300 --durations=25
+                 --cov-report= --cov=lib -m "not network"
 
   matrix:
     # theoretically the CONDA_INSTALL_LOCN could be only two: one for 32bit,
@@ -63,14 +61,12 @@ install:
   # https://github.com/conda-forge/conda-forge.github.io/issues/157#issuecomment-223536381
   #
   - conda create -q -n test-environment python=%PYTHON_VERSION%
-    pip setuptools numpy python-dateutil freetype=2.6 msinttypes "tk=8.5"
-    pyparsing pytz tornado "libpng>=1.6.21,<1.7" "zlib=1.2" "cycler>=0.10"
-    mock sphinx pandas
+    msinttypes freetype=2.6 "libpng>=1.6.21,<1.7" zlib=1.2 tk=8.5
+    pip setuptools numpy mock pandas sphinx tornado
   - activate test-environment
   - echo %PYTHON_VERSION% %TARGET_ARCH%
-  - if %PYTHON_VERSION% == 2.7 conda install -q backports.functools_lru_cache
   # pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
-  - pip install -q "pytest!=3.3.0" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout
+  - pip install -q "pytest!=3.3.0" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist
 
   # Apply patch to `subprocess` on Python versions > 2 and < 3.6.3
   # https://github.com/matplotlib/matplotlib/issues/9176

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -59,7 +59,7 @@ pip-run:  &pip-install
 deps-run: &deps-install
   name: Install Python dependencies
   command: |
-    pip install --user python-dateutil numpy${NUMPY_VERSION} pyparsing!=2.1.6 cycler codecov coverage sphinx pillow
+    pip install --user numpy${NUMPY_VERSION} codecov coverage
     pip install --user -r doc-requirements.txt
 
 mpl-run: &mpl-install
@@ -68,7 +68,7 @@ mpl-run: &mpl-install
 
 doc-run: &doc-build
   name: Build documentation
-  command: python make.py html
+  command: make html
   working_directory: doc
 
 doc-bundle-run: &doc-bundle

diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,4 @@
 * text=auto
+*.svg binary
+*.svg linguist-language=true
 lib/matplotlib/_version.py export-subst
diff --git a/CONTRIBUTING.md → .github/CONTRIBUTING.md b/CONTRIBUTING.md → .github/CONTRIBUTING.md
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -34,11 +34,12 @@
 
 **Matplotlib version**
 <!--Please specify your platform and versions of the relevant libraries you are using:-->
-  * Operating System:
-  * Matplotlib Version: 
-  * Python Version:
-  * Jupyter Version (if applicable):
-  * Other Libraries: 
+  * Operating system:
+  * Matplotlib version: 
+  * Matplotlib backend (`print(matplotlib.get_backend())`):
+  * Python version:
+  * Jupyter version (if applicable):
+  * Other libraries: 
 
 <!--Please tell us how you installed matplotlib and python e.g., from source, pip, conda-->
 <!--If you installed from conda, please specify which channel you used if not the default-->

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,15 +1,19 @@
 <!--Thank you so much for your PR! To help us review, fill out the form
 to the best of your ability.  Please make use of the development guide at
-https://matplotlib.org/devdocs/devel/index.html-->
+https://matplotlib.org/devdocs/devel/index.html
+
+For help with git and github workflow, please see https://matplotlib.org/devel/gitwash/development_workflow.html
+
+Please do not create the PR out of master, but out of a separate branch. -->
 
 <!--Provide a general summary of your changes in the title above, for
 example "Raises ValueError on Non-Numeric Input to set_xlim".  Please avoid
 non-descriptive titles such as "Addresses issue #8576".-->
 
-<!--If you are able to do so, please do not create the
-PR out of master, but out of a separate branch.  See
-https://matplotlib.org/devel/gitwash/development_workflow.html for
-instructions.-->
+<!--If you are contributing fixes to docstrings, please pay attention to
+http://matplotlib.org/devel/documenting_mpl.html#formatting.  In particular,
+note the difference between using single backquotes, double backquotes, and
+asterisks in the markup.-->
 
 ## PR Summary
 
@@ -21,7 +25,7 @@ detail.  Why is this change required?  What problem does it solve?-->
 ## PR Checklist
 
 - [ ] Has Pytest style unit tests
-- [ ] Code is PEP 8 compliant 
+- [ ] Code is PEP 8 compliant
 - [ ] New features are documented, with examples if plot related
 - [ ] Documentation is sphinx and numpydoc compliant
 - [ ] Added an entry to doc/users/next_whats_new/ if major new feature (follow instructions in README.rst there)

diff --git a/.gitignore b/.gitignore
@@ -66,9 +66,6 @@ doc/gallery
 doc/tutorials
 doc/modules
 doc/pyplots/tex_demo.png
-doc/users/installing.rst
-doc/_static/depsy_badge.svg
-doc/_static/matplotlibrc
 lib/dateutil
 examples/*/*.pdf
 examples/*/*.png

diff --git a/.travis.yml b/.travis.yml
@@ -14,6 +14,9 @@ cache:
     - $HOME/.cache/matplotlib
 
 addons:
+  artifacts:
+    paths:
+    - result_images.tar.bz2
   apt:
     packages:
       - inkscape
@@ -36,7 +39,7 @@ addons:
 env:
   global:
     - ARTIFACTS_AWS_REGION=us-east-1
-    - ARTIFACTS_S3_BUCKET=matplotlib-test-results
+    - ARTIFACTS_BUCKET=matplotlib-test-results
     - secure: RgJI7BBL8aX5FTOQe7xiXqWHMxWokd6GNUWp1NUV2mRLXPb9dI0RXqZt3UJwKTAzf1z/OtlHDmEkBoTVK81E9iUxK5npwyyjhJ8yTJmwfQtQF2n51Q1Ww9p+XSLORrOzZc7kAo6Kw6FIXN1pfctgYq2bQkrwJPRx/oPR8f6hcbY=
     - secure: E7OCdqhZ+PlwJcn+Hd6ns9TDJgEUXiUNEI0wu7xjxB2vBRRIKtZMbuaZjd+iKDqCKuVOJKu0ClBUYxmgmpLicTwi34CfTUYt6D4uhrU+8hBBOn1iiK51cl/aBvlUUrqaRLVhukNEBGZcyqAjXSA/Qsnp2iELEmAfOUa92ZYo1sk=
     - secure: "dfjNqGKzQG5bu3FnDNwLG8H/C4QoieFo4PfFmZPdM2RY7WIzukwKFNT6kiDfOrpwt+2bR7FhzjOGlDECGtlGOtYPN8XuXGjhcP4a4IfakdbDfF+D3NPIpf5VlE6776k0VpvcZBTMYJKNFIMc7QPkOwjvNJ2aXyfe3hBuGlKJzQU="
@@ -113,10 +116,7 @@ install:
         $PANDAS \
         codecov \
         coverage \
-        cycler \
         pillow \
-        pyparsing!=2.1.6 \
-        python-dateutil \
         sphinx
     # 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
@@ -128,7 +128,7 @@ install:
       echo 'PyQt5 is available' ||
       echo 'PyQt5 is not available'
     pip install -U --pre \
-      -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-14.04 \
+      --no-index -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-14.04 \
       wxPython &&
       python -c 'import wx' &&
       echo 'wxPython is available' ||
@@ -166,11 +166,8 @@ before_cache:
 after_failure:
   - |
     if [[ $TRAVIS_PULL_REQUEST == false && $TRAVIS_REPO_SLUG == 'matplotlib/matplotlib' ]]; then
-      gem install travis-artifacts
-      cd $TRAVIS_BUILD_DIR/../tmp_test_dir
       tar cjf result_images.tar.bz2 result_images
-      travis-artifacts upload --path result_images.tar.bz2
-      echo https://s3.amazonaws.com/matplotlib-test-results/artifacts/${TRAVIS_BUILD_NUMBER}/${TRAVIS_JOB_NUMBER}/result_images.tar.bz2
+      echo 'See "Uploading Artifacts" near the end of the log for the download URL'
     else
       echo "The result images will only be uploaded if they are on the matplotlib/matplotlib repo - this is for security reasons to prevent arbitrary PRs echoing security details."
     fi

diff --git a/INSTALL.rst b/INSTALL.rst
@@ -1,7 +1,3 @@
-.. The source of this document is INSTALL.rst. During the doc build process,
-.. this file is copied over to doc/users/installing.rst.
-.. Therefore, you must edit INSTALL.rst, *not* doc/users/installing.rst!
-
 .. _pip: https://pypi.python.org/pypi/pip/
 
 ==========
@@ -13,7 +9,6 @@ Installing
     If you wish to contribute to the project, it's recommended you
     :ref:`install the latest development version<install_from_source>`.
 
-
 .. contents::
 
 Installing an official release
@@ -198,7 +193,7 @@ optional Matplotlib backends and the capabilities they provide.
     `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.8 or later): for the WX or WXAgg backend;
+  * :term:`wxpython` (>= 2.9 or later): for the WX or WXAgg backend;
   * `pycairo <https://pypi.python.org/pypi/pycairo>`_: for GTK3Cairo;
   * `Tornado <https://pypi.python.org/pypi/tornado>`_: for the WebAgg backend.
 

diff --git a/Makefile b/Makefile
diff --git a/ci/travis/test_script.sh b/ci/travis/test_script.sh
@@ -14,11 +14,6 @@ set -ev
 if [[ $DELETE_FONT_CACHE == 1 ]]; then
   rm -rf ~/.cache/matplotlib
 fi
-# Workaround for pytest-xdist flaky collection order
-# https://github.com/pytest-dev/pytest/issues/920
-# https://github.com/pytest-dev/pytest/issues/1075
-export PYTHONHASHSEED=$(python -c 'import random; print(random.randint(1, 4294967295))')
-echo PYTHONHASHSEED=$PYTHONHASHSEED
 
 echo The following args are passed to pytest $PYTEST_ARGS $RUN_PEP8
 if [[ $TRAVIS_OS_NAME == 'osx' ]]; then