8000 Merge remote-tracking branch 'matplotlib/v2.x' · matplotlib/matplotlib@8c5b548 · GitHub
[go: up one dir, main page]

Skip to content
Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 8c5b548

Browse files
committed
Merge remote-tracking branch 'matplotlib/v2.x'
2 parents 4932e2b + 37592eb commit 8c5b548

File tree

4 files changed

+97
-50
lines changed

4 files changed

+97
-50
lines changed

doc/users/github_stats.rst

Lines changed: 81 additions & 23 deletions
395
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
.. _github-stats:
22

3-
Github Stats
3+
GitHub Stats
44
============ 8000
55

6-
GitHub stats for 2015/10/29 - 2016/12/04 (tag: v1.5.0)
6+
GitHub stats for 2015/10/29 - 2016/12/18 (tag: v1.5.0)
77

88
These lists are automatically generated, and may be incomplete or contain duplicates.
99

10-
We closed 776 issues and merged 638 pull requests.
10+
We closed 809 issues and merged 655 pull requests.
1111

12-
The following 211 authors contributed 2839 commits.
12+
The following 219 authors contributed 3010 commits.
1313

1414
* 4over7
1515
* AbdealiJK
@@ -19,7 +19,10 @@ The following 211 authors contributed 2839 commits.
1919
* Alberto
2020
* alcinos
2121
* Alex Rothberg
22+
* Alexis Bienvenüe
2223
* Ali Uneri
24+
* Alvaro Sanchez
25+
* alvarosg
2326
* AndersonDaniel
2427
* Andreas Hilboll
2528
* Andreas Mayer
@@ -39,13 +42,16 @@ The following 211 authors contributed 2839 commits.
3942
* Chen Karako
4043
* Chris Holdgraf
4144
* Christian Stade-Schuldt
45+
* Christoph Deil
4246
* Christoph Gohlke
4347
* Cimarron Mittelsteadt
4448
* CJ Carey
4549
* Conner R. Phillips
4650
* DaCoEx
4751
* Dan Hickstein
4852
* Daniel C. Marcu
53+
* danielballan
54+
* Danny Hermes
4955
* David A
5056
* David Kent
5157
* David Stansby
@@ -104,6 +110,7 @@ The following 211 authors contributed 2839 commits.
104110
* Jeffrey Hokanson @ Loki
105111
* Jens Hedegaard Nielsen
106112
* John Vandenberg
113+
* JojoBoulix
107114
* jonchar
108115
* Joseph Fox-Rabinovitz
109116
* Joseph Jon Booker
@@ -143,6 +150,7 @@ The following 211 authors contributed 2839 commits.
143150
* Mher Kazandjian
144151
* Michael Droettboom
145152
* Michiel de Hoon
153+
* Mike Henninger
146154
* Mike Jarvis
147155
* MinRK
148156
* mlub
@@ -224,19 +232,36 @@ The following 211 authors contributed 2839 commits.
224232

225233
GitHub issues and pull requests:
226234

227-
Pull Requests (638):
235+
Pull Requests (655):
228236

