Skip to content

Commit 2023bb7

Browse files
committed
Merge remote-tracking branch 'upstream/master'
Conflicts: lib/matplotlib/colors.py lib/matplotlib/gridspec.py lib/matplotlib/tri/_tri.cpp src/_backend_agg.cpp src/_image.cpp src/_path.cpp
2 parents 82b10fc + 92ff77b commit 2023bb7

File tree

842 files changed

+158405
-25860
lines changed

Some content is hidden

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

842 files changed

+158405
-25860
lines changed

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,9 @@ doc/_templates/gallery.html
5454
doc/users/installing.rst
5555
doc/_static/matplotlibrc
5656
lib/dateutil
57+
examples/*/*.pdf
58+
examples/*/*.png
59+
examples/tests/*
60+
!examples/tests/backend_driver.py
61+
texput.log
62+
result_images

.travis.yml

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
1+
env:
2+
global:
3+
- ARTIFACTS_AWS_REGION=us-east-1
4+
- ARTIFACTS_S3_BUCKET=matplotlib-test-results
5+
- secure: RgJI7BBL8aX5FTOQe7xiXqWHMxWokd6GNUWp1NUV2mRLXPb9dI0RXqZt3UJwKTAzf1z/OtlHDmEkBoTVK81E9iUxK5npwyyjhJ8yTJmwfQtQF2n51Q1Ww9p+XSLORrOzZc7kAo6Kw6FIXN1pfctgYq2bQkrwJPRx/oPR8f6hcbY=
6+
- secure: E7OCdqhZ+PlwJcn+Hd6ns9TDJgEUXiUNEI0wu7xjxB2vBRRIKtZMbuaZjd+iKDqCKuVOJKu0ClBUYxmgmpLicTwi34CfTUYt6D4uhrU+8hBBOn1iiK51cl/aBvlUUrqaRLVhukNEBGZcyqAjXSA/Qsnp2iELEmAfOUa92ZYo1sk=
7+
- TEST_ARGS=--no-pep8
8+
19
language: python
210

3-
python:
4-
- 2.6
5-
- 2.7
6-
- 3.2
7-
- 3.3
11+
matrix:
12+
include:
13+
- python: 2.6
14+
- python: 2.7
15+
- python: 3.3
16+
- python: 3.4
17+
- python: 2.7
18+
env: TEST_ARGS=--pep8
819

920
install:
10-
- pip install -q --use-mirrors nose python-dateutil numpy pep8
11-
# This is a workaround to install the latest versions of pyparsing,
12-
# which are not yet available on PyPI
13-
- 'if [ ${TRAVIS_PYTHON_VERSION:0:1} == "3" ]; then pip -q install http://sourceforge.net/projects/pyparsing/files/pyparsing/pyparsing-2.0.0/pyparsing-2.0.0.tar.gz; fi'
14-
- 'if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then pip -q install http://sourceforge.net/projects/pyparsing/files/pyparsing/pyparsing-1.5.7/pyparsing-1.5.7.tar.gz; fi'
15-
- if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then pip -q install --use-mirrors PIL; fi
16-
- sudo apt-get update && sudo apt-get -qq install inkscape
21+
- pip install -q --use-mirrors nose python-dateutil numpy pep8 pyparsing pillow
22+
- sudo apt-get update && sudo apt-get -qq install inkscape libav-tools
1723
- python setup.py install
1824

1925
script:
@@ -26,4 +32,10 @@ script:
2632
# Generate the font caches in a single process before starting the
2733
# multiple processes
2834
- python -c "from matplotlib import font_manager"
29-
- python ../matplotlib/tests.py -sv --processes=8 --process-timeout=300
35+
- python ../matplotlib/tests.py -sv --processes=8 --process-timeout=300 $TEST_ARGS
36+
37+
after_failure:
38+
- tar cjf result_images.tar.bz2 result_images
39+
- if [[ $TRAVIS_PULL_REQUEST == false ]]; then gem install travis-artifacts; fi
40+
- if [[ $TRAVIS_PULL_REQUEST == falst ]]; then travis-artifacts upload --path result_images.tar.bz2; fi
41+
- if [[ $TRAVIS_PULL_REQUEST != false ]]; then 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." else echo https://s3.amazonaws.com/matplotlib-test-results/artifacts/${TRAVIS_BUILD_NUMBER}/${TRAVIS_JOB_NUMBER}/result_images.tar.bz2; fi

CHANGELOG

Lines changed: 159 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,142 @@
1+
2014-06-10 Added Colorbar.remove()
2+
3+
2014-06-07 Fixed bug so radial plots can be saved as ps in py3k.
4+
5+
2014-06-01 Changed the fmt kwarg of errorbar to support the
6+
the mpl convention that "none" means "don't draw it",
7+
and to default to the empty string, so that plotting
8+
of data points is done with the plot() function
9+
defaults. Deprecated use of the None object in place
10+
"none".
11+
12+
2014-05-22 Allow the linscale keyword parameter of symlog scale to be
13+
smaller than one.
14+
15+
2014-05-20 Added logic to in FontManager to invalidate font-cache if
16+
if font-family rcparams have changed.
17+
18+
2014-05-16 Fixed the positioning of multi-line text in the PGF backend.
19+
20+
2014-05-14 Added Axes.add_image() as the standard way to add AxesImage
21+
instances to Axes. This improves the consistency with
22+
add_artist(), add_collection(), add_container(), add_line(),
23+
add_patch(), and add_table().
24+
25+
2014-05-02 Added colorblind-friendly colormap, named 'Wistia'.
26+
27+
2014-04-27 Improved input clean up in Axes.{h|v}lines
28+
Coerce input into a 1D ndarrays (after dealing with units).
29+
30+
2014-04-27 removed un-needed cast to float in stem
31+
32+
2014-04-23 Updated references to "ipython -pylab"
33+
The preferred method for invoking pylab is now using the
34+
"%pylab" magic.
35+
-Chris G.
36+
37+
2014-04-22 Added (re-)generate a simple automatic legend to "Figure Options"
38+
dialog of the Qt4Agg backend.
39+
40+
2014-04-22 Added an example showing the difference between
41+
interpolation = 'none' and interpolation = 'nearest' in
42+
`imshow()` when saving vector graphics files.
43+
44+
2014-04-22 Added violin plotting functions. See `Axes.violinplot`,
45+
`Axes.violin`, `cbook.violin_stats` and `mlab.GaussianKDE` for
46+
details.
47+
48+
2014-04-10 Fixed the triangular marker rendering error. The "Up" triangle was
49+
rendered instead of "Right" triangle and vice-versa.
50+
51+
2014-04-08 Fixed a bug in parasite_axes.py by making a list out
52+
of a generator at line 263.
53+
54+
2014-04-02 Added `clipon=False` to patch creation of wedges and shadows
55+
in `pie`.
56+
57+
2014-02-25 In backend_qt4agg changed from using update -> repaint under
58+
windows. See comment in source near `self._priv_update` for
59+
longer explaination.
60+
61+
2014-03-27 Added tests for pie ccw parameter. Removed pdf and svg images
62+
from tests for pie linewidth parameter.
63+
64+
2014-03-24 Changed the behaviour of axes to not ignore leading or trailing
65+
patches of height 0 (or width 0) while calculating the x and y
66+
axis limits. Patches having both height == 0 and width == 0 are
67+
ignored.
68+
69+
2014-03-24 Added bool kwarg (manage_xticks) to boxplot to enable/disable
70+
the managemnet of the xlimits and ticks when making a boxplot.
71+
Default in True which maintains current behavior by default.
72+
73+
2014-03-23 Fixed a bug in projections/polar.py by making sure that the theta
74+
value being calculated when given the mouse coordinates stays within
75+
the range of 0 and 2 * pi.
76+
77+
2014-03-22 Added the keyword arguments wedgeprops and textprops to pie.
78+
Users can control the wedge and text properties of the pie
79+
in more detail, if they choose.
80+
81+
2014-03-17 Bug was fixed in append_axes from the AxesDivider class would not
82+
append axes in the right location with respect to the reference
83+
locator axes
84+
85+
2014-03-13 Add parameter 'clockwise' to function pie, True by default.
86+
87+
2014-02-28 Added 'origin' kwarg to `spy`
88+
89+
2014-02-27 Implemented separate horizontal/vertical axes padding to the
90+
ImageGrid in the AxesGrid toolkit
91+
92+
2014-02-27 Allowed markevery property of matplotlib.lines.Line2D to be, an int
93+
numpy fancy index, slice object, or float. The float behaviour
94+
turns on markers at approximately equal display-coordinate-distances
95+
along the line.
96+
97+
2014-02-25 In backend_qt4agg changed from using update -> repaint under
98+
windows. See comment in source near `self._priv_update` for
99+
longer explaination.
100+
101+
2014-01-02 `triplot` now returns the artist it adds and support of line and
102+
marker kwargs has been improved. GBY
103+
104+
2013-12-30 Made streamplot grid size consistent for different types of density
105+
argument. A 30x30 grid is now used for both density=1 and
106+
density=(1, 1).
107+
108+
2013-12-03 Added a pure boxplot-drawing method that allow a more complete
109+
customization of boxplots. It takes a list of dicts contains stats.
110+
Also created a function (`cbook.boxplot_stats`) that generates the
111+
stats needed.
112+
113+
2013-11-28 Added qhull extension module to perform Delaunay triangulation more
114+
robustly than before. It is used by tri.Triangulation (and hence
115+
all pyplot.tri* methods) and mlab.griddata. Deprecated
116+
matplotlib.delaunay module. - IMT
117+
118+
2013-11-05 Add power-law normalization method. This is useful for,
119+
e.g., showing small populations in a "hist2d" histogram.
120+
121+
2013-10-27 Added get_rlabel_position and set_rlabel_position methods to
122+
PolarAxes to control angular position of radial tick labels.
123+
124+
2013-10-06 Add stride-based functions to mlab for easy creation of 2D arrays
125+
with less memory.
126+
127+
2013-10-06 Improve window and detrend functions in mlab, particulart support for
128+
2D arrays.
129+
130+
2013-10-06 Improve performance of all spectrum-related mlab functions and plots.
131+
132+
2013-10-06 Added support for magnitude, phase, and angle spectrums to
133+
axes.specgram, and support for magnitude, phase, angle, and complex
134+
spectrums to mlab-specgram.
135+
136+
2013-10-06 Added magnitude_spectrum, angle_spectrum, and phase_spectrum plots,
137+
as well as magnitude_spectrum, angle_spectrum, phase_spectrum,
138+
and complex_spectrum functions to mlab
139+
1140
2013-07-12 Added support for datetime axes to 2d plots. Axis values are passed
2141
through Axes.convert_xunits/Axes.convert_yunits before being used by
3142
contour/contourf, pcolormesh and pcolor.
@@ -8,16 +147,16 @@
8147
and matplotlib.units.Registry.
9148

10149
2013-06-26 Refactored the axes module: the axes module is now a folder,
11-
containing the following submodule:
12-
- _subplots.py, containing all the subplots helper methods
13-
- _base.py, containing several private methods and a new
14-
_AxesBase class. This _AxesBase class contains all the methods
15-
that are not directly linked to plots of the "old" Axes
16-
- _axes.py contains the Axes class. This class now inherits from
17-
_AxesBase: it contains all "plotting" methods and labelling
18-
methods.
19-
This refactoring should not affect the API. Only private methods
20-
are not importable from the axes module anymore.
150+
containing the following submodule:
151+
- _subplots.py, containing all the subplots helper methods
152+
- _base.py, containing several private methods and a new
153+
_AxesBase class. This _AxesBase class contains all the methods
154+
that are not directly linked to plots of the "old" Axes
155+
- _axes.py contains the Axes class. This class now inherits from
156+
_AxesBase: it contains all "plotting" methods and labelling
157+
methods.
158+
This refactoring should not affect the API. Only private methods
159+
are not importable from the axes module anymore.
21160

22161
2013-05-18 Added support for arbitrary rasterization resolutions to the
23162
SVG backend. Previously the resolution was hard coded to 72
@@ -33,22 +172,24 @@
33172

34173
2013-04-25 Changed all instances of:
35174

36-
from matplotlib import MatplotlibDeprecationWarning as mplDeprecation
37-
to:
38-
39-
from cbook import mplDeprecation
175+
from matplotlib import MatplotlibDeprecationWarning as mplDeprecation
176+
to:
40177

41-
and removed the import into the matplotlib namespace in __init__.py
42-
Thomas Caswell
178+
from cbook import mplDeprecation
43179

180+
and removed the import into the matplotlib namespace in __init__.py
181+
Thomas Caswell
44182

45183
2013-04-15 Added 'axes.xmargin' and 'axes.ymargin' to rpParams to set default
46-
margins on auto-scaleing. - TAC
184+
margins on auto-scaleing. - TAC
47185

48186
2013-04-16 Added patheffect support for Line2D objects. -JJL
49187

188+
2013-03-31 Added support for arbitrary unstructured user-specified
189+
triangulations to Axes3D.tricontour[f] - Damon McDougall
190+
50191
2013-03-19 Added support for passing `linestyle` kwarg to `step` so all `plot`
51-
kwargs are passed to the underlying `plot` call. -TAC
192+
kwargs are passed to the underlying `plot` call. -TAC
52193

53194
2013-02-25 Added classes CubicTriInterpolator, UniformTriRefiner, TriAnalyzer
54195
to matplotlib.tri module. - GBy

0 commit comments

Comments
 (0)