[Python-modules-commits] [matplotlib] 10/13: merge patched into master
Sandro Tosi
morph at moszumanska.debian.org
Sun Feb 7 22:04:23 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 da7d8f70f9a43d4f97e8174370c54d82e4be5950
Merge: 5a16f7d cd9e4de
Author: Sandro Tosi <morph at debian.org>
Date: Sun Feb 7 16:46:22 2016 +0000
merge patched into master
INSTALL | 19 ++-
debian/.git-dpm | 6 +-
...s800803-disable-the-GitHub-Fork-Me-ribbon.patch | 6 +-
...ont-use-the-Raleway-font-from-the-Google-.patch | 10 +-
...0803-remote-the-Google-Analytics-tracking.patch | 9 +-
.../patches/20_matplotlibrc_path_search_fix.patch | 2 +-
.../70_bts720549_try_StayPuft_for_xkcd.patch | 2 +-
.../gtk3cairo_check_no-multiprocessing.patch | 2 +-
debian/patches/multiarch-tktcl.patch | 2 +-
doc/_static/mpl.css | 32 ++++
doc/_templates/badgesidebar.html | 11 ++
doc/_templates/donate_sidebar.html | 5 +
doc/_templates/index.html | 10 +-
doc/_templates/layout.html | 166 ++++++++++++++++++---
doc/conf.py | 9 +-
doc/faq/usage_faq.rst | 32 +++-
examples/misc/svg_filter_line.py | 2 +-
examples/misc/svg_filter_pie.py | 2 +-
examples/user_interfaces/embedding_in_tk_canvas.py | 6 +-
examples/user_interfaces/svg_histogram.py | 2 +-
examples/user_interfaces/svg_tooltip.py | 2 +-
lib/matplotlib/_version.py | 4 +-
lib/matplotlib/artist.py | 2 +-
lib/matplotlib/tests/test_image.py | 56 ++++++-
src/_backend_agg.cpp | 8 +-
tests.py | 1 +
26 files changed, 337 insertions(+), 71 deletions(-)
diff --cc debian/.git-dpm
index f3dab80,0000000..de2a8a2
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
- 6e26b84f9c1de9ac768f94070d36ae381af20bda
- 6e26b84f9c1de9ac768f94070d36ae381af20bda
- 6d82424219d3a4cd0abb56028b7aefe94074d759
++cd9e4deee40f7ad808664b115c382b176b5b9036
++cd9e4deee40f7ad808664b115c382b176b5b9036
++0ef98e60d02b0531d7a73a18c4af0ef0adf2a3ce
+0ef98e60d02b0531d7a73a18c4af0ef0adf2a3ce
+matplotlib_1.5.1.orig.tar.gz
+7a2e307bb9898893d4ff38f8f129cfa9dfe5ac92
+53375325
+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 8cf5fba,0000000..a2ecc8a
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 0131130ce28b1525341bd86c487112ba6560c7cc Mon Sep 17 00:00:00 2001
++From 74ae8c3f8154334cafd4a295297717a8b1ff1e55 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 cb193d0..70f1b99 100644
++index 0a72bb0..9584bcb 100644
+--- a/doc/_templates/layout.html
++++ b/doc/_templates/layout.html
- @@ -188,12 +188,6 @@ color: #11557C;">new updates</a></p>
++@@ -171,12 +171,6 @@ color: #11557C;">new updates</a></p>
+
+ <link rel="shortcut icon" href="/_static/favicon.ico">
+
+-<!-- 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">
+ <a href="{{ pathto('index') }}"><img src="{{
+ pathto("_static/logo2.svg", 1) }}" width="540px" border="0" alt="matplotlib"/></a>
diff --cc debian/patches/0006-bts800803-dont-use-the-Raleway-font-from-the-Google-.patch
index 901ce6b,0000000..357ad1a
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 94e09e2cb6d51f4a9ef77d76b95586744de1b6a4 Mon Sep 17 00:00:00 2001
++From 50f3ffa36218b176be6d9625ddc3e296255b422c 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 70f1b99..e17db11 100644
++index 9584bcb..27ddde0 100644
+--- a/doc/_templates/layout.html
++++ b/doc/_templates/layout.html
- @@ -170,7 +170,6 @@ parents[-1].link|e }}" />
- {%- endif %}
++@@ -154,7 +154,6 @@ parents[-1].link|e }}" />
+ {%- endblock %}
+ {%- block extrahead %} {% endblock %}
- -<link href="http://fonts.googleapis.com/css?family=Raleway" rel="stylesheet" type="text/css">
+
++-
+ </head>
+ <body>
++ <div class="alert" style="background-color: #FEA46C; padding: 10px 0;
diff --cc debian/patches/0007-bts800803-remote-the-Google-Analytics-tracking.patch
index 759ce63,0000000..08faeb6
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,29 -1,0 +1,30 @@@
- From 6e26b84f9c1de9ac768f94070d36ae381af20bda Mon Sep 17 00:00:00 2001
++From cd9e4deee40f7ad808664b115c382b176b5b9036 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 e17db11..d653f22 100644
++index 27ddde0..ee0d399 100644
+--- a/doc/_templates/layout.html
++++ b/doc/_templates/layout.html
- @@ -248,15 +248,5 @@ href="http://sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
++@@ -231,16 +231,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>
- </html>
++ <footer>
++ <!--Flipcause Integration v3.0// Flipcause Integration Instructions:
diff --cc debian/patches/20_matplotlibrc_path_search_fix.patch
index 03cc883,0000000..151affa
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 fe8da3bfd9b22ee0ed19fa3894fd4f54011aefff Mon Sep 17 00:00:00 2001
++From 8e7640243d4024d16af51029b8144cbf085fae11 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 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 d5abc0e,0000000..dcd288f
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 17d2a33799cdc94743f46a697059dcdf16cd9ffc Mon Sep 17 00:00:00 2001
++From 737d18f1e151425aaba740a126fd9cfee32d3558 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 5e9009a,0000000..8ebc53a
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 304fe1390bfcdbc87c384a272ee940224e508769 Mon Sep 17 00:00:00 2001
++From 94f8c63bbec08414c4cb2b957415af8b78835884 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 f4dc33f..e18498e 100755
+--- a/setupext.py
++++ b/setupext.py
+@@ -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 dc8a369,0000000..2b3a676
mode 100644,000000..100644
--- a/debian/patches/multiarch-tktcl.patch
+++ b/debian/patches/multiarch-tktcl.patch
@@@ -1,34 -1,0 +1,34 @@@
- From 53b06669981f333dd7ddd1278d3d1d8d64b42635 Mon Sep 17 00:00:00 2001
++From e3fad4a8a7e61f67e29f3ad2061499f3300322cf 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 e68b8cd..f4dc33f 100755
+--- a/setupext.py
++++ b/setupext.py
+@@ -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")
--
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