[Python-modules-commits] [matplotlib] 07/11: merge patched into master
Sandro Tosi
morph at moszumanska.debian.org
Tue Jan 5 23:09:21 UTC 2016
This is an automated email from the git hooks/post-receive script.
morph pushed a commit to branch master
in repository matplotlib.
commit ad4badb1a76bc60d7519154ee26abbb978452d70
Merge: 5afe155 304fe13
Author: Sandro Tosi <morph at debian.org>
Date: Mon Jan 4 00:16:50 2016 +0000
merge patched into master
.gitignore | 1 +
.travis.yml | 14 +-
CHANGELOG | 5 +
INSTALL | 39 +-
LICENSE/LICENSE_SCIKIT-IMAGE | 31 -
README.rst | 16 +-
debian/.git-dpm | 6 +-
.../10ef9a7e26dc34328b7ec7fd0ed2c2db6104b342.patch | 27 -
.../patches/20_matplotlibrc_path_search_fix.patch | 4 +-
.../40_bts608939_draw_markers_description.patch | 23 -
.../50_bts608942_spaces_in_param_args.patch | 59 -
.../70_bts720549_try_StayPuft_for_xkcd.patch | 2 +-
.../84aa9f77e61df45682dd7867d35191184414c7b0.patch | 148 -
.../9bc518230684b3a8bb69af60e160f90e1091cd0c.patch | 25 -
.../ada2f99e13da03c9352e0c528f1b6feaa2863dc3.patch | 41 -
.../cdc52bfecb95477972d5345ccff9719c02372f0f.patch | 61 -
.../d0153b7c86e44a7a8acfbc593da03c7e8c9d125b.patch | 97 -
.../f67ea3c62f33f0e675b3e091044c4983ae01b085.patch | 42 -
.../gtk3cairo_check_no-multiprocessing.patch | 6 +-
debian/patches/multiarch-tktcl.patch | 6 +-
debian/patches/series | 9 -
doc/.DS_Store | Bin 10244 -> 0 bytes
doc/_static/logo2.png | Bin 27238 -> 0 bytes
doc/_static/logo2.svg | 552 +
doc/_templates/citing.html | 1 +
doc/_templates/index.html | 21 +-
doc/_templates/layout.html | 2 +-
doc/conf.py | 5 +-
doc/devel/gitwash/set_up_fork.rst | 2 +-
doc/devel/release_guide.rst | 79 +-
doc/devel/testing.rst | 40 +-
doc/faq/howto_faq.rst | 2 +-
doc/faq/index.rst | 2 +-
doc/faq/installing_faq.rst | 10 +-
doc/faq/troubleshooting_faq.rst | 11 +-
doc/faq/usage_faq.rst | 2 +-
doc/faq/virtualenv_faq.rst | 139 +
doc/glossary/index.rst | 4 +-
doc/make.py | 2 +-
doc/mpl_toolkits/axes_grid/api/index.rst | 12 +
.../axes_grid/api/inset_locator_api.rst | 7 +
doc/mpl_toolkits/index.rst | 4 +-
doc/pyplots/pyplot_scales.py | 2 +-
doc/pyplots/tex_demo.py | 2 +-
doc/resources/index.rst | 4 +
doc/style_changes.rst | 10 +-
doc/users/colormaps.rst | 147 +-
doc/users/customizing.rst | 8 +-
doc/users/github_stats.rst | 2369 +-
doc/users/intro.rst | 4 +-
doc/users/plotting/colormaps/Lfunction.py | 172 -
doc/users/plotting/colormaps/colorconv.py | 684 -
doc/users/plotting/colormaps/colormaps.py | 22 +
doc/users/plotting/colormaps/grayscale.py | 41 +-
doc/users/plotting/colormaps/lightness.py | 95 +-
doc/users/plotting/examples/axes_zoom_effect.py | 1 -
doc/users/pyplot_tutorial.rst | 41 +-
doc/users/recipes.rst | 21 +-
doc/users/screenshots.rst | 7 +-
doc/users/usetex.rst | 2 +-
doc/users/whats_new.rst | 30 +-
examples/README.txt | 8 +-
examples/api/date_demo.py | 9 +-
examples/api/filled_step.py | 2 +-
examples/color/colormaps_reference.py | 12 +-
examples/pylab_examples/agg_buffer.py | 9 +-
examples/pylab_examples/barchart_demo2.py | 231 +-
examples/pylab_examples/centered_ticklabels.py | 9 +-
examples/pylab_examples/clippedline.py | 58 -
examples/pylab_examples/demo_bboximage.py | 2 +-
examples/pylab_examples/scatter_demo2.py | 9 +-
examples/tests/backend_driver.py | 1 -
examples/units/basic_units.py | 6 +-
examples/user_interfaces/mathtext_wx.py | 5 +-
lib/matplotlib/__init__.py | 13 +-
lib/matplotlib/_mathtext_data.py | 2 +-
lib/matplotlib/_version.py | 4 +-
lib/matplotlib/animation.py | 45 +-
lib/matplotlib/artist.py | 4 +-
lib/matplotlib/axes/_axes.py | 408 +-
lib/matplotlib/axes/_base.py | 29 +-
lib/matplotlib/backend_bases.py | 2 +
lib/matplotlib/backends/backend_agg.py | 24 +-
lib/matplotlib/backends/backend_nbagg.py | 37 +-
lib/matplotlib/backends/backend_pdf.py | 2 +-
lib/matplotlib/backends/backend_pgf.py | 11 +-
lib/matplotlib/backends/backend_qt5.py | 4 +-
lib/matplotlib/backends/backend_webagg.py | 2 +-
lib/matplotlib/backends/backend_webagg_core.py | 34 +
lib/matplotlib/backends/backend_wx.py | 57 +-
lib/matplotlib/backends/qt_editor/figureoptions.py | 2 +-
lib/matplotlib/cbook.py | 41 +-
lib/matplotlib/cm.py | 11 +-
lib/matplotlib/colorbar.py | 2 +-
lib/matplotlib/colors.py | 25 +-
lib/matplotlib/container.py | 5 +-
lib/matplotlib/contour.py | 40 +-
lib/matplotlib/dates.py | 12 +-
.../delaunay/VoronoiDiagramGenerator.cpp | 8 +-
lib/matplotlib/dviread.py | 6 +-
lib/matplotlib/figure.py | 40 +-
lib/matplotlib/font_manager.py | 3 +-
lib/matplotlib/fontconfig_pattern.py | 3 -
lib/matplotlib/image.py | 8 +-
lib/matplotlib/lines.py | 11 +-
lib/matplotlib/mathtext.py | 9 +-
lib/matplotlib/mlab.py | 11 +-
lib/matplotlib/mpl-data/stylelib/classic.mplstyle | 4 +-
lib/matplotlib/patches.py | 29 +-
lib/matplotlib/patheffects.py | 3 +
lib/matplotlib/rcsetup.py | 26 +-
lib/matplotlib/sphinxext/plot_directive.py | 21 +-
lib/matplotlib/stackplot.py | 3 +-
lib/matplotlib/streamplot.py | 2 +-
lib/matplotlib/testing/__init__.py | 35 +
lib/matplotlib/testing/decorators.py | 15 +-
lib/matplotlib/testing/disable_internet.py | 150 +
lib/matplotlib/tests/__init__.py | 37 +-
.../baseline_images/test_axes/marker_edges.png | Bin 23080 -> 24384 bytes
.../test_axes/stackplot_test_baseline.png | Bin 52164 -> 51991 bytes
.../test_collections/size_in_xy.png | Bin 0 -> 15666 bytes
.../test_contour/contour_labels_size_color.png | Bin 0 -> 6832 bytes
.../test_mathtext/mathfont_cm_49.png | Bin 11273 -> 11387 bytes
.../test_mathtext/mathfont_stix_49.png | Bin 11273 -> 11387 bytes
.../test_mathtext/mathfont_stixsans_49.png | Bin 11327 -> 11387 bytes
.../test_mathtext/mathtext_cm_79.pdf | Bin 0 -> 7232 bytes
.../test_mathtext/mathtext_cm_79.png | Bin 0 -> 1462 bytes
.../test_mathtext/mathtext_cm_79.svg | 236 +
.../test_mathtext/mathtext_dejavusans_79.pdf | Bin 0 -> 6199 bytes
.../test_mathtext/mathtext_dejavusans_79.png | Bin 0 -> 1672 bytes
.../test_mathtext/mathtext_dejavusans_79.svg | 134 +
.../test_mathtext/mathtext_dejavuserif_79.pdf | Bin 0 -> 6351 bytes
.../test_mathtext/mathtext_dejavuserif_79.png | Bin 0 -> 1655 bytes
.../test_mathtext/mathtext_dejavuserif_79.svg | 157 +
.../test_mathtext/mathtext_stix_79.pdf | Bin 0 -> 6961 bytes
.../test_mathtext/mathtext_stix_79.png | Bin 0 -> 1501 bytes
.../test_mathtext/mathtext_stix_79.svg | 201 +
.../test_mathtext/mathtext_stixsans_79.pdf | Bin 0 -> 8435 bytes
.../test_mathtext/mathtext_stixsans_79.png | Bin 0 -> 1461 bytes
.../test_mathtext/mathtext_stixsans_79.svg | 161 +
.../tests/baseline_images/test_path/xkcd.pdf | Bin 36093 -> 44113 bytes
.../tests/baseline_images/test_path/xkcd.png | Bin 29981 -> 30067 bytes
.../tests/baseline_images/test_path/xkcd.svg | 24006 +++++++++----------
.../baseline_images/test_text/text_contains.png | Bin 30772 -> 30301 bytes
lib/matplotlib/tests/test_artist.py | 13 +-
lib/matplotlib/tests/test_axes.py | 160 +-
lib/matplotlib/tests/test_backend_ps.py | 12 +
lib/matplotlib/tests/test_cbook.py | 39 +
lib/matplotlib/tests/test_collections.py | 20 +
lib/matplotlib/tests/test_colorbar.py | 16 +
lib/matplotlib/tests/test_container.py | 14 +
lib/matplotlib/tests/test_contour.py | 28 +
lib/matplotlib/tests/test_cycles.py | 83 +-
lib/matplotlib/tests/test_dates.py | 2 +-
lib/matplotlib/tests/test_figure.py | 12 +
lib/matplotlib/tests/test_lines.py | 5 +-
lib/matplotlib/tests/test_mathtext.py | 1 +
lib/matplotlib/tests/test_mlab.py | 4 +-
lib/matplotlib/tests/test_path.py | 36 +
lib/matplotlib/tests/test_pickle.py | 32 +
lib/matplotlib/tests/test_rcparams.py | 31 +-
lib/matplotlib/tests/test_style.py | 2 +
lib/matplotlib/tests/test_subplots.py | 3 +-
lib/matplotlib/tests/test_text.py | 24 +
lib/matplotlib/tests/test_triangulation.py | 12 +-
lib/matplotlib/tests/test_widgets.py | 2 +-
lib/matplotlib/texmanager.py | 4 +-
lib/matplotlib/textpath.py | 2 +-
lib/matplotlib/ticker.py | 10 +-
lib/matplotlib/transforms.py | 25 +-
lib/matplotlib/tri/_tri_wrapper.cpp | 16 +-
lib/matplotlib/tri/tricontour.py | 10 +-
lib/matplotlib/widgets.py | 84 +-
lib/mpl_toolkits/axes_grid1/axes_divider.py | 285 +-
lib/mpl_toolkits/axes_grid1/colorbar.py | 5 +-
lib/mpl_toolkits/axes_grid1/inset_locator.py | 408 +-
lib/mpl_toolkits/tests/test_axes_grid1.py | 24 +-
matplotlibrc.template | 4 +-
setup.cfg.template | 6 +
setup.py | 122 +-
setupext.py | 61 +-
src/_backend_agg.h | 45 +-
src/_backend_agg_wrapper.cpp | 57 +-
src/_contour_wrapper.cpp | 16 +-
src/_gtkagg.cpp | 7 +-
src/_image_wrapper.cpp | 9 +-
src/_macosx.m | 10 +-
src/_path.h | 122 +-
src/_path_wrapper.cpp | 154 +-
src/_png.cpp | 7 +-
src/ft2font_wrapper.cpp | 23 +-
src/numpy_cpp.h | 16 +-
src/path_converters.h | 44 +-
src/py_converters.cpp | 96 +
src/py_converters.h | 4 +
tests.py | 21 +-
tools/gh_api.py | 2 +
tools/github_stats.py | 57 +-
tools/test_triage.py | 395 +
unit/memleak_hawaii3.py | 22 +-
unit/threading_test.py | 2 +-
201 files changed, 18464 insertions(+), 15979 deletions(-)
diff --cc debian/.git-dpm
index 788472b,0000000..6359e59
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- 13505e84eee9d9c3ca1037d4e565293ee80837ac
- 13505e84eee9d9c3ca1037d4e565293ee80837ac
- bcd8e8642ebbe6e840d28afbd5bbc08ff5013244
++304fe1390bfcdbc87c384a272ee940224e508769
++304fe1390bfcdbc87c384a272ee940224e508769
++6d82424219d3a4cd0abb56028b7aefe94074d759
+6d82424219d3a4cd0abb56028b7aefe94074d759
+matplotlib_1.5.1~rc1.orig.tar.gz
+0876ac5b477c2018ec808ff8b177b5fffa88bfff
+53376942
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/20_matplotlibrc_path_search_fix.patch
index ef351e4,0000000..03cc883
mode 100644,000000..100644
--- a/debian/patches/20_matplotlibrc_path_search_fix.patch
+++ b/debian/patches/20_matplotlibrc_path_search_fix.patch
@@@ -1,39 -1,0 +1,39 @@@
- From 1525d9dec417adcaa26f1661f8ecefc29d55634c Mon Sep 17 00:00:00 2001
++From fe8da3bfd9b22ee0ed19fa3894fd4f54011aefff Mon Sep 17 00:00:00 2001
+From: Sandro Tosi <morph at debian.org>
+Date: Thu, 8 Oct 2015 09:47:11 -0700
+Subject: Fixes the path to search for matplotlibrc file
+
+Forwarded: not-needed
+
+Patch-Name: 20_matplotlibrc_path_search_fix.patch
+---
+ lib/matplotlib/__init__.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
- index 88842ae..f805fea 100644
++index 737d510..6c2dff9 100644
+--- a/lib/matplotlib/__init__.py
++++ b/lib/matplotlib/__init__.py
+@@ -681,10 +681,12 @@ def _get_data_path():
+ return path
+
+ _file = _decode_filesystem_path(__file__)
+- path = os.sep.join([os.path.dirname(_file), 'mpl-data'])
++ path = '/usr/share/matplotlib/mpl-data'
+ if os.path.isdir(path):
+ return path
+
++ raise RuntimeError('Could not find the matplotlib data files')
++
+ # setuptools' namespace_packages may highjack this init file
+ # so need to try something known to be in matplotlib, not basemap
+ import matplotlib.afm
+@@ -812,7 +814,7 @@ def matplotlib_fname():
+ home, '.matplotlib', 'matplotlibrc')
+ return fname
+
+- path = get_data_path() # guaranteed to exist or raise
++ path = '/etc' # guaranteed to exist or raise
+ fname = os.path.join(path, 'matplotlibrc')
+ if not os.path.exists(fname):
+ warnings.warn('Could not find matplotlibrc; using defaults')
diff --cc debian/patches/70_bts720549_try_StayPuft_for_xkcd.patch
index e266492,0000000..d5abc0e
mode 100644,000000..100644
--- a/debian/patches/70_bts720549_try_StayPuft_for_xkcd.patch
+++ b/debian/patches/70_bts720549_try_StayPuft_for_xkcd.patch
@@@ -1,27 -1,0 +1,27 @@@
- From 34eeff99174b3b6f2b88999a54c267bf62721944 Mon Sep 17 00:00:00 2001
++From 17d2a33799cdc94743f46a697059dcdf16cd9ffc Mon Sep 17 00:00:00 2001
+From: Sandro Tosi <morph at debian.org>
+Date: Thu, 8 Oct 2015 09:47:14 -0700
+Subject: Try to use also StayPuft (a free font) for xkcd
+
+Origin: vendor
+Bug: http://bugs.debian.org/720549
+Forwarded: not-needed
+Last-Update: 2013-10-06
+Patch-Name: 70_bts720549_try_StayPuft_for_xkcd.patch
+---
+ lib/matplotlib/pyplot.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
+index 88979ec..5651ac5 100644
+--- a/lib/matplotlib/pyplot.py
++++ b/lib/matplotlib/pyplot.py
+@@ -392,7 +392,7 @@ def xkcd(scale=1, length=100, randomness=2):
+ from matplotlib import patheffects
+ context = rc_context()
+ try:
+- rcParams['font.family'] = ['Humor Sans', 'Comic Sans MS']
++ rcParams['font.family'] = ['Humor Sans', 'Comic Sans MS', 'StayPuft']
+ rcParams['font.size'] = 14.0
+ rcParams['path.sketch'] = (scale, length, randomness)
+ rcParams['path.effects'] = [
diff --cc debian/patches/gtk3cairo_check_no-multiprocessing.patch
index c86eba1,0000000..5e9009a
mode 100644,000000..100644
--- a/debian/patches/gtk3cairo_check_no-multiprocessing.patch
+++ b/debian/patches/gtk3cairo_check_no-multiprocessing.patch
@@@ -1,26 -1,0 +1,26 @@@
- From 956d4893fdbe5406390df8ffad85e8b1c520abc2 Mon Sep 17 00:00:00 2001
++From 304fe1390bfcdbc87c384a272ee940224e508769 Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 09:47:16 -0700
+Subject: gtk3cairo_check_no-multiprocessing
+
+Patch-Name: gtk3cairo_check_no-multiprocessing.patch
+---
+ setupext.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/setupext.py b/setupext.py
- index 43c61fb..744c2c7 100755
++index f4dc33f..e18498e 100755
+--- a/setupext.py
++++ b/setupext.py
- @@ -1751,7 +1751,10 @@ class BackendGtk3Agg(OptionalBackendPackage):
++@@ -1743,7 +1743,10 @@ class BackendGtk3Agg(OptionalBackendPackage):
+ def check_requirements(self):
+ if 'TRAVIS' in os.environ:
+ raise CheckFailed("Can't build with Travis")
+-
++ # yoh: Builds of Debian packages often lead to a dead-lock here
++ # As a workaround forcing build manually without a check
++ BackendAgg.force = True
++ return "ok"
+ # This check needs to be performed out-of-process, because
+ # importing gi and then importing regular old pygtk afterward
+ # segfaults the interpreter.
diff --cc debian/patches/multiarch-tktcl.patch
index 481051d,0000000..dc8a369
mode 100644,000000..100644
--- a/debian/patches/multiarch-tktcl.patch
+++ b/debian/patches/multiarch-tktcl.patch
@@@ -1,34 -1,0 +1,34 @@@
- From 7fd1d07d140fa60dfd40a0ef17a310ef989d1738 Mon Sep 17 00:00:00 2001
++From 53b06669981f333dd7ddd1278d3d1d8d64b42635 Mon Sep 17 00:00:00 2001
+From: Julian Taylor <jtaylor at ubuntu.com>
+Date: Thu, 8 Oct 2015 09:47:15 -0700
+Subject: adapt setup to find multiarched tk/tcl
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/matplotlib/+bug/752647
+Forwarded: no, only if we upstream multiarchification
+
+Patch-Name: multiarch-tktcl.patch
+---
+ setupext.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/setupext.py b/setupext.py
- index 0a9660b..43c61fb 100755
++index e68b8cd..f4dc33f 100755
+--- a/setupext.py
++++ b/setupext.py
- @@ -1403,13 +1403,16 @@ class BackendTkAgg(OptionalBackendPackage):
++@@ -1395,13 +1395,16 @@ class BackendTkAgg(OptionalBackendPackage):
+ except ImportError:
+ return None
+
++ from distutils import sysconfig
+ tcl_poss = [tcl_lib_dir,
+ os.path.normpath(os.path.join(tcl_lib_dir, '..')),
+ "/usr/lib/tcl" + str(Tkinter.TclVersion),
++ "/usr/lib/%s/tcl%s" % (sysconfig.get_config_var('MULTIARCH'), Tkinter.TclVersion),
+ "/usr/lib"]
+ tk_poss = [tk_lib_dir,
+ os.path.normpath(os.path.join(tk_lib_dir, '..')),
+ "/usr/lib/tk" + str(Tkinter.TkVersion),
++ "/usr/lib/%s/tk%s" % (sysconfig.get_config_var('MULTIARCH'), Tkinter.TkVersion),
+ "/usr/lib"]
+ for ptcl, ptk in zip(tcl_poss, tk_poss):
+ tcl_config = os.path.join(ptcl, "tclConfig.sh")
diff --cc debian/patches/series
index ac733e8,0000000..cffc5c8
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,13 -1,0 +1,4 @@@
+20_matplotlibrc_path_search_fix.patch
- 40_bts608939_draw_markers_description.patch
- 50_bts608942_spaces_in_param_args.patch
+70_bts720549_try_StayPuft_for_xkcd.patch
+multiarch-tktcl.patch
+gtk3cairo_check_no-multiprocessing.patch
- 10ef9a7e26dc34328b7ec7fd0ed2c2db6104b342.patch
- 9bc518230684b3a8bb69af60e160f90e1091cd0c.patch
- 84aa9f77e61df45682dd7867d35191184414c7b0.patch
- f67ea3c62f33f0e675b3e091044c4983ae01b085.patch
- cdc52bfecb95477972d5345ccff9719c02372f0f.patch
- d0153b7c86e44a7a8acfbc593da03c7e8c9d125b.patch
- ada2f99e13da03c9352e0c528f1b6feaa2863dc3.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/matplotlib.git
More information about the Python-modules-commits
mailing list