Idahj anchored directionarrows

.appveyor.yml

@@ -4,47 +4,30 @@
 # https://github.com/rmcgibbo/python-appveyor-conda-example
 
 # Backslashes in quotes need to be escaped: \ -> "\\"
+branches:
+  except:
+    - /auto-backport-.*/
 
 environment:
 
   global:
-    # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
-    # /E:ON and /V:ON options are not enabled in the batch script intepreter
-    # See: http://stackoverflow.com/a/13751649/163740
-    CMD_IN_ENV: cmd /E:ON /V:ON /C obvci_appveyor_python_build_env.cmd
-    # Workaround for https://github.com/conda/conda-build/issues/636
     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:
-    # for testing purpose: numpy 1.8 on py2.7, for the rest use 1.10/latest
     # 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.
-    - TARGET_ARCH: "x64"
-      CONDA_PY: "27"
-      CONDA_NPY: "18"
-      PYTHON_VERSION: "2.7"
-      TEST_ALL: "no"
-      CONDA_INSTALL_LOCN: "C:\\Miniconda-x64"
-    - TARGET_ARCH: "x64"
-      CONDA_PY: "35"
-      CONDA_NPY: "110"
-      PYTHON_VERSION: "3.5"
+    - PYTHON_VERSION: "3.5"
       CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64"
       TEST_ALL: "no"
-    - TARGET_ARCH: "x64"
-      CONDA_PY: "36"
-      PYTHON_VERSION: "3.6"
-      CONDA_NPY: "111"
+    - PYTHON_VERSION: "3.6"
       CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
       TEST_ALL: "no"
 
 # We always use a 64-bit machine, but can build x86 distributions
-# with the PYTHON_ARCH variable (which is used by CMD_IN_ENV).
+# with the PYTHON_ARCH variable
 platform:
     - x64
 
@@ -61,34 +44,32 @@ init:
 install:
   - set PATH=%CONDA_INSTALL_LOCN%;%CONDA_INSTALL_LOCN%\scripts;%PATH%;
   - set PYTHONUNBUFFERED=1
-  # for obvci_appveyor_python_build_env.cmd
-  - conda install -c conda-forge --yes --quiet obvious-ci
   # for msinttypes and newer stuff
-  - conda config --prepend channels conda-forge
-  - conda config --set show_channel_urls yes
   - conda config --set always_yes true
-  # For building conda packages
-  - conda install --yes conda-build jinja2 anaconda-client
+  - conda update --all
+  - conda config --set show_channel_urls yes
+  - conda config --prepend channels conda-forge
   # this is now the downloaded conda...
   - conda info -a
 
-  # Fix the appveyor build environment to work with conda build
-  # workaround for missing vcvars64.bat in py34 64bit
-  - copy ci\appveyor\vcvars64.bat "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64"
-
   # For building, use a new environment which only includes the requirements for mpl
   # same things as the requirements in ci/conda_recipe/meta.yaml
   # if conda-forge gets a new pyqt, it might be nice to install it as well to have more backends
   # 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 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 "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout
+  - pip install -q "pytest>=3.4" "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
+  - python -c "import sys; sys.exit(not (3,) < sys.version_info < (3,6,3))" && (
+    curl -sL https://github.com/python/cpython/pull/1224.patch |
+    patch -fsup 1 -d %CONDA_PREFIX% ) || cmd /c "exit /b 0"
 
   # Let the install prefer the static builds of the libs
   - set LIBRARY_LIB=%CONDA_PREFIX%\Library\lib
@@ -108,7 +89,7 @@ install:
 
 test_script:
   # Now build the thing..
-  - '%CMD_IN_ENV% pip install --no-deps -ve .'
+  - pip install -ve .
   # these should show no z, png, or freetype dll...
   - set "DUMPBIN=%VS140COMNTOOLS%\..\..\VC\bin\dumpbin.exe"
   - '"%DUMPBIN%" /DEPENDENTS lib\matplotlib\ft2font*.pyd | findstr freetype.*.dll && exit /b 1 || exit /b 0'
@@ -117,7 +98,7 @@ test_script:
 
   # this are optional dependencies so that we don't skip so many tests...
   - if x%TEST_ALL% == xyes conda install -q ffmpeg inkscape miktex pillow
-  # missing packages on conda-forge for avconv mencoder imagemagick
+  # missing packages on conda-forge for avconv imagemagick
   # This install sometimes failed randomly :-(
   #- choco install imagemagick
 
@@ -126,34 +107,11 @@ test_script:
   # tests
   - echo The following args are passed to pytest %PYTEST_ARGS%
   - python tests.py %PYTEST_ARGS%
-  # Generate a html for visual tests
-  - python tools/visualize_tests.py --no-browser
-  - pip install codecov
-  - codecov -e PYTHON_VERSION PLATFORM
 
 after_test:
-  # After the tests were a success, build packages (wheels and conda)
-
-  # Build the wheel with the static libs
+  # After the tests were a success, build wheels with the static libs
   # Hide the output, the copied files really clutter the build log...
