[Python-modules-commits] [matplotlib] 03/05: merge patched into master

Wed Feb 15 03:11:39 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 c09524e408c9557a63a8a8bb1ff280804b8c2578
Merge: 7c32a83 87576dc
Author: Sandro Tosi <morph at debian.org>
Date:   Tue Feb 14 19:44:52 2017 -0500

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...0-remove-interpolation_none_vs_nearest.py.patch | 81 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 .../interpolation_none_vs_nearest.py               | 62 -----------------
 4 files changed, 84 insertions(+), 64 deletions(-)

diff --cc debian/.git-dpm
index d9b6ab3,0000000..00f2df9
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
- cb2f046ef7cc2dc44026a658e5a590685e122b5b
- cb2f046ef7cc2dc44026a658e5a590685e122b5b
++87576dc0ee642fc0c5a298807705eb13492d6d4f
++87576dc0ee642fc0c5a298807705eb13492d6d4f
 +b358b1f4101ba111166b027228d545973408d1b9
 +b358b1f4101ba111166b027228d545973408d1b9
 +matplotlib_2.0.0+dfsg1.orig.tar.gz
 +5c28c23485ee7641ff137764f8ff8b8dee40ec86
 +52007676
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0010-remove-interpolation_none_vs_nearest.py.patch
index 0000000,0000000..7387a28
new file mode 100644
--- /dev/null
+++ b/debian/patches/0010-remove-interpolation_none_vs_nearest.py.patch
@@@ -1,0 -1,0 +1,81 @@@
++From 87576dc0ee642fc0c5a298807705eb13492d6d4f Mon Sep 17 00:00:00 2001
++From: Sandro Tosi <morph at debian.org>
++Date: Tue, 14 Feb 2017 19:43:40 -0500
++Subject: remove interpolation_none_vs_nearest.py
++
++this example uses necked_tensile_specimen.png, which has been removed due to a
++non distributable color calibration code, and so when it is executed during the
++build process makes it fail to generate the HTML doc.
++---
++ .../interpolation_none_vs_nearest.py               | 62 ----------------------
++ 1 file changed, 62 deletions(-)
++ delete mode 100644 examples/images_contours_and_fields/interpolation_none_vs_nearest.py
++
++diff --git a/examples/images_contours_and_fields/interpolation_none_vs_nearest.py b/examples/images_contours_and_fields/interpolation_none_vs_nearest.py
++deleted file mode 100644
++index 487b401..0000000
++--- a/examples/images_contours_and_fields/interpolation_none_vs_nearest.py
+++++ /dev/null
++@@ -1,62 +0,0 @@
++-"""
++-Displays the difference between interpolation = 'none' and
++-interpolation = 'nearest'.
++-
++-Interpolation = 'none' and interpolation = 'nearest' are equivalent when
++-converting a figure to an image file, such as a PNG.
++-Interpolation = 'none' and interpolation = 'nearest' behave quite
++-differently, however, when converting a figure to a vector graphics file,
++-such as a PDF.  As shown, Interpolation = 'none' works well when a big
++-image is scaled down, while interpolation = 'nearest' works well when a
++-small image is blown up.
++-"""
++-
++-import numpy as np
++-import matplotlib.pyplot as plt
++-import matplotlib.cbook as cbook
++-
++-# Load big image
++-big_im_path = cbook.get_sample_data('necked_tensile_specimen.png')
++-big_im = plt.imread(big_im_path)
++-# Define small image
++-small_im = np.array([[0.25, 0.75, 1.0, 0.75], [0.1, 0.65, 0.5, 0.4],
++-                     [0.6, 0.3, 0.0, 0.2], [0.7, 0.9, 0.4, 0.6]])
++-
++-# Create a 2x2 table of plots
++-fig, axes = plt.subplots(figsize=[8.0, 7.5], ncols=2, nrows=2)
++-
++-axes[0, 0].imshow(big_im, interpolation='none')
++-axes[0, 1].imshow(big_im, interpolation='nearest')
++-axes[1, 0].imshow(small_im, interpolation='none')
++-axes[1, 1].imshow(small_im, interpolation='nearest')
++-fig.subplots_adjust(left=0.24, wspace=0.2, hspace=0.1,
++-                    bottom=0.05, top=0.86)
++-
++-# Label the rows and columns of the table
++-fig.text(0.03, 0.645, 'Big Image\nScaled Down', ha='left')
++-fig.text(0.03, 0.225, 'Small Image\nBlown Up', ha='left')
++-fig.text(0.383, 0.90, "Interpolation = 'none'", ha='center')
++-fig.text(0.75, 0.90, "Interpolation = 'nearest'", ha='center')
++-
++-# If you were going to run this example on your local machine, you
++-# would save the figure as a PNG, save the same figure as a PDF, and
++-# then compare them.  The following code would suffice.
++-txt = fig.text(0.452, 0.95, 'Saved as a PNG', fontsize=18)
++-# plt.savefig('None_vs_nearest-png.png')
++-# txt.set_text('Saved as a PDF')
++-# plt.savefig('None_vs_nearest-pdf.pdf')
++-
++-# Here, however, we need to display the PDF on a webpage, which means
++-# the PDF must be converted into an image.  For the purposes of this
++-# example, the 'Nearest_vs_none-pdf.pdf' has been pre-converted into
++-#'Nearest_vs_none-pdf.png' at 80 dpi.  We simply need to load and
++-# display it.
++-# The conversion is done with:
++-#  gs -dNOPAUSE -dBATCH -dDOINTERPOLATE -sDEVICE=pngalpha \
++-#     -sOutputFile=None_vs_nearest-pdf.png -r80 None_vs_nearest-pdf.pdf
++-pdf_im_path = cbook.get_sample_data('None_vs_nearest-pdf.png')
++-pdf_im = plt.imread(pdf_im_path)
++-fig2 = plt.figure(figsize=[8.0, 7.5])
++-fig2.figimage(pdf_im)
++-
++-plt.show()
diff --cc debian/patches/series
index aac89c6,0000000..cc3d9a3
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,9 -1,0 +1,10 @@@
 +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-Increase-test-tollerance.patch
 +0009-Add-a-newline-separator-in-fc-list-call.patch
++0010-remove-interpolation_none_vs_nearest.py.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/matplotlib.git

