[Python-modules-commits] [matplotlib] 11/16: merge patched into master
Sandro Tosi
morph at moszumanska.debian.org
Fri Sep 2 18:52:43 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 8de83e2d697d3fa9f6ae1901c738b19e54b62f2a
Merge: de563d1 0d04631
Author: Sandro Tosi <morph at debian.org>
Date: Tue Aug 30 17:30:58 2016 +0100
merge patched into master
INSTALL | 80 +-
debian/.git-dpm | 6 +-
...s800803-disable-the-GitHub-Fork-Me-ribbon.patch | 8 +-
...ont-use-the-Raleway-font-from-the-Google-.patch | 4 +-
...0803-remote-the-Google-Analytics-tracking.patch | 6 +-
.../patches/20_matplotlibrc_path_search_fix.patch | 2 +-
.../70_bts720549_try_StayPuft_for_xkcd.patch | 4 +-
.../gtk3cairo_check_no-multiprocessing.patch | 2 +-
debian/patches/multiarch-tktcl.patch | 2 +-
doc/_static/logo2.png | Bin 0 -> 22279 bytes
doc/_templates/index.html | 10 +-
doc/_templates/layout.html | 7 +-
doc/api/api_changes.rst | 21 +-
doc/api/api_changes/2016-03-13-PMH.rst | 10 -
doc/devel/MEP/MEP12.rst | 3 +-
doc/devel/MEP/MEP15.rst | 5 +-
doc/devel/gitwash/git_links.inc | 1 -
doc/devel/gitwash/git_resources.rst | 1 -
doc/faq/installing_faq.rst | 47 +-
doc/users/credits.rst | 9 +-
doc/users/github_stats.rst | 1084 +++++++++++---------
doc/users/intro.rst | 2 +-
doc/users/mathtext.rst | 4 +-
doc/users/plotting/examples/simple_legend01.py | 4 +-
doc/users/shell.rst | 5 +-
doc/users/style_sheets.rst | 2 +-
doc/users/whats_new.rst | 3 +-
examples/pylab_examples/custom_cmap.py | 78 +-
examples/specialty_plots/hinton_demo.py | 4 +-
lib/matplotlib/_version.py | 4 +-
lib/matplotlib/axes/_axes.py | 52 +-
lib/matplotlib/backends/backend_agg.py | 4 +-
lib/matplotlib/backends/backend_gdk.py | 6 +-
lib/matplotlib/backends/backend_gtk.py | 6 +-
lib/matplotlib/cbook.py | 6 +-
lib/matplotlib/colors.py | 4 +-
lib/matplotlib/lines.py | 2 +-
lib/matplotlib/offsetbox.py | 4 +-
lib/matplotlib/path.py | 2 +-
lib/matplotlib/pyplot.py | 2 +-
lib/matplotlib/tests/test_agg.py | 9 +
lib/matplotlib/tests/test_axes.py | 3 +-
lib/matplotlib/tests/test_bbox_tight.py | 3 +-
lib/matplotlib/tests/test_path.py | 5 +-
lib/matplotlib/text.py | 296 ++++--
lib/matplotlib/widgets.py | 41 +-
src/_backend_agg_wrapper.cpp | 9 +
src/mplutils.h | 10 +
src/numpy_cpp.h | 10 +
tests.py | 2 +-
50 files changed, 1039 insertions(+), 855 deletions(-)
diff --cc debian/.git-dpm
index 2a741ca,0000000..15f9fe8
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
- fdf3435ecbc25008fc3b3a80b12ea55245a50356
- fdf3435ecbc25008fc3b3a80b12ea55245a50356
- ea63ea9fadf33834fff358227cd0862bac852690
++0d04631d3b17374190747400bc89debe4bd2b9a6
++0d04631d3b17374190747400bc89debe4bd2b9a6
++571c0cec6896052900ada57484fce14ae2b791f4
+571c0cec6896052900ada57484fce14ae2b791f4
+matplotlib_1.5.2.orig.tar.gz
+2c78d4b1d9cc1e064a7592158977cb22d6606ca7
+50914982
+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 2ca99bb,0000000..e27026b
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 bb0acaeb66a5238b410df8f3cce11603f063d6b2 Mon Sep 17 00:00:00 2001
++From 9cf83a8470cb0952ecdc76cafae6c2c53fc1aec5 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 755c019..031b161 100644
++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">
- <a href="{{ pathto('index') }}"><img src="{{
- pathto("_static/logo2.svg", 1) }}" width="540px" border="0" alt="matplotlib"/></a>
++ {%- 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 3a1dbb7,0000000..699d151
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 1c32881dc4c7d5475b77893b449604f1b39f399d Mon Sep 17 00:00:00 2001
++From 98a821556aed381ca2ee2f1daa3270f651ed59d8 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 031b161..c4aa6b8 100644
++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 d1bc1aa,0000000..8143d0a
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 fdf3435ecbc25008fc3b3a80b12ea55245a50356 Mon Sep 17 00:00:00 2001
++From 0d04631d3b17374190747400bc89debe4bd2b9a6 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 c4aa6b8..e33c9fe 100644
++index 4bd6e76..eb5b4d0 100644
+--- a/doc/_templates/layout.html
++++ b/doc/_templates/layout.html
- @@ -230,16 +230,6 @@ href="http://sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
++@@ -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 886259e,0000000..f6906c7
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 62e06910ed6637fcf6faf33b24853517b2873b5f Mon Sep 17 00:00:00 2001
++From 713f722c8c796225a8c4c721565511197e28c539 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 b9650fc,0000000..655b145
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 49e33c782aaf99765cd378f8825ab2c2f48db0da Mon Sep 17 00:00:00 2001
++From 4c28769cf7891d7eaaa4a05d01c6e00a0ec7b947 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 9f07741..2e30137 100644
++index 9fecff1..5872568 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 df04274,0000000..4b3b4a9
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 c9000435a9fce9490535f11b28bcaab2dfb0b930 Mon Sep 17 00:00:00 2001
++From babdd189bf78f617a51c4903574f22ba57423fb2 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 ba1c7c6,0000000..53cf6ed
mode 100644,000000..100644
--- a/debian/patches/multiarch-tktcl.patch
+++ b/debian/patches/multiarch-tktcl.patch
@@@ -1,28 -1,0 +1,28 @@@
- From 02d156f10fddcd0df3789d2e706f637d73ce335c Mon Sep 17 00:00:00 2001
++From 6f4246e265257cf1e5ace895f7a156347975e85e 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.
--
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