Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b0d7e4b

Browse files
eric-wiesereric-wieser
authored
Merge branch 'master' into more-normals
2 parents b84c83d + c20b0c2 commit b0d7e4b

168 files changed

Lines changed: 3216 additions & 1682 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ install:
8383
- del %LIBRARY_LIB%\z.lib
8484
- set MPLBASEDIRLIST=%CONDA_PREFIX%\Library\;.
8585
# enables the local freetype build
86-
- copy ci\travis\setup.cfg .
86+
- set MPLLOCALFREETYPE=1
8787
# Show the installed packages + versions
8888
- conda list
8989

‎.travis.yml‎

Lines changed: 52 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,18 @@ env:
5959
- PYTEST_COV=pytest-cov
6060
- PYTEST_PEP8=
6161
- SPHINX=sphinx
62+
# Variables controlling the build.
63+
- MPLLOCALFREETYPE=1
6264
# Variables controlling the test run.
6365
- DELETE_FONT_CACHE=
6466
- NO_AT_BRIDGE=1 # Necessary for GTK3 interactive test.
67+
# The number of processes is hardcoded, because using too many causes the
68+
# Travis VM to run out of memory (since so many copies of inkscape and
69+
# ghostscript are running at the same time).
6570
- NPROC=2
6671
- OPENBLAS_NUM_THREADS=1
6772
- PYTHONFAULTHANDLER=1
68-
- PYTEST_ARGS="-rawR --maxfail=50 --timeout=300 --durations=25 --cov-report= --cov=lib -n $NPROC"
69-
- PYTHON_ARGS=
73+
- PYTEST_ADDOPTS="-rawR --maxfail=50 --timeout=300 --durations=25 --cov-report= --cov=lib -n $NPROC"
7074
- RUN_PEP8=
7175

7276
matrix:
@@ -84,9 +88,14 @@ matrix:
8488
- PYTEST_COV=pytest-cov==2.3.1
8589
- SPHINX=sphinx==1.3
8690
- python: 3.5
87-
env: PYTHON_ARGS=-OO
91+
env:
92+
# - PYTHONOPTIMIZE=2 # This currently doesn't work.
8893
- python: 3.6
89-
env: DELETE_FONT_CACHE=1 PANDAS='pandas<0.21.0' PYTEST_PEP8=pytest-pep8 RUN_PEP8=--pep8
94+
env:
95+
- DELETE_FONT_CACHE=1
96+
- PANDAS='pandas<0.21.0'
97+
- PYTEST_PEP8=pytest-pep8
98+
- PYTEST_ADDOPTS="$PYTEST_ADDOPTS --pep8"
9099
- python: "nightly"
91100
env: PRE=--pre
92101
- os: osx
@@ -104,25 +113,22 @@ matrix:
104113
allow_failures:
105114
- python: "nightly"
106115

