[Python-modules-commits] [matplotlib] 11/12: merge patched into master
Sandro Tosi
morph at moszumanska.debian.org
Sun May 28 02:29:29 UTC 2017
This is an automated email from the git hooks/post-receive script.
morph pushed a commit to branch master
in repository matplotlib.
commit f729e445bf9e4e7c7f2392cfb5a727494b89d20d
Merge: 1f07752 90efb6d
Author: Sandro Tosi <morph at debian.org>
Date: Sun May 14 22:57:36 2017 -0400
merge patched into master
.travis.yml | 4 +-
INSTALL | 12 +-
README.rst | 26 +-
debian/.git-dpm | 6 +-
...s800803-disable-the-GitHub-Fork-Me-ribbon.patch | 6 +-
...ont-use-the-Raleway-font-from-the-Google-.patch | 6 +-
...0803-remote-the-Google-Analytics-tracking.patch | 6 +-
debian/patches/0008-Increase-test-tollerance.patch | 14 +-
...9-Add-a-newline-separator-in-fc-list-call.patch | 23 -
...0-remove-interpolation_none_vs_nearest.py.patch | 81 --
.../patches/20_matplotlibrc_path_search_fix.patch | 4 +-
.../70_bts720549_try_StayPuft_for_xkcd.patch | 4 +-
.../gtk3cairo_check_no-multiprocessing.patch | 2 +-
debian/patches/multiarch-tktcl.patch | 2 +-
debian/patches/series | 2 -
doc/README.txt | 17 +-
doc/_static/depsy_badge_default.svg | 1 +
doc/_static/mpl.css | 4 +-
doc/_templates/badgesidebar.html | 2 +-
doc/_templates/citing.html | 2 +
doc/_templates/layout.html | 3 +-
doc/api/api_changes.rst | 63 ++
doc/api/api_changes/2016-12-09-AL_afm.rst | 7 -
doc/api/artist_api.rst | 1 +
doc/api/container_api.rst | 11 +
doc/api/index.rst | 1 +
doc/conf.py | 18 +
doc/contents.rst | 2 +
doc/devel/README.txt | 9 +
doc/devel/coding_guide.rst | 3 -
doc/devel/documenting_mpl.rst | 13 +-
doc/devel/gitwash/branch_dropdown.png | Bin 0 -> 16311 bytes
doc/devel/gitwash/configure_git.rst | 70 +-
doc/devel/gitwash/development_workflow.rst | 541 ++++++-----
doc/devel/gitwash/following_latest.rst | 6 +-
doc/devel/gitwash/forking_hell.rst | 28 +-
doc/devel/gitwash/git_development.rst | 16 +
doc/devel/gitwash/git_install.rst | 10 +-
doc/devel/gitwash/git_intro.rst | 14 +-
doc/devel/gitwash/git_links.inc | 54 +-
doc/devel/gitwash/git_resources.rst | 17 +-
doc/devel/gitwash/index.rst | 11 +-
doc/devel/gitwash/known_projects.inc | 28 +-
doc/devel/gitwash/maintainer_workflow.rst | 98 ++
doc/devel/gitwash/patching.rst | 51 +-
doc/devel/gitwash/pull_button.png | Bin 0 -> 12893 bytes
doc/devel/gitwash/set_up_fork.rst | 46 +-
doc/devel/gitwash/setting_up_for_development.rst | 16 -
doc/devel/gitwash/this_project.inc | 8 +-
doc/devel/testing.rst | 2 +-
doc/faq/osx_framework.rst | 9 +
doc/faq/troubleshooting_faq.rst | 2 +-
doc/make.py | 29 +
doc/resources/index.rst | 4 +
doc/users/artists.rst | 16 +-
doc/users/customizing.rst | 4 +-
doc/users/dflt_style_changes.rst | 29 +-
doc/users/github_stats.rst | 591 ++++++++++-
doc/users/gridspec.rst | 71 +-
doc/users/image_tutorial.rst | 2 +-
doc/users/plotting/colormaps/colormaps.py | 40 +-
doc/users/plotting/colormaps/grayscale.py | 30 +-
doc/users/plotting/colormaps/lightness.py | 151 ++-
doc/users/pyplot_tutorial.rst | 2 +-
doc/users/whats_new.rst | 14 +
examples/color/color_cycle_default.py | 6 +-
examples/color/color_cycle_demo.py | 16 +-
examples/color/colormaps_reference.py | 52 +-
examples/color/named_colors.py | 27 +-
examples/lines_bars_and_markers/barh_demo.py | 6 +-
examples/lines_bars_and_markers/fill_demo.py | 6 +-
.../lines_bars_and_markers/fill_demo_features.py | 4 +-
.../line_demo_dash_control.py | 4 +-
.../line_styles_reference.py | 4 +
examples/lines_bars_and_markers/linestyles.py | 6 +-
.../marker_fillstyle_reference.py | 4 +
.../lines_bars_and_markers/marker_reference.py | 4 +
examples/misc/multiprocess.py | 6 +-
examples/mplot3d/2dcollections3d_demo.py | 10 +-
examples/mplot3d/bars3d_demo.py | 9 +
examples/mplot3d/hist3d_demo.py | 8 +-
examples/mplot3d/pathpatch3d_demo.py | 8 +
examples/mplot3d/polys3d_demo.py | 10 +
examples/pie_and_polar_charts/pie_demo_features.py | 4 +
examples/pie_and_polar_charts/polar_bar_demo.py | 5 +
.../pie_and_polar_charts/polar_scatter_demo.py | 8 +-
examples/pylab_examples/demo_bboximage.py | 8 +-
examples/pylab_examples/matshow.py | 9 +-
examples/pylab_examples/quiver_demo.py | 86 +-
examples/pylab_examples/quiver_simple_demo.py | 18 +
examples/pylab_examples/set_and_get.py | 2 +-
examples/showcase/firefox.py | 8 +
examples/showcase/xkcd.py | 7 +
examples/style_sheets/plot_bmh.py | 30 +-
examples/style_sheets/plot_dark_background.py | 18 +-
examples/style_sheets/plot_fivethirtyeight.py | 26 +-
examples/style_sheets/plot_ggplot.py | 4 +
examples/style_sheets/plot_grayscale.py | 5 +
examples/tests/backend_driver.py | 2 +-
.../text_labels_and_annotations/autowrap_demo.py | 10 +-
.../text_demo_fontdict.py | 8 +-
examples/ticks_and_spines/spines_demo.py | 26 +-
examples/ticks_and_spines/spines_demo_dropped.py | 4 +
examples/ticks_and_spines/tick-formatters.py | 6 +-
examples/ticks_and_spines/tick-locators.py | 6 +-
.../ticks_and_spines/tick_labels_from_values.py | 7 +-
.../ticks_and_spines/ticklabels_demo_rotation.py | 4 +
examples/units/annotate_with_units.py | 9 +
examples/units/artist_tests.py | 22 +-
examples/units/bar_demo2.py | 40 +-
examples/units/bar_unit_demo.py | 14 +-
examples/units/evans_test.py | 10 +-
examples/units/radian_demo.py | 7 +-
examples/units/units_sample.py | 15 +-
examples/units/units_scatter.py | 4 +-
examples/user_interfaces/svg_tooltip.py | 80 +-
extern/agg24-svn/include/agg_rendering_buffer.h | 10 +-
lib/matplotlib/__init__.py | 48 +-
lib/matplotlib/_cm.py | 30 +-
lib/matplotlib/_version.py | 4 +-
lib/matplotlib/afm.py | 10 +-
lib/matplotlib/animation.py | 72 +-
lib/matplotlib/axes/_axes.py | 175 ++--
lib/matplotlib/axes/_base.py | 36 +-
lib/matplotlib/axis.py | 10 +-
lib/matplotlib/backend_bases.py | 12 +-
lib/matplotlib/backends/backend_pdf.py | 14 +-
lib/matplotlib/backends/backend_pgf.py | 7 +-
lib/matplotlib/backends/backend_qt5.py | 54 +-
lib/matplotlib/backends/backend_wx.py | 35 +-
lib/matplotlib/backends/qt_compat.py | 12 +-
lib/matplotlib/cbook.py | 26 +-
lib/matplotlib/cm.py | 33 +-
lib/matplotlib/collections.py | 12 +
lib/matplotlib/colors.py | 12 +-
lib/matplotlib/dates.py | 3 +
lib/matplotlib/figure.py | 31 +-
lib/matplotlib/font_manager.py | 2 +-
lib/matplotlib/image.py | 69 +-
lib/matplotlib/legend_handler.py | 10 +-
lib/matplotlib/lines.py | 6 +-
lib/matplotlib/markers.py | 10 +-
lib/matplotlib/mathtext.py | 19 +-
lib/matplotlib/mlab.py | 2 +-
.../{classic.mplstyle => _classic_test.mplstyle} | 0
lib/matplotlib/mpl-data/stylelib/classic.mplstyle | 2 +
lib/matplotlib/patches.py | 208 ++--
lib/matplotlib/path.py | 26 +-
lib/matplotlib/pyplot.py | 11 +-
lib/matplotlib/quiver.py | 148 +--
lib/matplotlib/rcsetup.py | 25 +-
lib/matplotlib/scale.py | 2 +-
lib/matplotlib/stackplot.py | 5 +-
lib/matplotlib/style/core.py | 9 +-
lib/matplotlib/testing/decorators.py | 51 +-
.../test_arrow_patches/fancyarrow_dash.png | Bin 13085 -> 12574 bytes
.../test_artist/clip_path_clipping.pdf | Bin 4402 -> 4404 bytes
.../test_artist/clip_path_clipping.png | Bin 57839 -> 63545 bytes
.../test_artist/clip_path_clipping.svg | 136 +--
.../tests/baseline_images/test_artist/hatching.pdf | Bin 2201 -> 2626 bytes
.../tests/baseline_images/test_artist/hatching.png | Bin 12203 -> 12143 bytes
.../tests/baseline_images/test_artist/hatching.svg | 78 +-
.../baseline_images/test_axes/arrow_simple.png | Bin 0 -> 15087 bytes
...bar_tick_label_multiple_old_label_alignment.png | Bin 0 -> 8084 bytes
.../test_axes/boxplot_rc_parameters.pdf | Bin 3225 -> 3218 bytes
.../test_axes/boxplot_rc_parameters.png | Bin 7979 -> 7709 bytes
.../test_axes/boxplot_rc_parameters.svg | 300 +++---
.../baseline_images/test_axes/bxp_custombox.png | Bin 2585 -> 2676 bytes
.../baseline_images/test_axes/bxp_customcap.png | Bin 2101 -> 2055 bytes
.../baseline_images/test_axes/bxp_custommedian.png | Bin 2009 -> 1997 bytes
.../test_axes/bxp_custompatchartist.png | Bin 11810 -> 13464 bytes
.../test_axes/bxp_withmean_line.png | Bin 2137 -> 2158 bytes
.../test_image/imshow_masked_interpolation.pdf | Bin 0 -> 27055 bytes
.../test_image/imshow_masked_interpolation.png | Bin 0 -> 19273 bytes
.../test_image/imshow_masked_interpolation.svg | 185 ++++
.../test_image/mask_image_over_under.png | Bin 27283 -> 27319 bytes
.../tests/baseline_images/test_legend/hatching.pdf | Bin 0 -> 11426 bytes
.../tests/baseline_images/test_legend/hatching.png | Bin 0 -> 39539 bytes
.../tests/baseline_images/test_legend/hatching.svg | 1022 ++++++++++++++++++++
.../baseline_images/test_lines/scaled_lines.pdf | Bin 10384 -> 10397 bytes
.../baseline_images/test_lines/scaled_lines.png | Bin 26768 -> 28101 bytes
.../baseline_images/test_lines/scaled_lines.svg | 154 +--
.../test_mathtext/mathtext_cm_81.pdf | Bin 0 -> 7171 bytes
.../test_mathtext/mathtext_cm_81.png | Bin 0 -> 1541 bytes
.../test_mathtext/mathtext_cm_81.svg | 222 +++++
.../test_mathtext/mathtext_dejavusans_81.pdf | Bin 0 -> 6308 bytes
.../test_mathtext/mathtext_dejavusans_81.png | Bin 0 -> 1857 bytes
.../test_mathtext/mathtext_dejavusans_81.svg | 136 +++
.../test_mathtext/mathtext_dejavuserif_81.pdf | Bin 0 -> 6209 bytes
.../test_mathtext/mathtext_dejavuserif_81.png | Bin 0 -> 1860 bytes
.../test_mathtext/mathtext_dejavuserif_81.svg | 141 +++
.../test_mathtext/mathtext_stix_81.pdf | Bin 0 -> 6514 bytes
.../test_mathtext/mathtext_stix_81.png | Bin 0 -> 1677 bytes
.../test_mathtext/mathtext_stix_81.svg | 159 +++
.../test_mathtext/mathtext_stixsans_81.pdf | Bin 0 -> 6361 bytes
.../test_mathtext/mathtext_stixsans_81.png | Bin 0 -> 1641 bytes
.../test_mathtext/mathtext_stixsans_81.svg | 117 +++
.../test_patches/multi_color_hatch.pdf | Bin 0 -> 6190 bytes
.../test_patches/multi_color_hatch.png | Bin 0 -> 11521 bytes
.../test_patches/multi_color_hatch.svg | 469 +++++++++
.../tests/baseline_images/test_path/nan_path.eps | 455 +++++++++
.../tests/baseline_images/test_path/nan_path.pdf | 85 ++
.../tests/baseline_images/test_path/nan_path.png | Bin 0 -> 7789 bytes
.../tests/baseline_images/test_path/nan_path.svg | 222 +++++
.../test_path/semi_log_with_zero.png | Bin 28932 -> 29487 bytes
.../test_patheffects/collection.pdf | Bin 131008 -> 131166 bytes
.../test_patheffects/collection.png | Bin 321483 -> 321288 bytes
.../test_patheffects/collection.svg | 878 ++++++++++++-----
.../test_patheffects/patheffect1.pdf | Bin 11282 -> 11297 bytes
.../test_patheffects/patheffect1.png | Bin 32063 -> 32053 bytes
.../test_patheffects/patheffect1.svg | 98 +-
.../test_patheffects/patheffect2.pdf | Bin 15419 -> 15442 bytes
.../test_patheffects/patheffect2.png | Bin 25161 -> 25172 bytes
.../test_patheffects/patheffect2.svg | 158 +--
.../test_patheffects/patheffect3.pdf | Bin 27584 -> 27653 bytes
.../test_patheffects/patheffect3.png | Bin 81383 -> 81410 bytes
.../test_patheffects/patheffect3.svg | 162 ++--
.../test_patheffects/stroked_text.png | Bin 0 -> 150781 bytes
.../baseline_images/test_text/font_scaling.pdf | Bin 0 -> 382245 bytes
.../test_tightlayout/tight_layout9.pdf | Bin 0 -> 6066 bytes
.../test_tightlayout/tight_layout9.png | Bin 0 -> 18802 bytes
.../test_tightlayout/tight_layout9.svg | 1017 +++++++++++++++++++
.../test_widgets/check_radio_buttons.png | Bin 0 -> 21123 bytes
lib/matplotlib/tests/test_afm.py | 16 +
lib/matplotlib/tests/test_animation.py | 11 +-
lib/matplotlib/tests/test_axes.py | 117 ++-
lib/matplotlib/tests/test_backend_pgf.py | 6 -
lib/matplotlib/tests/test_cbook.py | 5 +
lib/matplotlib/tests/test_coding_standards.py | 1 -
lib/matplotlib/tests/test_colors.py | 4 +
lib/matplotlib/tests/test_cycles.py | 2 +-
lib/matplotlib/tests/test_dates.py | 2 +-
lib/matplotlib/tests/test_figure.py | 12 +
lib/matplotlib/tests/test_font_manager.py | 12 +-
lib/matplotlib/tests/test_image.py | 76 +-
lib/matplotlib/tests/test_legend.py | 31 +
lib/matplotlib/tests/test_marker.py | 19 +
lib/matplotlib/tests/test_mathtext.py | 1 +
lib/matplotlib/tests/test_patches.py | 26 +
lib/matplotlib/tests/test_path.py | 13 +
lib/matplotlib/tests/test_patheffects.py | 28 +
lib/matplotlib/tests/test_scale.py | 8 +
lib/matplotlib/tests/test_style.py | 16 +-
lib/matplotlib/tests/test_text.py | 13 +
lib/matplotlib/tests/test_ticker.py | 36 +-
lib/matplotlib/tests/test_tightlayout.py | 10 +
lib/matplotlib/tests/test_widgets.py | 14 +-
lib/matplotlib/ticker.py | 34 +-
lib/matplotlib/tight_layout.py | 6 +-
lib/matplotlib/widgets.py | 17 +-
lib/mpl_toolkits/axes_grid1/axes_rgb.py | 21 +-
matplotlibrc.template | 8 +-
setup.cfg.template | 2 +-
src/ft2font.cpp | 6 +-
src/path_converters.h | 23 +
255 files changed, 8754 insertions(+), 2354 deletions(-)
diff --cc debian/.git-dpm
index cebb959,0000000..523cec1
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
- 87576dc0ee642fc0c5a298807705eb13492d6d4f
- 87576dc0ee642fc0c5a298807705eb13492d6d4f
- b358b1f4101ba111166b027228d545973408d1b9
++90efb6d932f5e076d31e5c9f860e5db204d7dd9a
++90efb6d932f5e076d31e5c9f860e5db204d7dd9a
++4816639bd3468d3e9f9cc9fed76324fdc8e0c9b6
+4816639bd3468d3e9f9cc9fed76324fdc8e0c9b6
+matplotlib_2.0.2.orig.tar.gz
+06fb52829fa31dd6de03a71e5edfe897718c9049
+52912059
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0005-bts800803-disable-the-GitHub-Fork-Me-ribbon.patch
index 1e8186d,0000000..dd5b1cb
mode 100644,000000..100644
--- a/debian/patches/0005-bts800803-disable-the-GitHub-Fork-Me-ribbon.patch
+++ b/debian/patches/0005-bts800803-disable-the-GitHub-Fork-Me-ribbon.patch
@@@ -1,26 -1,0 +1,26 @@@
- From 5435bb1019cd07eadce3bae2adb1f80654761906 Mon Sep 17 00:00:00 2001
++From dfc6ae15ca2d808ec4944440160dcbccc8dcac38 Mon Sep 17 00:00:00 2001
+From: Sandro Tosi <morph at debian.org>
+Date: Sat, 9 Jan 2016 15:49:51 +0000
+Subject: bts800803 disable the GitHub Fork Me ribbon
+
+---
+ doc/_templates/layout.html | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
- index ad1c55a..2e716f5 100644
++index aa1f278..b5735bf 100644
+--- a/doc/_templates/layout.html
++++ b/doc/_templates/layout.html
- @@ -161,12 +161,6 @@ parents[-1].link|e }}" />
++@@ -162,12 +162,6 @@ parents[-1].link|e }}" />
+
+ {% block relbar1 %}
+
+-<!-- The "Fork me on github" ribbon -->
+-<img style="float: right; margin-bottom: -40px; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png" usemap="#ribbonmap"/>
+-<map name="ribbonmap">
+- <area shape="poly" coords="15,0,148,-1,148,135" href="https://github.com/matplotlib/matplotlib" title="Fork me on GitHub" />
+-</map>
+-
+ <div style="background-color: white; text-align: left; padding: 10px 10px 15px 15px">
+ {%- if builder in ('htmlhelp', 'devhelp', 'latex') %}
+ <a href="{{ pathto('index') }}"><img src="{{pathto("_static/logo2.png", 1) }}" width="540px" border="0" alt="matplotlib"/></a>
diff --cc debian/patches/0006-bts800803-dont-use-the-Raleway-font-from-the-Google-.patch
index e99842a,0000000..60f4809
mode 100644,000000..100644
--- a/debian/patches/0006-bts800803-dont-use-the-Raleway-font-from-the-Google-.patch
+++ b/debian/patches/0006-bts800803-dont-use-the-Raleway-font-from-the-Google-.patch
@@@ -1,21 -1,0 +1,21 @@@
- From a5cd4b859131a425f31b5804d3d6b01b7531b7b3 Mon Sep 17 00:00:00 2001
++From 52ef4d2be9c0bb377f6ec81b00eb1278e037efb4 Mon Sep 17 00:00:00 2001
+From: Sandro Tosi <morph at debian.org>
+Date: Sat, 9 Jan 2016 16:03:45 +0000
+Subject: bts800803 dont use the Raleway font (from the Google Fonts API)
+
+---
+ doc/_templates/layout.html | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
- index 2e716f5..faa32a6 100644
++index b5735bf..668ca76 100644
+--- a/doc/_templates/layout.html
++++ b/doc/_templates/layout.html
- @@ -154,7 +154,6 @@ parents[-1].link|e }}" />
++@@ -155,7 +155,6 @@ parents[-1].link|e }}" />
+ {%- endblock %}
+ {%- block extrahead %} {% endblock %}
+
+-
+ </head>
+ <body>
+ {%- block header %}{% endblock %}
diff --cc debian/patches/0007-bts800803-remote-the-Google-Analytics-tracking.patch
index 19b22a6,0000000..e81bcbc
mode 100644,000000..100644
--- a/debian/patches/0007-bts800803-remote-the-Google-Analytics-tracking.patch
+++ b/debian/patches/0007-bts800803-remote-the-Google-Analytics-tracking.patch
@@@ -1,30 -1,0 +1,30 @@@
- From 9b4b4a4ac2194ce419c5de0bba26003b43e96ecb Mon Sep 17 00:00:00 2001
++From 306233d53ef1d71d3ff3748b731a2a6fb4774cad Mon Sep 17 00:00:00 2001
+From: Sandro Tosi <morph at debian.org>
+Date: Sat, 9 Jan 2016 16:51:28 +0000
+Subject: bts800803 remote the Google Analytics tracking
+
+---
+ doc/_templates/layout.html | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
- index faa32a6..712a206 100644
++index 668ca76..5bc8ec8 100644
+--- a/doc/_templates/layout.html
++++ b/doc/_templates/layout.html
- @@ -224,16 +224,6 @@ href="http://sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
++@@ -225,16 +225,6 @@ href="http://sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
+ </div>
+ {%- endblock %}
+
+-<script>
+- (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+- (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+- m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+- })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+-
+- ga('create', 'UA-55954603-1', 'auto');
+- ga('send', 'pageview');
+-
+-</script>
+ </body>
+ <footer>
+ <!--Flipcause Integration v3.0// Flipcause Integration Instructions:
diff --cc debian/patches/0008-Increase-test-tollerance.patch
index 20d7b27,0000000..5243086
mode 100644,000000..100644
--- a/debian/patches/0008-Increase-test-tollerance.patch
+++ b/debian/patches/0008-Increase-test-tollerance.patch
@@@ -1,80 -1,0 +1,80 @@@
- From b6d012ec35da5169e536d8aac094fdb0680402c2 Mon Sep 17 00:00:00 2001
++From 90efb6d932f5e076d31e5c9f860e5db204d7dd9a Mon Sep 17 00:00:00 2001
+From: Sandro Tosi <morph at debian.org>
+Date: Wed, 18 Jan 2017 20:05:24 -0500
+Subject: Increase test tollerance
+
+Patch taken from Fedora packaging:
+http://pkgs.fedoraproject.org/cgit/rpms/python-matplotlib.git/plain/python-matplotlib-increase-tests-tolerance.patch
+---
+ lib/matplotlib/testing/decorators.py | 2 +-
+ lib/matplotlib/tests/test_mathtext.py | 2 +-
+ lib/matplotlib/tests/test_patheffects.py | 2 +-
+ lib/matplotlib/tests/test_png.py | 2 +-
+ lib/matplotlib/tests/test_streamplot.py | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
- index 5927ea8..43a46ae 100644
++index 5e738ad..ef6393b 100644
+--- a/lib/matplotlib/testing/decorators.py
++++ b/lib/matplotlib/testing/decorators.py
+@@ -266,7 +266,7 @@ class ImageComparisonTest(CleanupTest):
+
+ yield do_test, fignum, actual_fname, expected_fname
+
+-def image_comparison(baseline_images=None, extensions=None, tol=0,
++def image_comparison(baseline_images=None, extensions=None, tol=0.306,
+ freetype_version=None, remove_text=False,
- savefig_kwarg=None, style='classic'):
++ savefig_kwarg=None, style='_classic_test'):
+ """
+diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
- index 3876298..6b652bd 100644
++index 39f5d7e..44251d1 100644
+--- a/lib/matplotlib/tests/test_mathtext.py
++++ b/lib/matplotlib/tests/test_mathtext.py
- @@ -158,7 +158,7 @@ for fonts, chars in font_test_specs:
++@@ -159,7 +159,7 @@ for fonts, chars in font_test_specs:
+
+ def make_set(basename, fontset, tests, extensions=None):
+ def make_test(filename, test):
+- @image_comparison(baseline_images=[filename], extensions=extensions)
++ @image_comparison(baseline_images=[filename], extensions=extensions, tol=0.310)
+ def single_test():
+ matplotlib.rcParams['mathtext.fontset'] = fontset
+ fig = plt.figure(figsize=(5.25, 0.75))
+diff --git a/lib/matplotlib/tests/test_patheffects.py b/lib/matplotlib/tests/test_patheffects.py
- index b5ce1a7..48379ff 100644
++index 3fb3703..cb1d754 100644
+--- a/lib/matplotlib/tests/test_patheffects.py
++++ b/lib/matplotlib/tests/test_patheffects.py
- @@ -110,7 +110,7 @@ def test_SimplePatchShadow_offset():
++@@ -138,7 +138,7 @@ def test_SimplePatchShadow_offset():
+ assert_equal(pe._offset, (4, 5))
+
+
+- at image_comparison(baseline_images=['collection'], tol=0.015)
++ at image_comparison(baseline_images=['collection'], tol=0.083)
+ def test_collection():
+ x, y = np.meshgrid(np.linspace(0, 10, 150), np.linspace(-5, 5, 100))
+ data = np.sin(x) + np.cos(y)
+diff --git a/lib/matplotlib/tests/test_png.py b/lib/matplotlib/tests/test_png.py
+index 590b395..dbf8779 100644
+--- a/lib/matplotlib/tests/test_png.py
++++ b/lib/matplotlib/tests/test_png.py
+@@ -17,7 +17,7 @@ on_win = (sys.platform == 'win32')
+
+
+ @image_comparison(baseline_images=['pngsuite'], extensions=['png'],
+- tol=0.01 if on_win else 0)
++ tol=0.014)
+ def test_pngsuite():
+ dirname = os.path.join(
+ os.path.dirname(__file__),
+diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py
+index af48aec..c7b7004 100644
+--- a/lib/matplotlib/tests/test_streamplot.py
++++ b/lib/matplotlib/tests/test_streamplot.py
+@@ -18,7 +18,7 @@ def velocity_field():
+
+
+ @image_comparison(baseline_images=['streamplot_colormap'],
+- tol=0.002)
++ tol=0.009)
+ def test_colormap():
+ X, Y, U, V = velocity_field()
+ plt.streamplot(X, Y, U, V, color=U, density=0.6, linewidth=2,
diff --cc debian/patches/20_matplotlibrc_path_search_fix.patch
index 8526b8b,0000000..e77d49c
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 425309281d1b8e3d454f548b2ac24706ec8e280a Mon Sep 17 00:00:00 2001
++From 39246bfeaecf0537fa586c09bae2428f67858690 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 004cc59..845a3bd 100644
++index 530c889..cae5129 100644
+--- a/lib/matplotlib/__init__.py
++++ b/lib/matplotlib/__init__.py
+@@ -712,10 +712,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
+@@ -843,7 +845,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 3f6f9cc,0000000..8430285
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 90ee017367a8755086b1ed0a39a931dce0a2c383 Mon Sep 17 00:00:00 2001
++From 9b634f43daf541f7aae7926720d70cbd91fbc51d 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 09e044e..0ea97d3 100644
++index 6bb51fd..24abd9f 100644
+--- a/lib/matplotlib/pyplot.py
++++ b/lib/matplotlib/pyplot.py
+@@ -401,7 +401,7 @@ def xkcd(scale=1, length=100, randomness=2):
+ from matplotlib import patheffects
+ context = rc_context()
+ try:
+- rcParams['font.family'] = ['xkcd', 'Humor Sans', 'Comic Sans MS']
++ rcParams['font.family'] = ['xkcd', '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 36048ad,0000000..10c649e
mode 100644,000000..100644
--- a/debian/patches/gtk3cairo_check_no-multiprocessing.patch
+++ b/debian/patches/gtk3cairo_check_no-multiprocessing.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 14eb5c49d02c27e6057bae6c63b34001b3234e8d Mon Sep 17 00:00:00 2001
++From 4f0e6a0558924e33aeae0c1efd12ab5fcc9e3003 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 | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/setupext.py b/setupext.py
+index a590b23..d1edaff 100644
+--- a/setupext.py
++++ b/setupext.py
+@@ -1717,7 +1717,6 @@ 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
diff --cc debian/patches/multiarch-tktcl.patch
index 74328a8,0000000..d5bc928
mode 100644,000000..100644
--- a/debian/patches/multiarch-tktcl.patch
+++ b/debian/patches/multiarch-tktcl.patch
@@@ -1,28 -1,0 +1,28 @@@
- From 0550a696e0c1f836b3e3250d182e39e7e4c1620c Mon Sep 17 00:00:00 2001
++From 7489506f9b6e65ae960c35fc873dc9e45454a372 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 | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/setupext.py b/setupext.py
+index 3819636..a590b23 100644
+--- a/setupext.py
++++ b/setupext.py
+@@ -1718,6 +1718,10 @@ class BackendGtk3Agg(OptionalBackendPackage):
+ 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/series
index cc3d9a3,0000000..2c17753
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,10 -1,0 +1,8 @@@
+20_matplotlibrc_path_search_fix.patch
+70_bts720549_try_StayPuft_for_xkcd.patch
+multiarch-tktcl.patch
+gtk3cairo_check_no-multiprocessing.patch
+0005-bts800803-disable-the-GitHub-Fork-Me-ribbon.patch
+0006-bts800803-dont-use-the-Raleway-font-from-the-Google-.patch
+0007-bts800803-remote-the-Google-Analytics-tracking.patch
+0008-Increase-test-tollerance.patch
- 0009-Add-a-newline-separator-in-fc-list-call.patch
- 0010-remove-interpolation_none_vs_nearest.py.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