[Python-modules-commits] [matplotlib] 10/17: merge patched into master
Sandro Tosi
morph at moszumanska.debian.org
Thu Jan 19 04:40:24 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 3c65b71c95a334fc5be861a29949a408c18b0a18
Merge: de01b07 57427cc
Author: Sandro Tosi <morph at debian.org>
Date: Tue Jan 17 22:49:22 2017 -0500
merge patched into master
.travis.yml | 5 +-
INSTALL | 39 +-
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 +-
.../patches/20_matplotlibrc_path_search_fix.patch | 8 +-
.../70_bts720549_try_StayPuft_for_xkcd.patch | 4 +-
.../gtk3cairo_check_no-multiprocessing.patch | 6 +-
debian/patches/multiarch-tktcl.patch | 6 +-
doc/README.txt | 14 +-
doc/_static/.gitignore | 5 +
doc/_static/contour_frontpage.png | Bin 4015 -> 0 bytes
doc/_static/histogram_frontpage.png | Bin 3195 -> 0 bytes
doc/_static/membrane_frontpage.png | Bin 5230 -> 0 bytes
doc/_static/mpl.css | 4 +-
doc/_static/surface3d_frontpage.png | Bin 8755 -> 0 bytes
doc/_templates/citing.html | 6 +-
doc/_templates/index.html | 84 +--
doc/api/api_changes.rst | 47 +-
doc/api/index.rst | 1 +
doc/api/rcsetup_api.rst | 12 +
doc/conf.py | 10 +-
doc/devel/MEP/MEP11.rst | 2 +-
doc/devel/MEP/MEP12.rst | 15 +-
doc/devel/MEP/MEP13.rst | 2 +-
doc/devel/MEP/MEP14.rst | 14 +-
doc/devel/MEP/MEP25.rst | 2 +-
doc/devel/coding_guide.rst | 4 +-
doc/devel/contributing.rst | 113 ++--
doc/devel/documenting_mpl.rst | 10 +-
doc/devel/gitwash/development_workflow.rst | 4 +-
doc/devel/gitwash/forking_hell.rst | 2 +-
doc/devel/gitwash/git_install.rst | 2 +-
doc/devel/gitwash/git_links.inc | 56 +-
doc/devel/gitwash/known_projects.inc | 16 +-
doc/devel/gitwash/this_project.inc | 2 +-
doc/devel/license.rst | 4 +-
doc/devel/release_guide.rst | 316 ++++++----
doc/devel/testing.rst | 13 +-
doc/faq/howto_faq.rst | 68 +-
doc/faq/installing_faq.rst | 14 +-
doc/faq/osx_framework.rst | 10 +-
doc/faq/troubleshooting_faq.rst | 16 +-
doc/faq/usage_faq.rst | 32 +-
doc/glossary/index.rst | 34 +-
doc/make.py | 94 ++-
doc/mpl_toolkits/index.rst | 6 +-
doc/resources/index.rst | 10 +-
doc/users/artists.rst | 2 +-
doc/users/colormaps.rst | 17 +-
doc/users/colors.rst | 4 +
doc/users/credits.rst | 695 ++++++++++++++-------
doc/users/dflt_style_changes.rst | 222 ++++---
doc/users/event_handling.rst | 4 +-
doc/users/github_stats.rst | 196 +++++-
doc/users/image_tutorial.rst | 14 +-
doc/users/intro.rst | 28 +-
doc/users/license.rst | 4 +-
doc/users/navigation_toolbar.rst | 2 +-
doc/users/path_tutorial.rst | 2 +-
doc/users/pgf.rst | 18 +-
doc/users/prev_whats_new/whats_new_1.0.rst | 2 +-
doc/users/pyplot_tutorial.rst | 2 +-
doc/users/screenshots.rst | 4 +-
doc/users/shell.rst | 2 +-
doc/users/text_intro.rst | 2 +-
doc/users/text_props.rst | 2 +-
doc/users/tight_layout_guide.rst | 14 +-
doc/users/transforms_tutorial.rst | 3 +-
doc/users/usetex.rst | 4 +-
doc/users/whats_new.rst | 81 +++
doc/users/whats_new/boxplot_zorder_kwarg.rst | 11 -
doc/users/whats_new/filled_plus_and_x_markers.rst | 7 -
doc/users/whats_new/plot_surface.rst | 15 -
doc/users/whats_new/streamplot_zorder.rst | 7 -
examples/frontpage/plot_3D.py | 4 +-
examples/frontpage/plot_contour.py | 4 +-
examples/frontpage/plot_histogram.py | 4 +-
examples/frontpage/plot_membrane.py | 4 +-
examples/pie_and_polar_charts/pie_demo_features.py | 37 +-
examples/pylab_examples/image_masked.py | 43 +-
examples/pylab_examples/polar_demo.py | 6 +-
examples/pylab_examples/scatter_demo2.py | 4 +-
examples/pylab_examples/simple_plot.py | 2 +-
lib/matplotlib/__init__.py | 15 +-
lib/matplotlib/_color_data.py | 21 +-
lib/matplotlib/_version.py | 4 +-
lib/matplotlib/animation.py | 2 +-
lib/matplotlib/axes/_axes.py | 41 +-
lib/matplotlib/axes/_base.py | 6 +-
lib/matplotlib/backend_bases.py | 4 +-
lib/matplotlib/backends/backend_pgf.py | 16 +-
lib/matplotlib/backends/backend_qt5.py | 44 +-
lib/matplotlib/backends/backend_qt5agg.py | 33 +-
lib/matplotlib/cbook.py | 18 +-
lib/matplotlib/collections.py | 1 +
lib/matplotlib/colors.py | 14 +-
lib/matplotlib/dates.py | 6 +-
lib/matplotlib/dviread.py | 2 +-
lib/matplotlib/figure.py | 5 +-
lib/matplotlib/finance.py | 8 +-
lib/matplotlib/font_manager.py | 14 +-
lib/matplotlib/fontconfig_pattern.py | 8 +-
lib/matplotlib/image.py | 9 +-
lib/matplotlib/legend_handler.py | 7 +-
lib/matplotlib/lines.py | 2 +
lib/matplotlib/mlab.py | 6 +-
lib/matplotlib/patches.py | 6 +-
lib/matplotlib/pyplot.py | 11 +-
lib/matplotlib/rcsetup.py | 14 +-
lib/matplotlib/sankey.py | 2 +-
lib/matplotlib/sphinxext/tests/test_tinypages.py | 2 +-
lib/matplotlib/stackplot.py | 2 +-
lib/matplotlib/testing/compare.py | 4 +-
lib/matplotlib/testing/decorators.py | 2 +-
.../test_axes/specgram_angle_freqs.png | Bin 132788 -> 132870 bytes
.../test_axes/specgram_angle_noise.png | Bin 51705 -> 51787 bytes
.../baseline_images/test_axes/specgram_freqs.png | Bin 59969 -> 60039 bytes
.../test_axes/specgram_freqs_linear.png | Bin 59969 -> 60039 bytes
.../test_axes/specgram_magnitude_freqs.png | Bin 25560 -> 25653 bytes
.../test_axes/specgram_magnitude_freqs_linear.png | Bin 25560 -> 25653 bytes
.../test_axes/specgram_magnitude_noise.png | Bin 53017 -> 53101 bytes
.../test_axes/specgram_magnitude_noise_linear.png | Bin 53017 -> 53101 bytes
.../baseline_images/test_axes/specgram_noise.png | Bin 53093 -> 53174 bytes
.../test_axes/specgram_noise_linear.png | Bin 53093 -> 53174 bytes
.../test_axes/specgram_phase_freqs.png | Bin 43647 -> 43715 bytes
.../test_axes/specgram_phase_noise.png | Bin 40271 -> 40356 bytes
lib/matplotlib/tests/test_axes.py | 6 +
lib/matplotlib/tests/test_backend_pgf.py | 2 +-
lib/matplotlib/tests/test_coding_standards.py | 1 -
lib/matplotlib/tests/test_colors.py | 32 +-
lib/matplotlib/tests/test_dates.py | 5 +
lib/matplotlib/tests/test_image.py | 9 +
lib/matplotlib/tests/test_legend.py | 40 +-
lib/matplotlib/tests/test_ticker.py | 6 +-
lib/matplotlib/texmanager.py | 2 +-
lib/matplotlib/ticker.py | 13 +-
matplotlibrc.template | 10 +-
setup.cfg.template | 16 +-
setup.py | 1 +
setupext.py | 4 +-
src/_backend_agg.h | 8 +-
src/_backend_agg_wrapper.cpp | 4 +-
src/_png.cpp | 2 +
src/ft2font.cpp | 8 +-
src/ft2font.h | 8 +-
src/ft2font_wrapper.cpp | 48 +-
tests.py | 9 +-
tools/github_stats.py | 38 +-
150 files changed, 2057 insertions(+), 1140 deletions(-)
diff --cc debian/.git-dpm
index bcfd908,0000000..508e753
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
- 9e7c8c5ac6728c45de7fec7f00e21555fe8e85f6
- 9e7c8c5ac6728c45de7fec7f00e21555fe8e85f6
- 3dd925735c3295288f085343dfc94a31066955fa
++57427cce46434c5e4d1899cb4833e997b7abc92f
++57427cce46434c5e4d1899cb4833e997b7abc92f
++e56d16e832c34e4e84834585724e4b192f36cfd8
+e56d16e832c34e4e84834585724e4b192f36cfd8
+matplotlib_2.0.0.orig.tar.gz
+fdec09942507ad4d0c41a608ff886d66176b505c
+52201231
+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 af9e25b,0000000..aae5a10
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 ad04c516497271449d7988427c16c7315bab25f8 Mon Sep 17 00:00:00 2001
++From 98107a0752ee29e47cc2af3321e91358de7dc8c3 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 aebd392,0000000..55e75f2
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 fe38cab6f3dc99404a720a2216ad007f06a230da Mon Sep 17 00:00:00 2001
++From 2a32abbf5314ca94e6c87cf6da5f28ce4cbfff1c 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 2de3f55,0000000..2b8c15a
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 9e7c8c5ac6728c45de7fec7f00e21555fe8e85f6 Mon Sep 17 00:00:00 2001
++From 57427cce46434c5e4d1899cb4833e997b7abc92f 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/20_matplotlibrc_path_search_fix.patch
index 20986cd,0000000..0068187
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 43ba3eb65614ef1295325515eafb66f33528d947 Mon Sep 17 00:00:00 2001
++From d72c8194f490c3b62493433cdd15fb63e6264d5c 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 f18b6bd..626ccc3 100644
++index 004cc59..845a3bd 100644
+--- a/lib/matplotlib/__init__.py
++++ b/lib/matplotlib/__init__.py
- @@ -709,10 +709,12 @@ def _get_data_path():
++@@ -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
- @@ -840,7 +842,7 @@ def matplotlib_fname():
++@@ -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 e8be593,0000000..f767d44
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 08e645c201a933d16d170280fccb4e685822bded Mon Sep 17 00:00:00 2001
++From cdaef1aa52c8d1464281979bb8ca23e70e24e175 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 d9b6a2a..f7e3f18 100644
++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 df72761,0000000..c43be17
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 e28fb493516d8b2ffc18a0687922f0347a47e0bf Mon Sep 17 00:00:00 2001
++From e45abaab24803aef023469559d21c9fe14e5c74d 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 1e1fb16..a4b36e2 100644
++index a590b23..d1edaff 100644
+--- a/setupext.py
++++ b/setupext.py
- @@ -1715,7 +1715,6 @@ class BackendGtk3Agg(OptionalBackendPackage):
++@@ -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 e968a3d,0000000..6c95da4
mode 100644,000000..100644
--- a/debian/patches/multiarch-tktcl.patch
+++ b/debian/patches/multiarch-tktcl.patch
@@@ -1,28 -1,0 +1,28 @@@
- From 6e63078bb58b4904de6824f24072807e47364098 Mon Sep 17 00:00:00 2001
++From 02caa673ed1374fd3a0f781f0496a5ba2acba456 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 fc1bc0c..1e1fb16 100644
++index 3819636..a590b23 100644
+--- a/setupext.py
++++ b/setupext.py
- @@ -1716,6 +1716,10 @@ class BackendGtk3Agg(OptionalBackendPackage):
++@@ -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