[Python-modules-commits] [matplotlib] 10/12: merge patched into master

Sandro Tosi morph at moszumanska.debian.org
Sat Sep 10 14:33:00 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 d3f8d75a10d25425160ef7a4be7d002fb9d28005
Merge: f92aa2f 87b199d
Author: Sandro Tosi <morph at debian.org>
Date:   Sat Sep 10 12:37:54 2016 +0100

    merge patched into master

 .mailmap                                           |   1 +
 debian/.git-dpm                                    |   6 +-
 ...s800803-disable-the-GitHub-Fork-Me-ribbon.patch |   2 +-
 ...ont-use-the-Raleway-font-from-the-Google-.patch |   2 +-
 ...0803-remote-the-Google-Analytics-tracking.patch |   2 +-
 ...3a5e5440014677ee5afb08b0efa39f8e16-Mon-Se.patch |  55 --
 .../patches/20_matplotlibrc_path_search_fix.patch  |   2 +-
 .../70_bts720549_try_StayPuft_for_xkcd.patch       |   6 +-
 .../gtk3cairo_check_no-multiprocessing.patch       |   2 +-
 debian/patches/multiarch-tktcl.patch               |   2 +-
 debian/patches/series                              |   1 -
 doc/_templates/citing.html                         |   2 +
 doc/faq/usage_faq.rst                              |   2 +-
 doc/faq/virtualenv_faq.rst                         |  19 +-
 doc/resources/index.rst                            |   4 +
 doc/users/github_stats.rst                         | 765 ++++++++++++++++++++-
 doc/users/style_sheets.rst                         |   4 +-
 examples/pylab_examples/data_helper.py             |   4 +-
 examples/pylab_examples/image_slices_viewer.py     |   2 +-
 examples/pylab_examples/quiver_demo.py             |   4 +-
 examples/pylab_examples/tex_unicode_demo.py        |   7 +-
 examples/style_sheets/plot_ggplot.py               |   4 +-
 lib/matplotlib/_version.py                         |   4 +-
 lib/matplotlib/backends/backend_qt5agg.py          |   6 +-
 lib/matplotlib/backends/web_backend/nbagg_mpl.js   |   9 +-
 lib/matplotlib/finance.py                          |   4 +-
 lib/matplotlib/pyplot.py                           |  10 +-
 src/_contour.cpp                                   |   6 +-
 src/numpy_cpp.h                                    |   7 +
 29 files changed, 830 insertions(+), 114 deletions(-)

diff --cc debian/.git-dpm
index 049f26f,0000000..0b985c2
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
- 2a95e2a75f2f536c98df9695c71ddb5610993eac
- 2a95e2a75f2f536c98df9695c71ddb5610993eac
- 571c0cec6896052900ada57484fce14ae2b791f4
++87b199de3b35dce99a4c59bec882a0a72deae702
++87b199de3b35dce99a4c59bec882a0a72deae702
++8367b8cc0464b101cfd865054dd6087b889b5c71
 +8367b8cc0464b101cfd865054dd6087b889b5c71
 +matplotlib_1.5.3.orig.tar.gz
 +f1383ce82f780f1d0281b30523b2cabe4f11eab6
 +50931479
 +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 e27026b,0000000..a60e720
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 9cf83a8470cb0952ecdc76cafae6c2c53fc1aec5 Mon Sep 17 00:00:00 2001
++From c61d06248aaa2f9ab00ca6b61d2d680ec9983b71 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 79ce033..1565efb 100644
 +--- a/doc/_templates/layout.html
 ++++ b/doc/_templates/layout.html
 +@@ -170,12 +170,6 @@ color: #11557C;">new updates</a></p>
 + 
 + {% 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 699d151,0000000..e62afc8
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 98a821556aed381ca2ee2f1daa3270f651ed59d8 Mon Sep 17 00:00:00 2001
++From 70a3a18c32baaf083a8ba9fb1c42ac155d0c0563 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 1565efb..4bd6e76 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>
 +     <div class="alert" style="background-color: #FEA46C; padding: 10px 0;
diff --cc debian/patches/0007-bts800803-remote-the-Google-Analytics-tracking.patch
index 8143d0a,0000000..bd8d8aa
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 0d04631d3b17374190747400bc89debe4bd2b9a6 Mon Sep 17 00:00:00 2001
++From 87b199de3b35dce99a4c59bec882a0a72deae702 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 4bd6e76..eb5b4d0 100644
 +--- a/doc/_templates/layout.html
 ++++ b/doc/_templates/layout.html
 +@@ -233,16 +233,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/20_matplotlibrc_path_search_fix.patch
index f6906c7,0000000..753bbdb
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 713f722c8c796225a8c4c721565511197e28c539 Mon Sep 17 00:00:00 2001
++From 146d278d834f7187a43a2b385e1d01b4df3e4bf6 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 53216ab..57c0613 100644
 +--- a/lib/matplotlib/__init__.py
 ++++ b/lib/matplotlib/__init__.py
 +@@ -687,10 +687,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
 +@@ -818,7 +820,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 655b145,0000000..42e0be2
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 4c28769cf7891d7eaaa4a05d01c6e00a0ec7b947 Mon Sep 17 00:00:00 2001
++From d97ff51b36bb4758db68b760c64ec119b140278c 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 9fecff1..5872568 100644
++index 0acadcb..e4a1096 100644
 +--- a/lib/matplotlib/pyplot.py
 ++++ b/lib/matplotlib/pyplot.py
- @@ -392,7 +392,7 @@ def xkcd(scale=1, length=100, randomness=2):
++@@ -400,7 +400,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 4b3b4a9,0000000..9fa4387
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 babdd189bf78f617a51c4903574f22ba57423fb2 Mon Sep 17 00:00:00 2001
++From 7714f4d8f7c6c9a7a9ed51762f44ca12c00578e0 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 5137fb1..2041809 100755
 +--- a/setupext.py
 ++++ b/setupext.py
 +@@ -1483,7 +1483,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 53cf6ed,0000000..e0bcf42
mode 100644,000000..100644
--- a/debian/patches/multiarch-tktcl.patch
+++ b/debian/patches/multiarch-tktcl.patch
@@@ -1,28 -1,0 +1,28 @@@
- From 6f4246e265257cf1e5ace895f7a156347975e85e Mon Sep 17 00:00:00 2001
++From d228cf843376dec3a932e1580438541465d8bb37 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 fc9ff3e..5137fb1 100755
 +--- a/setupext.py
 ++++ b/setupext.py
 +@@ -1484,6 +1484,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 bd19c7c,0000000..c1bc696
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,8 -1,0 +1,7 @@@
 +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-From-655c513a5e5440014677ee5afb08b0efa39f8e16-Mon-Se.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