Merge branch 'master' into tex_gallery

Author: sindunuragarp

.travis.yml

@@ -48,26 +48,26 @@ env:
     - PYTEST_ARGS="-ra --maxfail=1 --timeout=300 --durations=25 --cov-report= --cov=lib -n $NPROC"
     - PYTHON_ARGS=
     - DELETE_FONT_CACHE=
-    - USE_PYTEST=false
 
 matrix:
   include:
     - python: 2.7
-      env: MOCK=mock NUMPY=numpy==1.7.1
+      env: MOCK=mock NUMPY=numpy==1.7.1 PANDAS=pandas
+    - python: 2.7
+      env: BUILD_DOCS=true
     - python: 3.4
       env: PYTHON_ARGS=-OO
     - python: 3.5
       env: BUILD_DOCS=true
-    - python: 3.5
-      env: USE_PYTEST=true PANDAS=pandas DELETE_FONT_CACHE=1
     - python: 3.6
-      env: USE_PYTEST=true DELETE_FONT_CACHE=1 INSTALL_PEP8=pytest-pep8 RUN_PEP8=--pep8
+      env: DELETE_FONT_CACHE=1 INSTALL_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"
         # https://docs.travis-ci.com/user/caching/#pip-cache
@@ -102,9 +102,12 @@ before_install:
     fi
 
 install:
+  # Upgrade pip and setuptools. Mock has issues with the default version of
+  # setuptools
   - |
     # Setup environment
     ccache -s
+    git describe
     # Upgrade pip and setuptools and wheel to get as clean an install as possible
     pip install --upgrade pip
     pip install --upgrade wheel
@@ -138,46 +141,8 @@ install:
     # Install matplotlib
     pip install -ve .
 
-script:
-  # The number of processes is hardcoded, because using too many causes the
-  # Travis VM to run out of memory (since so many copies of inkscape and
-  # ghostscript are running at the same time).
-  - |
-    echo Testing import of tkagg backend
-    MPLBACKEND="tkagg" python -c 'import matplotlib.pyplot as plt; print(plt.get_backend())'
-    if [[ $BUILD_DOCS == false ]]; then
-      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 [[ $USE_PYTEST == false ]]; then
-        if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
-          python tests.py $PYTEST_ARGS $RUN_PEP8
-        else
-          gdb -return-child-result -batch -ex r -ex bt --args python $PYTHON_ARGS tests.py $PYTEST_ARGS $RUN_PEP8
-        fi
-      else
-        py.test $PYTEST_ARGS $RUN_PEP8
-      fi
-    else
-      cd doc
-      python make.py html -n 2
-      # We don't build the LaTeX docs here, so linkchecker will complain
-      touch build/html/Matplotlib.pdf
-      # Linkchecker only works with python 2.7 for the time being
-      deactivate
-      source ~/virtualenv/python2.7/bin/activate
-      pip install pip --upgrade
-      # linkchecker is currently broken with requests 2.10.0 so force an earlier version
-      pip install $PRE requests==2.9.2 linkchecker
-      linkchecker build/html/index.html
-    fi
+script: source ci/travis/test_script.sh
+before_cache:
   - rm -rf $HOME/.cache/matplotlib/tex.cache
   - rm -rf $HOME/.cache/matplotlib/test_cache
 

Makefile

@@ -21,7 +21,6 @@ clean:
 
 release: ${DISTFILES}
 	rm -f MANIFEST;\
-	${PYTHON} license.py ${VERSION} license/LICENSE;\
 	${PYTHON} setup.py sdist --formats=gztar,zip;
 
 pyback:

README.rst

@@ -13,9 +13,8 @@
 .. |PyPi| image:: https://badge.fury.io/py/matplotlib.svg
 .. _PyPi: https://badge.fury.io/py/matplotlib
 
-.. |Gitter| image:: https://badges.gitter.im/Join%20Chat.svg
-   :alt: Join the chat at https://gitter.im/matplotlib/matplotlib
-.. _Gitter: https://gitter.im/matplotlib/matplotlib?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+.. |Gitter| image:: https://img.shields.io/gitter/room/nwjs/nw.js.svg   
+   :target: https://gitter.im/matplotlib/matplotlib?utm_source=share-link&utm_medium=link&utm_campaign=share-link
 
 .. |Depsy| image:: http://depsy.org/api/package/pypi/matplotlib/badge.svg
 .. _Depsy: http://depsy.org/package/python/matplotlib
@@ -61,11 +60,9 @@ matplotlib's communication channels include active mailing lists:
 * `Announcement  <https://mail.python.org/mailman/listinfo/matplotlib-announce>`_ mailing list: matplotlib-announce@python.org
 * `Development <https://mail.python.org/mailman/listinfo/matplotlib-devel>`_ mailing list: matplotlib-devel@python.org
 
-
 The first is a good starting point for general questions and discussions.
 
-
-
+`Gitter <https://gitter.im/matplotlib/matplotlib>`_ is for coordinating development and asking questions directly related to contributing to matplotlib.
 
 Contribute
 ==========

appveyor.yml

@@ -15,7 +15,6 @@ environment:
     # Workaround for https://github.com/conda/conda-build/issues/636
     PYTHONIOENCODING: "UTF-8"
     PYTEST_ARGS: -ra --timeout=300 --durations=25 -n %NUMBER_OF_PROCESSORS% --cov-report= --cov=lib -m "not network"
-    USE_PYTEST: no
     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
@@ -37,13 +36,6 @@ environment:
       PYTHON_VERSION: "3.5"
       TEST_ALL: "no"
       CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64"