237+
* :ghpull:`7585`: [MRG+1] Fix a bug in TextBox where shortcut keys were not being reenabled
238+
* :ghpull:`7628`: picker may not be callable.
239+
* :ghpull:`7464`: ENH: _StringFuncParser to get numerical functions callables from strings
240+
* :ghpull:`7622`: Mrg animation merge
241+
* :ghpull:`7618`: DOC: fixed typo in mlab.py
242+
* :ghpull:`7596`: Delay fc-list warning by 5s.
243+
* :ghpull:`7607`: TST: regenerate patheffect2
244+
* :ghpull:`7608`: Don't call np.min on generator.
245+
* :ghpull:`7570`: Correctly skip colors for nan points given to scatter
246+
* :ghpull:`7605`: Make bars stick to explicitly-specified edges.
247+
* :ghpull:`6597`: Reproducible PS/PDF output (master)
248+
* :ghpull:`7546`: Deprecate update_datalim_numerix&update_from_data.
249+
* :ghpull:`7574`: Docs edits
250+
* :ghpull:`7538`: Don't work out packages to install if user requests information from setup.p
251+
* :ghpull:`7577`: Spelling fix: corosponding -> corresponding
252+
* :ghpull:`7536`: Rectangle patch angle attribute and patch __str__ improvements
253+
* :ghpull:`7547`: Additional cleanups
229254
* :ghpull:`7544`: Cleanups
230255
* :ghpull:`7548`: Clarify to_rgba docstring.
231256
* :ghpull:`7476`: Sticky margins
232257
* :ghpull:`7552`: Correctly extend a lognormed colorbar
233-
* :ghpull:`7499`: [MRG] Improve the the marker table in markers_api documentation
258+
* :ghpull:`7499`: Improve the the marker table in markers_api documentation
234259
* :ghpull:`7468`: TST: Enable pytest-xdist
235260
* :ghpull:`7530`: MAINT: TkAgg default backend depends on tkinter
236261
* :ghpull:`7531`: double tolerance for test_png.py/pngsuite on Windows
237262
* :ghpull:`7533`: FIX chinese character are hard to deal with in latex
238263
* :ghpull:`7525`: Avoid division by zero if headlength=0 for quiver
239-
* :ghpull:`7522`: [MRG+1] Check at least one argument is provided for plt.table
264+
* :ghpull:`7522`: Check at least one argument is provided for plt.table
240265
* :ghpull:`7520`: Fix table.py bug
241266
* :ghpull:`7397`: Numpydoc for backends
242267
* :ghpull:`7513`: Doc: Typo in gridspec example subtitle
@@ -282,11 +307,11 @@ Pull Requests (638):
282307
* :ghpull:`7386`: ENH examples are now reproducible
283308
* :ghpull:`7395`: Drop code that supports numpy pre-1.6.
284309
* :ghpull:`7385`: [MRG+1] remove unused random import
285-
* :ghpull:`7236`: [MRG+1] ENH Improving the contribution guidelines
310+
* :ghpull:`7236`: ENH Improving the contribution guidelines
286311
* :ghpull:`7370`: [MRG+1] Add example use of axes.spines.SIDE prop in matplotlibrc
287-
* :ghpull:`7367`: [MRG+1] Warn on invalid log axis limits, per issue #7299
312+
* :ghpull:`7367`: Warn on invalid log axis limits, per issue #7299
288313
* :ghpull:`7360`: Updated violin plot example as per suggestions in issue #7251
289-
* :ghpull:`7357`: [mrg+1] Added notes on how to use matplotlib in pyenv
314+
* :ghpull:`7357`: Added notes on how to use matplotlib in pyenv
290315
* :ghpull:`7329`: DOC MEP12 - converted animation to SG/MEP12 compatible
291316
* :ghpull:`7337`: FIX symlog scale now shows negative labels.
292317
* :ghpull:`7354`: fix small error in poly_editor example
@@ -315,12 +340,12 @@ Pull Requests (638):
315340
* :ghpull:`7298`: Changed Examples for Pep8 Compliance
316341
* :ghpull:`7295`: MAINT finance module is deprecated
317342
* :ghpull:`7214`: FIX: Only render single patch for scatter
318-
* :ghpull:`7297`: [MRG] MAINT docstring appending doesn't mess with rendering anymore.
319-
* :ghpull:`6907`: [MRG+1] Filled + and x markers
343+
* :ghpull:`7297`: MAINT docstring appending doesn't mess with rendering anymore.
344+
* :ghpull:`6907`: Filled + and x markers
320345
* :ghpull:`7288`: Style typos fixes
321346
* :ghpull:`7277`: MEP12 - added sphinx-gallery docstrings
322347
* :ghpull:`7286`: DOC: Fix for #7283 by adding a trailing underscore to misrendered URLs
323-
* :ghpull:`7285`: [MRG+1] added some fixes to the documentation of the functions
348+
* :ghpull:`7285`: added some fixes to the documentation of the functions
324349
* :ghpull:`6690`: Tidying up and tweaking mplot3d examples [MEP12]
325350
* :ghpull:`7273`: Fix image watermark example where image was hidden by axes (#7265)
326351
* :ghpull:`7276`: FIX: don't compute flier positions if not showing
@@ -332,7 +357,7 @@ Pull Requests (638):
332357
* :ghpull:`7256`: CI: skip failing test on appveyor
333358
* :ghpull:`7255`: CI: pin to qt4
334359
* :ghpull:`7229`: DOC: instructions on installing matplotlib for dev
335-
* :ghpull:`7252`: [MRG+2] ENH: improve PySide2 loading
360+
* :ghpull:`7252`: ENH: improve PySide2 loading
336361
* :ghpull:`7245`: TST: Always produce image comparison test result images
337362
* :ghpull:`6677`: Remove a copy in pcolormesh.
338363
* :ghpull:`6814`: Customize violin plot demo, see #6723
@@ -359,12 +384,12 @@ Pull Requests (638):
359384
* :ghpull:`7019`: Check for fontproperties in figure.suptitle.
360385
* :ghpull:`7145`: Add ``style`` to api doc; fix capitalization.
361386
* :ghpull:`7097`: ``image_comparison`` decorator refactor
362-
* :ghpull:`7096`: [MRG] DOC refer to plot in the scatter plot doc
387+
* :ghpull:`7096`: DOC refer to plot in the scatter plot doc
363388
* :ghpull:`7140`: FIX added matplotlib.testing.nose.plugins to setupext.py
364389
* :ghpull:`5112`: OffsetImage: use dpi_cor in get_extent
365390
* :ghpull:`7136`: DOC: minor fix in development_workflow.rst
366391
* :ghpull:`7137`: DOC: improve engineering formatter example
367-
* :ghpull:`7131`: Fix branch name in "Deleting a branch on GitHub\_" section
392+
* :ghpull:`7131`: Fix branch name in "Deleting a branch on GitHub" section
368393
* :ghpull:`6521`: Issue #6429 fix
369394
* :ghpull:`7111`: [DOC] Fix example following comments in issue #6865
370
* :ghpull:`7118`: PR # 7038 rebased (DOC specgram() documentation now in numpy style)
@@ -383,7 +408,7 @@ Pull Requests (638):
383408
* :ghpull:`7077`: label_outer() should remove inner minor ticks too.
384409
* :ghpull:`7037`: DOC change axhspan to numpydoc format
385410
* :ghpull:`7047`: DOC - SpanSelector widget documentation
386-
* :ghpull:`7049`: [MRG] Documentated dependencies to the doc and remove unecessary dependencies.
411+
* :ghpull:`7049`: Documentated dependencies to the doc and remove unecessary dependencies.
387412
* :ghpull:`7063`: Tweek tol for test_hist_steplog to fix tests on appveyor
388413
* :ghpull:`7055`: FIX: testings.nose was not installed
389414
* :ghpull:`7058`: Minor animation fixes
@@ -546,7 +571,7 @@ Pull Requests (638):
546571
* :ghpull:`6472`: Install all dependencies from pypi
547572
* :ghpull:`6482`: Skip test broken with numpy 1.11
548573
* :ghpull:`6475`: Do not turn on interactive mode on in example script
549-
* :ghpull:`6442`: MRG: loading TCL / Tk symbols dynamically
574+
* :ghpull:`6442`: loading TCL / Tk symbols dynamically
550575
* :ghpull:`6467`: ENH: add unified seaborn style sheet
551576
* :ghpull:`6465`: updated boxplot figure
552577
* :ghpull:`6462`: CI: Use Miniconda already installed on AppVeyor.
@@ -865,8 +890,42 @@ Pull Requests (638):
865890
* :ghpull:`5357`: Fixed typo
866891
* :ghpull:`4920`: ENH: Add TransformedPatchPath for clipping.
867892

868-
Issues (776):
893+
Issues (809):
869894

895+
* :ghissue:`7637`: Stacked 2D plots with interconnections in Matplotlib
896+
* :ghissue:`7353`: auto legend position changes upon saving the figure
897+
* :ghissue:`7626`: Saturation mask for imshow()
898+
* :ghissue:`7623`: potential bug with plt.arrow and plt.annotate when setting linestyle via tuples
899+
* :ghissue:`7005`: rcParams['font.size'] is consulted at render time
900+
* :ghissue:`7587`: BUG: shared log axes lose _minpos and revert to default
901+
* :ghissue:`7493`: Plotting zero values with logarithmic axes triggers OverflowError, Matplotlib hangs permanently
902+
* :ghissue:`7595`: math domain error using symlog norm
903+
* :ghissue:`7588`: 2.0.0rc1 cannot import name '_macosx'
904+
* :ghissue:`2051`: Consider making default verticalalignment ``baseline``
905+
* :ghissue:`4867`: Add additional minor labels in log axis with a span less than two decades
906+
* :ghissue:`7489`: Too small axis arrow when savefig to png
907+
* :ghissue:`7611`: UnicodeDecodeError when using matplotlib save SVG file and open it again
908+
* :ghissue:`7592`: font cache: a possibility to disable building it
909+
* :ghissue:`5836`: Repeated warning about fc-list
910+
* :ghissue:`7609`: The best channel to ask questions related to using matplotlib
911+
* :ghissue:`7141`: Feature request: auto locate minor ticks on log scaled color bar
912+
* :ghissue:`3489`: matplotlib scatter shifts color codes when NaN is present
913+
* :ghissue:`4414`: Specifying histtype='stepfilled' and normed=True when using plt.hist causes ymax to be set incorrectly
914+
* :ghissue:`7597`: python complain about "This application failed to start because it could not find or load the Qt platform plugin 'xcb' " after an update of matplotlib
915+
* :ghissue:`7578`: Validate steps input to ``MaxNLocator``
916+
* :ghissue:`7590`: Subtick labels are not disabled in classic style
917+
* :ghissue:`6317`: PDF file generation is not deterministic - results in different outputs on the same input
918+
* :ghissue:`6543`: Why does fill_betweenx not have interpolate?
919+
* :ghissue:`7437`: Broken path to example with strpdate2num
920+
* :ghissue:`7593`: Issue: Applying Axis Limits
921+
* :ghissue:`7591`: Number of subplots in mpl.axes.Subplot object
922+
* :ghissue:`7056`: setup.py --name and friends broken
923+
* :ghissue:`7044`: location of convert in rcparams on windows
924+
* :ghissue:`6813`: avoid hiding edge pixels of images
925+
* :ghissue:`7579`: OS X libpng incompatability
926+
* :ghissue:`7576`: v2.0.0rc1 conda-forge dependency issue
927+
* :ghissue:`7558`: Colorbar becomes 0 to 1 after colorbar ax.yaxis.set_major_formatter
928+
* :ghissue:`7526`: Cannot Disable TkAgg Backend
870929
* :ghissue:`6565`: Questionable margin-cancellation logic
871930
* :ghissue:`7175`: new margin system doesn't handle negative values in bars
872931
* :ghissue:`5201`: issue with colorbar using LogNorm and extend='min'
@@ -898,8 +957,8 @@ Issues (776):
898957
* :ghissue:`7478`: 'alpha' kwarg overrides facecolor='none' when plotting circle
899958
* :ghissue:`7375`: Patch edgecolor of a legend item does not follow look of figure
900959
* :ghissue:`6873`: examples/api/skewt.py is not displaying the right part of the grid by default
901-
* :ghissue:`7350`: Colors drawn outside axis for hist2d
902960
* :ghissue:`6773`: Shifted image extents in 2.0.0.b3
961+
* :ghissue:`7350`: Colors drawn outside axis for hist2d
903962
* :ghissue:`7485`: Is there a way to subclass the zoom() function from the NavigationToolbar backends and modify its mouse button definition?
904963
* :ghissue:`7396`: Bump numpy minimal version to 1.7.0?
905964
* :ghissue:`7466`: missing trigger for autoscale
@@ -910,7 +969,6 @@ Issues (776):
910969
* :ghissue:`5076`: RuntimeError: LaTeX was not able to process the following string: 'z=$\\\\mathregular{{}^{}_{\\\\}}$' in matplotlib
911970
* :ghissue:`7450`: Using Matplotlib in Abaqus
912971
* :ghissue:`7314`: Better error message in scatter plot when len(x) != len(c)
913-
* :ghissue:`7341`: slightly imprecise tick positioning
914972
* :ghissue:`7432`: Failure to re-render after Line2D.set_color
915973
* :ghissue:`6695`: support markdown or similar
916974
* :ghissue:`6228`: Rasterizing patch changes filling of hatches in pdf backend
@@ -944,9 +1002,9 @@ Issues (776):
9441002
* :ghissue:`7391`: How to apply ax.margins to current axes limits?
9451003
* :ghissue:`7234`: Improving documentation: Tests failing on a osx setup
9461004
* :ghissue:`7379`: Mp4's generated by movie writer do not appear work in browser
947-
* :ghissue:`6926`: SVG backend closes BytesIO on print if were ``usetex=True`` and ``cleanup`` decorator used
9481005
* :ghissue:`6870`: Figure is unpicklable after ``savefig``
9491006
* :ghissue:`6181`: When using Agg driver, pickling fails with TypeError after writing figure to PDF
1007+
* :ghissue:`6926`: SVG backend closes BytesIO on print if were ``usetex=True`` and ``cleanup`` decorator used
9501008
* :ghissue:`3899`: Pickle not working in interactive ipython session
9511009
* :ghissue:`7251`: Improve violin plot demo
9521010
* :ghissue:`7146`: symlog scale no longer shows labels on the negative side
@@ -1042,8 +1100,8 @@ Issues (776):
10421100
* :ghissue:`3645`: Proposal: Add rc setting to control dash spacing
10431101
* :ghissue:`7009`: No good way to disable SpanSelector
10441102
* :ghissue:`7040`: It is getting increasingly difficult to build the matplotlib documentation
1045-
* :ghissue:`6965`: ArtistAnimation cannot animate Figure-only artists
10461103
* :ghissue:`6964`: Docstring for ArtistAnimation is incorrect
1104+
* :ghissue:`6965`: ArtistAnimation cannot animate Figure-only artists
10471105
* :ghissue:`7062`: remove the contour on a Basemap object
10481106
* :ghissue:`7061`: remove the contour on Basemap
10491107
* :ghissue:`7054`: Whether the new version 2.0 will support high-definition screen?

examples/tests/backend_driver.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,6 @@
144144
'custom_ticker1.py',
145145
'customize_rc.py',
146146
'dashpointlabel.py',
147-
'date_demo1.py',
148-
'date_demo2.py',
149147
'date_demo_convert.py',
150148
'date_demo_rrule.py',
151149
'date_index_formatter.py',
@@ -164,7 +162,6 @@
164162
'figure_title.py',
165163
'fill_between_demo.py',
166164
'fill_spiral.py',
167-
'finance_demo.py',
168165
'findobj_demo.py',
169166
'fonts_demo.py',
170167
'fonts_demo_kw.py',

lib/matplotlib/markers.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,17 @@
5959
6060
`style`:
6161
the style of the regular symbol:
62-
""""""
63-
===== ===================================
64-
Value Description
65-
0 a regular polygon
66-
1 a star-like symbol
67-
2 an asterisk
68-
3 a circle (`numsides` and `angle` is
69-
ignored)
70-
===== ===================================
71-
""""""
62+
63+
0
64+
a regular polygon
65+
1
66+
a star-like symbol
67+
2
68+
an asterisk
69+
3
70+
a circle (`numsides` and `angle` is
71+
ignored)
72+
7273
`angle`:
7374
the angle of rotation of the symbol
7475
============================== ===============================================

src/_tkagg.cpp

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -183,32 +183,23 @@ static int PyAggImagePhoto(ClientData clientdata, Tcl_Interp *interp, int
183183
return TCL_OK;
184184
}
185185

186-
static PyObject *_pyobj_addr(PyObject *self, PyObject *args)
187-
{
188-
PyObject *pyobj;
189-
if (!PyArg_ParseTuple(args, "O", &pyobj)) {
190-
return NULL;
191-
}
192-
return Py_BuildValue("n", (Py_ssize_t)pyobj);
193-
}
194-
195186
static PyObject *_tkinit(PyObject *self, PyObject *args)
196187
{
197188
Tcl_Interp *interp;
198189
TkappObject *app;
199190

200-
Py_ssize_t arg;
191+
PyObject *arg;
201192
int is_interp;
202-
if (!PyArg_ParseTuple(args, "ni", &arg, &is_interp)) {
193+
if (!PyArg_ParseTuple(args, "Oi", &arg, &is_interp)) {
203194
return NULL;
204195
}
205196

206197
if (is_interp) {
207-
interp = (Tcl_Interp *)arg;
198+
interp = (Tcl_Interp *)PyLong_AsVoidPtr(arg);
208199
} else {
209200
/* Do it the hard way. This will break if the TkappObject
210201
layout changes */
211-
app = (TkappObject *)arg;
202+
app = (TkappObject *)PyLong_AsVoidPtr(arg);
212203
interp = app->interp;
213204
}
214205

@@ -226,7 +217,7 @@ static PyObject *_tkinit(PyObject *self, PyObject *args)
226217

227218
static PyMethodDef functions[] = {
228219
/* Tkinter interface stuff */
229-
{ "_pyobj_addr", (PyCFunction)_pyobj_addr, 1 }, { "tkinit", (PyCFunction)_tkinit, 1 },
220+
{ "tkinit", (PyCFunction)_tkinit, 1 },
230221
{ NULL, NULL } /* sentinel */
231222
};
232223

0 commit comments

Comments
 (0)
0