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

Skip to content

Commit c7ef847

Browse files
jbbrokawjbbrokaw
committed
Merge branch 'master' of github.com:matplotlib/matplotlib into axes3d-label-padding
2 parents f9593e0 + 59eda22 commit c7ef847

446 files changed

Lines changed: 11985 additions & 7461 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.

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#########################################
2+
# OS-specific temporary and backup files
3+
.DS_Store
4+
15
#########################################
26
# Editor temporary/working/backup files #
37
.#*
@@ -8,6 +12,7 @@
812
*.kdev4
913
.project
1014
.pydevproject
15+
.swp
1116

1217
# Compiled source #
1318
###################

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ script:
4343
- if [[ $BUILD_DOCS == false ]]; then mkdir ../tmp_test_dir; fi
4444
- if [[ $BUILD_DOCS == false ]]; then cd ../tmp_test_dir; fi
4545
- if [[ $BUILD_DOCS == false ]]; then gdb -return-child-result -batch -ex r -ex bt --args python ../matplotlib/tests.py -sv --processes=8 --process-timeout=300 $TEST_ARGS; fi
46-
- if [[ $BUILD_DOCS == true ]]; then cd doc; python make.py html --small; fi
46+
- if [[ $BUILD_DOCS == true ]]; then cd doc; python make.py html --small --warningsaserrors; fi
4747
# We don't build the LaTeX docs here, so linkchecker will complain
4848
- if [[ $BUILD_DOCS == true ]]; then touch build/html/Matplotlib.pdf; fi
4949
- if [[ $BUILD_DOCS == true ]]; then linkchecker build/html/index.html; fi