-    - TARGET_ARCH: "x64"
-      CONDA_PY: "35"
-      CONDA_NPY: "110"
-      PYTHON_VERSION: "3.5"
-      TEST_ALL: "no"
-      CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64"
-      USE_PYTEST: yes
     - TARGET_ARCH: "x86"
       CONDA_PY: "27"
       CONDA_NPY: "18"
@@ -63,8 +55,12 @@ platform:
 # all our python builds have to happen in tests_script...
 build: false
 
+cache:
+  - '%LOCALAPPDATA%\pip\Cache'
+  - '%USERPROFILE%\.cache\matplotlib'
+
 init:
-  - cmd: "ECHO %PYTHON_VERSION% PYTEST=%USE_PYTEST% %CONDA_INSTALL_LOCN%"
+  - cmd: "ECHO %PYTHON_VERSION% %CONDA_INSTALL_LOCN%"
 
 install:
   - cmd: set PATH=%CONDA_INSTALL_LOCN%;%CONDA_INSTALL_LOCN%\scripts;%PATH%;
@@ -136,10 +132,9 @@ test_script:
   - python -c "import matplotlib as m; m.use('tkagg'); import matplotlib.pyplot as plt; print(plt.get_backend())"
   # tests
   - echo The following args are passed to pytest %PYTEST_ARGS%
-  - if x%USE_PYTEST% == xyes py.test %PYTEST_ARGS%
-  - if x%USE_PYTEST% == xno python tests.py %PYTEST_ARGS%
+  - python tests.py %PYTEST_ARGS%
   # Generate a html for visual tests
-  - python visual_tests.py
+  - python tools/visualize_tests.py --no-browser
   - pip install codecov
   - codecov -e PYTHON_VERSION PLATFORM
 
@@ -180,7 +175,7 @@ artifacts:
 on_finish:
 
 on_failure:
-  - python visual_tests.py
+  - python tools/visualize_tests.py --no-browser
   - echo zipping images after a failure...
   - 7z a result_images.zip result_images\ |grep -v "Compressing"
   - appveyor PushArtifact result_images.zip

ci/travis/test_script.sh

@@ -0,0 +1,43 @@
+#! /bin/bash
+
+# This script is meant to be called by the "script" step defined in
+# .travis.yml. See http://docs.travis-ci.com/ for more details.
+# The behavior of the script is controlled by environment variabled defined
+# in the .travis.yml in the top level folder of the project.
+
+# The number of processes is hardcoded, because using too many causes the
+# Travis VM to run out of memory (since so many copies of inkscape and
+# ghostscript are running at the same time).
+
+echo Testing import of tkagg backend
+MPLBACKEND="tkagg" python -c 'import matplotlib.pyplot as plt; print(plt.get_backend())'
+
+if [[ $BUILD_DOCS == false ]]; then
+  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
+    python tests.py $PYTEST_ARGS $RUN_PEP8
+  else
+    gdb -return-child-result -batch -ex r -ex bt --args python $PYTHON_ARGS tests.py $PYTEST_ARGS $RUN_PEP8
+  fi
+else
+  cd doc
+  python make.py html -n 2
+  # We don't build the LaTeX docs here, so linkchecker will complain
+  touch build/html/Matplotlib.pdf
+  # Linkchecker only works with python 2.7 for the time being
+  deactivate
+  source ~/virtualenv/python2.7/bin/activate
+  pip install pip --upgrade
+  # linkchecker is currently broken with requests 2.10.0 so force an earlier version
+  pip install $PRE requests==2.9.2 linkchecker
+  linkchecker build/html/index.html
+fi

determinism_tex.svg

@@ -6,7 +6,7 @@
 # Install the documentation requirements with:
 #     pip install -r doc-requirements.txt
 #
-sphinx>1.0,!=1.5.0
+sphinx>=1.3,!=1.5.0
 numpydoc
 ipython
 mock

doc-requirements.txt

@@ -0,0 +1,8 @@
+Elliptical arcs now drawn between correct angles
+````````````````````````````````````````````````
+
+The `matplotlib.patches.Arc` patch is now correctly drawn between the given
+angles.
+
+Previously a circular arc was drawn and then stretched into an ellipse,
+so the resulting arc did not lie between *theta1* and *theta2*.

doc/api/api_changes/2017-02-10-DS_elliptical_arc_angle.rst

@@ -0,0 +1,21 @@
+Path.intersects_bbox always treats the bounding box as filled
+`````````````````````````````````````````````````````````````
+
+Previously, when ``Path.intersects_bbox`` was called with ``filled`` set to
+``False``, it would treat both the path and the bounding box as unfilled. This
+behavior was not well documented and it is usually not the desired behavior,
+since bounding boxes are used to represent more complex shapes located inside
+the bounding box. This behavior has now been changed: when ``filled`` is
+``False``, the path will be treated as unfilled, but the bounding box is still
+treated as filled. The old behavior was arguably an implementation bug.
+
+When ``Path.intersects_bbox`` is called with ``filled`` set to ``True``
+(the default value), there is no change in behavior. For those rare cases where
+``Path.intersects_bbox`` was called with ``filled`` set to ``False`` and where
+the old behavior is actually desired, the suggested workaround is to call
+``Path.intersects_path`` with a rectangle as the path::
+
+    from matplotlib.path import Path
+    from matplotlib.transforms import Bbox, BboxTransformTo
+    rect = Path.unit_rectangle().transformed(BboxTransformTo(bbox))
+    result = path.intersects_path(rect, filled=False)

doc/api/api_changes/2017-02-26-MB_intersects_bbox.rst

@@ -16,6 +16,7 @@
 ``Artist`` class
 ================
 
+.. autoclass:: Artist
 
 Interactive
 -----------