[Python-modules-commits] [matplotlib] 10/10: merge patched-experimental into experimental
Sandro Tosi
morph at moszumanska.debian.org
Mon Dec 19 02:30:27 UTC 2016
This is an automated email from the git hooks/post-receive script.
morph pushed a commit to branch experimental
in repository matplotlib.
commit 45f547d9e5006fc56eac20982da4bee4212843cc
Merge: 4a0543f 9e7c8c5
Author: Sandro Tosi <morph at debian.org>
Date: Sun Dec 18 18:53:43 2016 -0500
merge patched-experimental into experimental
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 | 2 +-
.../70_bts720549_try_StayPuft_for_xkcd.patch | 2 +-
.../gtk3cairo_check_no-multiprocessing.patch | 2 +-
debian/patches/multiarch-tktcl.patch | 2 +-
doc-requirements.txt | 2 +-
doc/api/animation_api.rst | 338 +++++++++++++++-
doc/api/api_changes.rst | 19 +
doc/api/api_changes/2016-12-09-AL_afm.rst | 7 +
doc/conf.py | 12 +-
doc/faq/howto_faq.rst | 3 +-
.../axes_grid/figures/simple_axisartist1.py | 2 +-
.../axes_grid/figures/simple_axisline2.py | 2 +-
doc/users/dflt_style_changes.rst | 30 +-
doc/users/github_stats.rst | 104 +++--
doc/users/plotting/examples/custom_boxstyle02.py | 2 +-
doc/users/whats_new.rst | 4 +-
doc/users/whats_new/plot_surface.rst | 15 +
examples/api/barchart_demo.py | 2 +-
examples/api/date_demo.py | 2 +-
examples/api/font_file.py | 2 +-
examples/api/histogram_path_demo.py | 2 +-
examples/api/radar_chart.py | 2 +-
examples/api/unicode_minus.py | 8 +-
examples/axes_grid/demo_curvelinear_grid.py | 2 +-
examples/axes_grid/demo_floating_axes.py | 2 +-
examples/axes_grid/demo_parasite_axes2.py | 2 +-
examples/event_handling/README.txt | 2 +-
examples/event_handling/lasso_demo.py | 3 +-
examples/event_handling/legend_picking.py | 2 +-
examples/event_handling/viewlims.py | 4 +-
.../streamplot_demo_masking.py | 4 +-
examples/misc/ftface_props.py | 4 +-
examples/misc/sample_data_demo.py | 2 +-
examples/misc/svg_filter_line.py | 4 +-
examples/misc/svg_filter_pie.py | 10 +-
examples/mplot3d/surface3d_demo.py | 2 +-
examples/mplot3d/surface3d_demo2.py | 2 +-
examples/mplot3d/surface3d_demo3.py | 3 +-
examples/mplot3d/surface3d_radial_demo.py | 2 +-
examples/pylab_examples/README | 11 -
examples/pylab_examples/accented_text.py | 2 +-
examples/pylab_examples/bar_stacked.py | 2 +-
examples/pylab_examples/barchart_demo.py | 2 +-
examples/pylab_examples/barchart_demo2.py | 3 +-
examples/pylab_examples/centered_ticklabels.py | 2 +-
examples/pylab_examples/custom_ticker1.py | 2 +-
examples/pylab_examples/data_helper.py | 60 ---
examples/pylab_examples/date_index_formatter.py | 6 +-
examples/pylab_examples/demo_agg_filter.py | 3 +-
examples/pylab_examples/demo_bboximage.py | 1 +
examples/pylab_examples/errorbar_subsample.py | 2 +-
examples/pylab_examples/leftventricle_bulleye.py | 2 +-
examples/pylab_examples/log_bar.py | 4 +-
examples/pylab_examples/movie_demo.py | 26 --
examples/pylab_examples/print_stdout.py | 6 +-
examples/pylab_examples/pythonic_matplotlib.py | 4 +-
examples/pylab_examples/scatter_demo2.py | 2 +-
examples/pylab_examples/scatter_masked.py | 2 +-
examples/pylab_examples/stock_demo.py | 19 -
examples/pylab_examples/system_monitor.py | 8 +-
.../text_rotation_relative_to_line.py | 8 +-
.../pylab_examples/tricontour_smooth_delaunay.py | 4 +-
examples/pylab_examples/webapp_demo.py | 2 +-
examples/pyplots/dollar_ticks.py | 2 +-
examples/pyplots/fig_axes_customize_simple.py | 3 +-
examples/pyplots/fig_axes_labels_simple.py | 2 +-
examples/pyplots/fig_x.py | 4 +-
examples/pyplots/whats_new_99_spines.py | 3 +-
examples/shapes_and_collections/scatter_demo.py | 2 +-
.../specialty_plots/topographic_hillshading.py | 2 +-
examples/statistics/histogram_demo_cumulative.py | 2 +-
examples/statistics/violinplot_demo.py | 2 +-
examples/tests/backend_driver.py | 4 -
examples/ticks_and_spines/tick-formatters.py | 18 +-
examples/ticks_and_spines/tick-locators.py | 22 +-
examples/units/bar_unit_demo.py | 2 +-
examples/units/units_sample.py | 2 +-
examples/user_interfaces/README.wx | 2 +-
examples/user_interfaces/embedding_in_tk_canvas.py | 2 +-
examples/user_interfaces/embedding_in_wx4.py | 4 +-
examples/user_interfaces/svg_histogram.py | 11 +-
examples/user_interfaces/svg_tooltip.py | 2 +-
examples/widgets/README.txt | 2 +-
examples/widgets/lasso_selector_demo.py | 12 +-
examples/widgets/rectangle_selector.py | 4 +-
examples/widgets/span_selector.py | 2 +-
lib/matplotlib/_version.py | 4 +-
lib/matplotlib/animation.py | 444 +++++++++++++++------
lib/matplotlib/axes/_axes.py | 21 +-
lib/matplotlib/axes/_base.py | 1 +
lib/matplotlib/backends/backend_agg.py | 6 +-
lib/matplotlib/backends/backend_gtk3.py | 2 +-
lib/matplotlib/backends/backend_qt5.py | 10 +-
lib/matplotlib/backends/backend_tkagg.py | 5 +-
lib/matplotlib/font_manager.py | 177 ++++----
lib/matplotlib/image.py | 2 +-
lib/matplotlib/markers.py | 104 ++---
lib/matplotlib/mlab.py | 4 +-
lib/matplotlib/scale.py | 11 +-
lib/matplotlib/table.py | 4 +
lib/matplotlib/tests/test_axes.py | 35 ++
lib/matplotlib/tests/test_coding_standards.py | 3 -
lib/matplotlib/tests/test_text.py | 12 +
lib/matplotlib/tests/test_ticker.py | 4 +-
lib/matplotlib/text.py | 13 +-
lib/matplotlib/ticker.py | 262 ++++++------
lib/matplotlib/transforms.py | 11 +-
lib/mpl_toolkits/mplot3d/axes3d.py | 89 ++++-
lib/mpl_toolkits/tests/test_mplot3d.py | 21 +-
src/_tkagg.cpp | 19 +-
tools/test_triage.py | 36 +-
115 files changed, 1451 insertions(+), 771 deletions(-)
diff --cc debian/.git-dpm
index 32cb2fe,0000000..08be20f
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
- 3b13b2e5c38f11b7b2386336cfeb9958d70fe6d8
- 3b13b2e5c38f11b7b2386336cfeb9958d70fe6d8
- 2f5b54ab80c91d292cbca677b80dd3d08ce55985
++9e7c8c5ac6728c45de7fec7f00e21555fe8e85f6
++9e7c8c5ac6728c45de7fec7f00e21555fe8e85f6
++3dd925735c3295288f085343dfc94a31066955fa
+3dd925735c3295288f085343dfc94a31066955fa
+matplotlib_2.0.0~rc2.orig.tar.gz
+398356638164252020c953956f998c78830eef29
+52217915
+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 d5026b9,0000000..af9e25b
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 c79623b7597f0b498326416b29f3cbef2f5f8233 Mon Sep 17 00:00:00 2001
++From ad04c516497271449d7988427c16c7315bab25f8 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 3104e16,0000000..aebd392
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 057bf9722d8f7c7c09a834f9101d58b94bf444a4 Mon Sep 17 00:00:00 2001
++From fe38cab6f3dc99404a720a2216ad007f06a230da 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 d9f300a,0000000..2de3f55
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 3b13b2e5c38f11b7b2386336cfeb9958d70fe6d8 Mon Sep 17 00:00:00 2001
++From 9e7c8c5ac6728c45de7fec7f00e21555fe8e85f6 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 9d0bc01,0000000..20986cd
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 eee8ea7b1b6dd70dba69597fbb2c83203689d4c5 Mon Sep 17 00:00:00 2001
++From 43ba3eb65614ef1295325515eafb66f33528d947 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
+--- a/lib/matplotlib/__init__.py
++++ b/lib/matplotlib/__init__.py
+@@ -709,10 +709,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():
+ 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 3366cb9,0000000..e8be593
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 6eca819a689012c0a3d315dfac15e24da4d02bb8 Mon Sep 17 00:00:00 2001
++From 08e645c201a933d16d170280fccb4e685822bded 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
+--- 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 1e580c6,0000000..df72761
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 f9480f844149ceecca6dfdcec8aa105abc010656 Mon Sep 17 00:00:00 2001
++From e28fb493516d8b2ffc18a0687922f0347a47e0bf 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
+--- a/setupext.py
++++ b/setupext.py
+@@ -1715,7 +1715,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 2ca14b7,0000000..e968a3d
mode 100644,000000..100644
--- a/debian/patches/multiarch-tktcl.patch
+++ b/debian/patches/multiarch-tktcl.patch
@@@ -1,28 -1,0 +1,28 @@@
- From df9b1347d2eda476776c6cf557838c38c6b9aa44 Mon Sep 17 00:00:00 2001
++From 6e63078bb58b4904de6824f24072807e47364098 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
+--- a/setupext.py
++++ b/setupext.py
+@@ -1716,6 +1716,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