107-
before_install:
108-
- |
109-
if [[ $TRAVIS_OS_NAME != 'osx' ]]; then
110-
# test with non-ascii in path
111-
mkdir /tmp/λ
112-
export PATH=$PATH:/tmp/λ
113-
export PATH=/usr/lib/ccache:$PATH
114-
else
115-
ci/travis/silence brew update
116-
brew upgrade python
117-
brew install ffmpeg imagemagick mplayer ccache
118-
hash -r
119-
which python
120-
python --version
121-
# We could install ghostscript and inkscape here to test svg and pdf
122-
# but this makes the test time really long.
123-
# brew install ghostscript inkscape
124-
export PATH=/usr/local/opt/python/libexec/bin:/usr/local/opt/ccache/libexec:$PATH
125-
fi
116+
before_install: |
117+
# test with non-ascii in path
118+
if [[ $TRAVIS_OS_NAME != 'osx' ]]; then
119+
export PATH=/usr/lib/ccache:$PATH
120+
else
121+
ci/silence brew update
122+
brew upgrade python
123+
brew install ffmpeg imagemagick mplayer ccache
124+
hash -r
125+
which python
126+
python --version
127+
# We could install ghostscript and inkscape here to test svg and pdf
128+
# but this makes the test time really long.
129+
# brew install ghostscript inkscape
130+
export PATH=/usr/local/opt/python/libexec/bin:/usr/local/opt/ccache/libexec:$PATH
131+
fi
126132
127133
install:
128134
- |
@@ -141,8 +147,6 @@ install:
141147
$NOSE \
142148
$NUMPY \
143149
$PANDAS \
144-
codecov \
145-
coverage \
146150
pillow \
147151
$PYPARSING \
148152
$SPHINX \
@@ -175,34 +179,34 @@ install:
175179
pytest-rerunfailures \
176180
pytest-timeout \
177181
pytest-xdist
178-
179-
# Use the special local version of freetype for testing
180-
cp ci/travis/setup.cfg .
181182
- |
182183
# Install matplotlib
183184
python -mpip install -ve .
184185
185-
before_script:
186-
- |
187-
if [[ $TRAVIS_OS_NAME != 'osx' ]]; then
188-
export DISPLAY=:99.0
189-
sh -e /etc/init.d/xvfb start
190-
fi
186+
before_script: |
187+
if [[ $TRAVIS_OS_NAME != 'osx' ]]; then
188+
export DISPLAY=:99.0
189+
sh -e /etc/init.d/xvfb start
190+
fi
191+
if [[ $DELETE_FONT_CACHE == 1 ]]; then
192+
rm -rf ~/.cache/matplotlib
193+
fi
191194
192-
script: ci/travis/test_script.sh
195+
script: |
196+
echo "Calling pytest with the following arguments: $PYTEST_ADDOPTS"
197+
python -mpytest
193198
194-
before_cache:
195-
- rm -rf $HOME/.cache/matplotlib/tex.cache
196-
- rm -rf $HOME/.cache/matplotlib/test_cache
199+
before_cache: |
200+
rm -rf $HOME/.cache/matplotlib/tex.cache
201+
rm -rf $HOME/.cache/matplotlib/test_cache
197202
198-
after_failure:
199-
- |
200-
if [[ $TRAVIS_PULL_REQUEST == false && $TRAVIS_REPO_SLUG == 'matplotlib/matplotlib' ]]; then
201-
tar cjf result_images.tar.bz2 result_images
202-
echo 'See "Uploading Artifacts" near the end of the log for the download URL'
203-
else
204-
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."
205-
fi
203+
after_failure: |
204+
if [[ $TRAVIS_PULL_REQUEST == false && $TRAVIS_REPO_SLUG == 'matplotlib/matplotlib' ]]; then
205+
tar cjf result_images.tar.bz2 result_images
206+
echo 'See "Uploading Artifacts" near the end of the log for the download URL'
207+
else
208+
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."
209+
fi
206210
207-
after_success:
208-
- codecov -e TRAVIS_PYTHON_VERSION
211+
after_success: |
212+
codecov -e TRAVIS_PYTHON_VERSION

ci/travis/silence renamed to ci/silence

File renamed without changes.

‎ci/travis/matplotlibDeployKey.enc‎

-1.64 KB
Binary file not shown.

‎ci/travis/setup.cfg‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎ci/travis/test_script.sh‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎doc/_static/mpl.css‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ div.deprecated span.versionmodified {
416416
font-weight: bold;
417417
}
418418

