matplotlib · johnh2o2 · Sep 18, 2017 · Sep 18, 2017 · Sep 18, 2017 · Sep 18, 2017
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -4,6 +4,9 @@
 # https://github.com/rmcgibbo/python-appveyor-conda-example
 
 # Backslashes in quotes need to be escaped: \ -> "\\"
+branches:
+  except:
+    - /auto-backport-.*/
 
 environment:
 
@@ -14,7 +17,7 @@ environment:
     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 -n %NUMBER_OF_PROCESSORS% --cov-report= --cov=lib -m "not network"
+    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
@@ -24,12 +27,12 @@ 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.
-    #    - 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: "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"
@@ -62,7 +65,9 @@ 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
+  - conda update --all --yes
+  - conda install anaconda-client=1.6.3 --yes
+  - conda install -c conda-forge --yes obvious-ci
   # for msinttypes and newer stuff
   - conda config --prepend channels conda-forge
   - conda config --set show_channel_urls yes
@@ -88,7 +93,7 @@ install:
   - 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 pytest-xdist
+  - pip install -q pytest "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout
 
   # Let the install prefer the static builds of the libs
   - set LIBRARY_LIB=%CONDA_PREFIX%\Library\lib

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,169 @@
+# Circle CI configuration file
+# https://circleci.com/docs/
+
+version: 2
+
+
+###########################################
+# Define some common steps as YAML anchors.
+#
+
+apt-run:  &apt-install
+  name: Install apt packages
+  command: |
+    sudo apt-get -qq update
+    sudo apt-get install -y \
+      inkscape \
+      libav-tools \
+      dvipng \
+      pgf \
+      lmodern \
+      cm-super \
+      texlive-latex-base \
+      texlive-latex-extra \
+      texlive-fonts-recommended \
+      texlive-latex-recommended \
+      texlive-xetex \
+      graphviz \
+      libgeos-dev \
+      otf-freefont
+
+fonts-run:  &fonts-install
+  name: Install custom fonts
+  # We manually install Humor-Sans using the package from Ubuntu 14.10.
+  # Unfortunately humor sans is not available in the Ubuntu version used by
+  # CircleCI but we can manually install the deb from a later version since
+  # it is basically just a .ttf file.
+  command: |
+    mkdir -p ~/.local/share/fonts
+    wget -nc https://github.com/google/fonts/blob/master/ofl/felipa/Felipa-Regular.ttf?raw=true -O ~/.local/share/fonts/Felipa-Regular.ttf || true
+    if [ ! -f ~/.local/share/fonts/Humor-Sans.ttf ]; then
+      wget https://mirrors.kernel.org/ubuntu/pool/universe/f/fonts-humor-sans/fonts-humor-sans_1.0-1_all.deb
+      mkdir tmp
+      dpkg -x fonts-humor-sans_1.0-1_all.deb tmp
+      cp tmp/usr/share/fonts/truetype/humor-sans/Humor-Sans.ttf ~/.local/share/fonts
+      rm -rf tmp
+    else
+      echo "Not downloading Humor-Sans; file already exists."
+    fi
+    fc-cache -f -v
+
+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
+
+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
+
+mpl-run: &mpl-install
+  name: Install Matplotlib
+  command: pip install --user -ve .
+
+doc-run: &doc-build
+  name: Build documentation
+  command: python make.py html
+  working_directory: doc
+
+doc-bundle-run: &doc-bundle
+  name: Bundle sphinx-gallery documentation artifacts
+  command: tar cf doc/build/sphinx-gallery-files.tar.gz doc/api/_as_gen doc/gallery doc/tutorials
+  when: always
+
+
+##########################################
+# Here is where the real jobs are defined.
+#
+
+jobs:
+  docs-python35:
+    docker:
+      - image: circleci/python:3.5
+    steps:
+      - checkout
+
+      - run: *apt-install
+      - run: *fonts-install
+      - run: *pip-install
+
+      - run: *deps-install
+      - 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"
+
+      - 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-python27:
+    docker:
+      - image: circleci/python:2.7
+    steps:
+      - checkout
+
+      - run: *apt-install
+      - run: *fonts-install
+      - run: *pip-install
+
+      - 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
+      - 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
+
+      - 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.
+#
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - docs-python35
+      - docs-python27
diff --git a/.circleci/deploy-docs.sh b/.circleci/deploy-docs.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -e
+
+if [ "$CIRCLE_PROJECT_USERNAME" != "matplotlib" -o "$CIRCLE_BRANCH" != "master" -o "$CIRCLE_PULL_REQUEST" != "" ]; then
+    echo "Not uploading docs from non-master branch or non-Matplotlib org."
+    exit
+fi
+
+git clone git@github.com:matplotlib/devdocs.git
+
+cd devdocs
+
+git checkout --orphan gh-pages || true
+git reset --hard first_commit
+
+git rm -rf .
+cp -R ../doc/build/html/. .
+touch .nojekyll
+
+git config user.email "MatplotlibCircleBot@nomail"
+git config user.name "MatplotlibCircleBot"
+git config push.default simple
+
+git add .
+git commit -m "Docs build of $CIRCLE_SHA1"
+
+git push --set-upstream origin gh-pages --force
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
@@ -24,7 +24,7 @@ detail.  Why is this change required?  What problem does it solve?-->
 - [ ] 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/whats_new.rst if major new feature
+- [ ] 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

diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,7 @@
 .pydevproject
 *.swp
 .idea
+.vscode/
 
 # Compiled source #
 ###################