-  - '%CMD_IN_ENV% python setup.py bdist_wheel > NUL:'
-
-  # And now the conda build after a cleanup...
-  # cleanup build files so that they don't pollute the conda build but keep the wheel in dist...
-  - git clean -xdfq -e dist/
-  # cleanup the environment so that the test-environment does not leak into the conda build...
-  - set MPLBASEDIRLIST=
-  - set LIBRARY_LIB=
-  - deactivate
-  - path
-  - where python
-  - '%CMD_IN_ENV% conda config --get channels'
-  - '%CMD_IN_ENV% conda build -q .\ci\conda_recipe'
-
-  # Move the conda package into the dist directory, to register it
-  # as an "artifact" for Appveyor.
-  - copy /y %CONDA_INSTALL_LOCN%\conda-bld\win-32\*.bz2 dist || cmd /c "exit /b 0"
-  - copy /y %CONDA_INSTALL_LOCN%\conda-bld\win-64\*.bz2 dist || cmd /c "exit /b 0"
+  - 'python setup.py bdist_wheel > NUL:'
   - dir dist\
   - echo finished...
 
@@ -166,8 +124,11 @@ artifacts:
     type: zip
 
 on_finish:
+  - pip install codecov
+  - codecov -e PYTHON_VERSION PLATFORM
 
 on_failure:
+  # Generate a html for visual tests
   - python tools/visualize_tests.py --no-browser
   - echo zipping images after a failure...
   - 7z a result_images.zip result_images\ | grep -v "Compressing"

.circleci/config.yml

@@ -52,23 +52,23 @@ pip-run:  &pip-install
   # Upgrade pip and setuptools and wheel to get as clean an install as possible
   name: Upgrade pip, setuptools, wheel
   command: |
-    pip install --upgrade --user pip
-    pip install --upgrade --user wheel
-    pip install --upgrade --user setuptools
+    python -mpip install --upgrade --user pip
+    python -mpip install --upgrade --user wheel
+    python -mpip install --upgrade --user setuptools
 
 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 -r doc-requirements.txt
+    python -mpip install --user numpy${NUMPY_VERSION} codecov coverage
+    python -mpip install --user -r doc-requirements.txt
 
 mpl-run: &mpl-install
   name: Install Matplotlib
-  command: pip install --user -ve .
+  command: python -mpip install --user -ve .
 
 doc-run: &doc-build
   name: Build documentation
-  command: python make.py html
+  command: make html
   working_directory: doc
 
 doc-bundle-run: &doc-bundle
@@ -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

.gitattributes

@@ -1,2 +1,4 @@
 * text=auto
+*.svg binary
+*.svg linguist-language=true
 lib/matplotlib/_version.py export-subst

.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-->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,34 +1,41 @@
-<!--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-->
-
-<!--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.-->
-
 ## PR Summary
 
-<!--Please provide at least 1-2 sentences describing the pull request in
-detail.  Why is this change required?  What problem does it solve?-->
-
-<!--If it fixes an open issue, please link to the issue here.-->
-
 ## 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)
 - [ ] Documented in doc/api/api_changes.rst if API changed in a backward-incompatible way
 
-<!--We understand that PRs can sometimes be overwhelming, especially as the
-reviews start coming in.  Please let us know if the reviews are unclear or the
-recommended next step seems overly demanding , or if you would like help in
-addressing a reviewer's comments.  And please ping us if you've been waiting
-too long to hear back on your PR.-->
+<!--
+Thank you so much for your PR!  To help us review your contribution, please
+consider the following points:
+
+- A development guide is available at https://matplotlib.org/devdocs/devel/index.html.
+
+- Help with git and github is available at
+  https://matplotlib.org/devel/gitwash/development_workflow.html.
+
+- Do not create the PR out of master, but out of a separate branch.
+
+- The PR title should summarize the changes, for example "Raise ValueError on
+  non-numeric input to set_xlim".  Avoid non-descriptive titles such as
+  "Addresses issue #8576".
+
+- The summary should provide at least 1-2 sentences describing the pull request
+  in detail (Why is this change required?  What problem does it solve?) and
+  link to any relevant issues.
+
+- 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.
+
+We understand that PRs can sometimes be overwhelming, especially as the
+reviews start coming in.  Please let us know if the reviews are unclear or
+the recommended next step seems overly demanding, if you would like help in
+addressing a reviewer's comments, or if you have been waiting too long to hear
+back on your PR.
+-->

.gitignore

@@ -14,6 +14,7 @@
 .pydevproject
 *.swp
 .idea
+.vscode/
 
 # Compiled source #
 ###################
@@ -65,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
@@ -76,12 +74,11 @@ examples/*/*.eps
 examples/*/*.svgz
 examples/tests/*
 !examples/tests/backend_driver.py
-texput.log
-texput.aux
 result_images
 
 # Nose/Pytest generated files #
 ###############################
+.pytest_cache/
 .cache/
 .coverage
 .coverage.*
@@ -93,3 +90,8 @@ cover/
 __conda_version__.txt
 lib/png.lib
 lib/z.lib
+
+# Jupyter files #
+#################
+
+.ipynb_checkpoints/