419-
div.green {
419+
div.green, div.hint {
420420
color: #468847;
421421
background-color: #dff0d8;
422422
border: 1px solid #d6e9c6;
@@ -713,6 +713,9 @@ table.docutils.field-list {
713713
font-size: 13px;
714714
line-height: 18px;
715715
}
716+
.docutils.field-list td blockquote p ul li{
717+
font-size: 13px;
718+
}
716719
p.rubric {
717720
font-weight: bold;
718721
font-size: 19px;
@@ -983,7 +986,7 @@ div.sphx-glr-download a {
983986
background-image: none !important;
984987
}
985988

986-
p.sphx-glr-signature a.reference.external {
989+
p.sphx-glr-signature {
987990
display: none !important;
988991
}
989992

‎doc/api/artist_api.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
.. _artist-api:
22

3-
===================
4-
``artist`` Module
5-
===================
3+
******
4+
artist
5+
******
66

77
.. inheritance-diagram:: matplotlib.axes._axes.Axes matplotlib.axes._base._AxesBase matplotlib.axis.Axis matplotlib.axis.Tick matplotlib.axis.XAxis matplotlib.axis.XTick matplotlib.axis.YAxis matplotlib.axis.YTick matplotlib.collections.AsteriskPolygonCollection matplotlib.collections.BrokenBarHCollection matplotlib.collections.CircleCollection matplotlib.collections.Collection matplotlib.collections.EllipseCollection matplotlib.collections.EventCollection matplotlib.collections.LineCollection matplotlib.collections.PatchCollection matplotlib.collections.PathCollection matplotlib.collections.PolyCollection matplotlib.collections.QuadMesh matplotlib.collections.RegularPolyCollection matplotlib.collections.StarPolygonCollection matplotlib.collections.TriMesh matplotlib.collections._CollectionWithSizes matplotlib.contour.ClabelText matplotlib.figure.Figure matplotlib.image.AxesImage matplotlib.image.BboxImage matplotlib.image.FigureImage matplotlib.image.NonUniformImage matplotlib.image.PcolorImage matplotlib.image._ImageBase matplotlib.legend.Legend matplotlib.lines.Line2D matplotlib.offsetbox.AnchoredOffsetbox matplotlib.offsetbox.AnchoredText matplotlib.offsetbox.AnnotationBbox matplotlib.offsetbox.AuxTransformBox matplotlib.offsetbox.DrawingArea matplotlib.offsetbox.HPacker matplotlib.offsetbox.OffsetBox matplotlib.offsetbox.OffsetImage matplotlib.offsetbox.PackerBase matplotlib.offsetbox.PaddedBox matplotlib.offsetbox.TextArea matplotlib.offsetbox.VPacker matplotlib.patches.Arc matplotlib.patches.Arrow matplotlib.patches.Circle matplotlib.patches.CirclePolygon matplotlib.patches.ConnectionPatch matplotlib.patches.Ellipse matplotlib.patches.FancyArrow matplotlib.patches.FancyArrowPatch matplotlib.patches.FancyBboxPatch matplotlib.patches.Patch matplotlib.patches.PathPatch matplotlib.patches.Polygon matplotlib.patches.Rectangle matplotlib.patches.RegularPolygon matplotlib.patches.Shadow matplotlib.patches.Wedge matplotlib.patches.YAArrow matplotlib.projections.geo.AitoffAxes matplotlib.projections.geo.GeoAxes matplotlib.projections.geo.HammerAxes matplotlib.projections.geo.LambertAxes matplotlib.projections.geo.MollweideAxes matplotlib.projections.polar.PolarAxes matplotlib.quiver.Barbs matplotlib.quiver.Quiver matplotlib.quiver.QuiverKey matplotlib.spines.Spine matplotlib.table.Cell matplotlib.table.CustomCell matplotlib.table.Table matplotlib.text.Annotation matplotlib.text.Text matplotlib.text.TextWithDash
88
:parts: 1

‎doc/api/blocking_input_api.rst‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
**************
2+
blocking_input
3+
**************
4+
5+
:mod:`matplotlib.blocking_input`
6+
================================
7+
8+
.. automodule:: matplotlib.blocking_input
9+
:members:
10+
:undoc-members:
11+
:show-inheritance:

‎doc/api/index.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
axes_api.rst
2222
axis_api.rst
2323
index_backend_api.rst
24+
blocking_input_api.rst
2425
cbook_api.rst
2526
cm_api.rst
2627
collections_api.rst

0 commit comments

Comments
 (0)