[Python-modules-commits] [matplotlib] 13/17: merge patched into master
Sandro Tosi
morph at moszumanska.debian.org
Sun Feb 12 23:42:10 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 93d2a3dac896d07ef58e2947aaae20e51969e236
Merge: 09e15fd cb2f046
Author: Sandro Tosi <morph at debian.org>
Date: Sun Feb 12 13:57:17 2017 -0500
merge patched into master
debian/.git-dpm | 6 +++---
...05-bts800803-disable-the-GitHub-Fork-Me-ribbon.patch | 2 +-
...803-dont-use-the-Raleway-font-from-the-Google-.patch | 2 +-
...bts800803-remote-the-Google-Analytics-tracking.patch | 2 +-
debian/patches/0008-Increase-test-tollerance.patch | 2 +-
.../0009-Add-a-newline-separator-in-fc-list-call.patch | 2 +-
debian/patches/20_matplotlibrc_path_search_fix.patch | 2 +-
debian/patches/70_bts720549_try_StayPuft_for_xkcd.patch | 2 +-
debian/patches/gtk3cairo_check_no-multiprocessing.patch | 2 +-
debian/patches/multiarch-tktcl.patch | 2 +-
.../mpl-data/sample_data/necked_tensile_specimen.png | Bin 95151 -> 0 bytes
11 files changed, 12 insertions(+), 12 deletions(-)
diff --cc debian/.git-dpm
index 25bc1e1,0000000..d9b6ab3
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
- 2fa7c27b825af1954e6077bd8c3da5c767aa8b6a
- 2fa7c27b825af1954e6077bd8c3da5c767aa8b6a
- e56d16e832c34e4e84834585724e4b192f36cfd8
++cb2f046ef7cc2dc44026a658e5a590685e122b5b
++cb2f046ef7cc2dc44026a658e5a590685e122b5b
++b358b1f4101ba111166b027228d545973408d1b9
+b358b1f4101ba111166b027228d545973408d1b9
+matplotlib_2.0.0+dfsg1.orig.tar.gz
+5c28c23485ee7641ff137764f8ff8b8dee40ec86
+52007676
+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 aae5a10,0000000..1e8186d
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 98107a0752ee29e47cc2af3321e91358de7dc8c3 Mon Sep 17 00:00:00 2001
++From 5435bb1019cd07eadce3bae2adb1f80654761906 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
+--- a/doc/_templates/layout.html
++++ b/doc/_templates/layout.html
+@@ -161,12 +161,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 55e75f2,0000000..e99842a
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 2a32abbf5314ca94e6c87cf6da5f28ce4cbfff1c Mon Sep 17 00:00:00 2001
++From a5cd4b859131a425f31b5804d3d6b01b7531b7b3 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
+--- a/doc/_templates/layout.html
++++ b/doc/_templates/layout.html
+@@ -154,7 +154,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 2b8c15a,0000000..19b22a6
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 57427cce46434c5e4d1899cb4833e997b7abc92f Mon Sep 17 00:00:00 2001
++From 9b4b4a4ac2194ce419c5de0bba26003b43e96ecb 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
+--- a/doc/_templates/layout.html
++++ b/doc/_templates/layout.html
+@@ -224,16 +224,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 51b0935,0000000..20d7b27
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 3143116a701ee9039e385265cf854f9da669abac Mon Sep 17 00:00:00 2001
++From b6d012ec35da5169e536d8aac094fdb0680402c2 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
+--- 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'):
+ """
+diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
+index 3876298..6b652bd 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:
+
+ 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
+--- a/lib/matplotlib/tests/test_patheffects.py
++++ b/lib/matplotlib/tests/test_patheffects.py
+@@ -110,7 +110,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/0009-Add-a-newline-separator-in-fc-list-call.patch
index 0e7cbca,0000000..3b272a8
mode 100644,000000..100644
--- a/debian/patches/0009-Add-a-newline-separator-in-fc-list-call.patch
+++ b/debian/patches/0009-Add-a-newline-separator-in-fc-list-call.patch
@@@ -1,23 -1,0 +1,23 @@@
- From 2fa7c27b825af1954e6077bd8c3da5c767aa8b6a Mon Sep 17 00:00:00 2001
++From cb2f046ef7cc2dc44026a658e5a590685e122b5b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= <jks at iki.fi>
+Date: Sat, 21 Jan 2017 21:50:21 +0200
+Subject: Add a newline separator in fc-list call
+
+Fixes #7906.
+---
+ lib/matplotlib/font_manager.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
+index 3084410..213faee 100644
+--- a/lib/matplotlib/font_manager.py
++++ b/lib/matplotlib/font_manager.py
+@@ -281,7 +281,7 @@ def _call_fc_list():
+ 'This may take a moment.'))
+ timer.start()
+ try:
+- out = subprocess.check_output([str('fc-list'), '--format=%{file}'])
++ out = subprocess.check_output([str('fc-list'), '--format=%{file}\\n'])
+ except (OSError, subprocess.CalledProcessError):
+ return []
+ finally:
diff --cc debian/patches/20_matplotlibrc_path_search_fix.patch
index 0068187,0000000..8526b8b
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 d72c8194f490c3b62493433cdd15fb63e6264d5c Mon Sep 17 00:00:00 2001
++From 425309281d1b8e3d454f548b2ac24706ec8e280a 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
+--- 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 f767d44,0000000..3f6f9cc
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 cdaef1aa52c8d1464281979bb8ca23e70e24e175 Mon Sep 17 00:00:00 2001
++From 90ee017367a8755086b1ed0a39a931dce0a2c383 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
+--- 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 c43be17,0000000..36048ad
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 e45abaab24803aef023469559d21c9fe14e5c74d Mon Sep 17 00:00:00 2001
++From 14eb5c49d02c27e6057bae6c63b34001b3234e8d 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 6c95da4,0000000..74328a8
mode 100644,000000..100644
--- a/debian/patches/multiarch-tktcl.patch
+++ b/debian/patches/multiarch-tktcl.patch
@@@ -1,28 -1,0 +1,28 @@@
- From 02caa673ed1374fd3a0f781f0496a5ba2acba456 Mon Sep 17 00:00:00 2001
++From 0550a696e0c1f836b3e3250d182e39e7e4c1620c 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.
--
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