‎CHANGELOG‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2014-10-27 Allowed selection of the backend using the `MPLBACKEND` environment
2+
variable. Added documentation on backend selection methods.
3+
14
2014-09-27 Overhauled `colors.LightSource`. Added `LightSource.hillshade` to
25
allow the independent generation of illumination maps. Added new
36
types of blending for creating more visually appealing shaded relief
@@ -2736,7 +2739,7 @@
27362739
2007-02-12 Moved data files into lib/matplotlib so that setuptools'
27372740
develop mode works. Re-organized the mpl-data layout so
27382741
that this source structure is maintained in the
2739-
installation. (I.e. the 'fonts' and 'images'
2742+
installation. (i.e., the 'fonts' and 'images'
27402743
sub-directories are maintained in site-packages.) Suggest
27412744
removing site-packages/matplotlib/mpl-data and
27422745
~/.matplotlib/ttffont.cache before installing - ADS

‎doc/.DS_Store‎

10 KB
Binary file not shown.

‎doc/_static/boxplot_explanation.png‎

186 KB
Loading

‎doc/api/api_changes.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1339,7 +1339,7 @@ Changes for 0.90.1
13391339

13401340
Moved data files into lib/matplotlib so that setuptools' develop
13411341
mode works. Re-organized the mpl-data layout so that this source
1342-
structure is maintained in the installation. (I.e. the 'fonts' and
1342+
structure is maintained in the installation. (i.e., the 'fonts' and
13431343
'images' sub-directories are maintained in site-packages.).
13441344
Suggest removing site-packages/matplotlib/mpl-data and
13451345
~/.matplotlib/ttffont.cache before installing

‎doc/api/api_changes/2014-11-19_remove_set_graylevel.rst‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Deprecated `GraphicsContextBase.set_graylevel`
2+
``````````````````````````````````````````````
3+
4+
The `GraphicsContextBase.set_graylevel` function has been deprecated in 1.5 and
5+
will be removed in 1.6. It has been unused. The
6+
`GraphicsContextBase.set_foreground` could be used instead.

‎doc/conf.py‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
'sphinxext.github',
3535
'numpydoc']
3636

37-
exclude_patterns = ['api/api_changes/README.rst', 'users/whats_new/README.rst']
37+
exclude_patterns = ['api/api_changes/*', 'users/whats_new/*']
3838

3939
# Use IPython's console highlighting by default
4040
try:
@@ -222,9 +222,9 @@
222222
# (source start file, target name, title, author, document class [howto/manual]).
223223

224224
latex_documents = [
225-
('contents', 'Matplotlib.tex', 'Matplotlib',
226-
'John Hunter, Darren Dale, Eric Firing, Michael Droettboom and the '
227-
'matplotlib development team', 'manual'),
225+
('contents', 'Matplotlib.tex', 'Matplotlib',
226+
'John Hunter, Darren Dale, Eric Firing, Michael Droettboom and the '
227+
'matplotlib development team', 'manual'),
228228
]
229229

230230

@@ -233,7 +233,7 @@
233233
latex_logo = None
234234

235235
# Additional stuff for the LaTeX preamble.
236-
latex_preamble =r"""
236+
latex_preamble = r"""
237237
% In the parameters section, place a newline after the Parameters
238238
% header. (This is stolen directly from Numpy's conf.py, since it
239239
% affects Numpy-style docstrings).
@@ -271,11 +271,11 @@
271271
""" % matplotlib.__version__numpy__
272272

273273
texinfo_documents = [
274-
("contents", 'matplotlib', 'Matplotlib Documentation',
275-
'John Hunter@*Darren Dale@*Eric Firing@*Michael Droettboom@*'
276-
'The matplotlib development team',
277-
'Matplotlib', "Python plotting package", 'Programming',
278-
1),
274+
("contents", 'matplotlib', 'Matplotlib Documentation',
275+
'John Hunter@*Darren Dale@*Eric Firing@*Michael Droettboom@*'
276+
'The matplotlib development team',
277+
'Matplotlib', "Python plotting package", 'Programming',
278+
1),
279279
]
280280

281281
try:
@@ -312,10 +312,15 @@ class QMainWindow(object):
312312
pass
313313

314314

315+
class MySip(MagicMock):
316+
def getapi(*args):
317+
return 1
318+
319+
315320
mockwxversion = MagicMock()
316321
mockwx = MyWX()
322+
mocksip = MySip()
317323
mockpyqt4 = MyPyQt4()
318-
mocksip = MagicMock()
319324
sys.modules['wxversion'] = mockwxversion
320325
sys.modules['wx'] = mockwx
321326
sys.modules['sip'] = mocksip

‎doc/devel/coding_guide.rst‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ illustration) just passes them on to the
201201
self.update(kwargs)
202202

203203
``update`` does the work looking for methods named like
204-
``set_property`` if ``property`` is a keyword argument. I.e., no one
204+
``set_property`` if ``property`` is a keyword argument. i.e., no one
205205
looks at the keywords, they just get passed through the API to the
206206
artist constructor which looks for suitably named methods and calls
207207
them with the value.
@@ -270,15 +270,20 @@ external backend via the ``module`` directive. if
270270

271271
backend : module://my_backend
272272

273-
* with the use directive is your script::
274273

275-
import matplotlib
276-
matplotlib.use('module://my_backend')
274+
* with the :envvar:`MPLBACKEND` environment variable::
275+
276+
> export MPLBACKEND="module://my_backend"
277+
> python simple_plot.py
277278

278-
* from the command shell with the -d flag::
279+
* from the command shell with the `-d` flag::
279280

280-
> python simple_plot.py -d module://my_backend
281+
> python simple_plot.py -dmodule://my_backend
281282

283+
* with the use directive in your script::
284+
285+
import matplotlib
286+
matplotlib.use('module://my_backend')
282287

283288
.. _sample-data:
284289

‎doc/devel/license.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ most widely used license is the GPL, which in addition to granting you
2828
full rights to the source code including redistribution, carries with
2929
it an extra obligation. If you use GPL code in your own code, or link
3030
with it, your product must be released under a GPL compatible
31-
license. I.e., you are required to give the source code to other
31+
license. i.e., you are required to give the source code to other
3232
people and give them the right to redistribute it as well. Many of the
3333
most famous and widely used open source projects are released under
3434
the GPL, including linux, gcc, emacs and sage.

0 commit comments

Comments
 (0)