Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package matplotlib
During the last upload there was a mistake: after removing the non-free image,
an example was left behind; examples in mpl are used to generate the
documentation, and during the doc build this example failed, causing the failure
to generate all the HTML documentation for mpl. In this upload we remove that
example file, as suggested by upstream
I didnt notice this as erroneusly we were ignoring if the doc build process was
generating any errors; this upload also fixes this
debdiff between 2.0.0+dfsg1-1 and 2.0.0+dfsg1-2 is attached
unblock matplotlib/2.0.0+dfsg1-2
-- System Information:
Debian Release: stretch/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.2.0-1-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru matplotlib-2.0.0+dfsg1/debian/changelog
matplotlib-2.0.0+dfsg1/debian/changelog
--- matplotlib-2.0.0+dfsg1/debian/changelog 2017-02-12 16:13:26.000000000
-0500
+++ matplotlib-2.0.0+dfsg1/debian/changelog 2017-02-14 19:48:20.000000000
-0500
@@ -1,3 +1,13 @@
+matplotlib (2.0.0+dfsg1-2) unstable; urgency=medium
+
+ * debian/rules
+ - make a failure in the doc build process also fail the package build
+ * debian/patches/0010-remove-interpolation_none_vs_nearest.py.patch
+ - remove an example (which uses the removed necked_tensile_specimen.png
+ image) that made the HTML doc build to fail; Closes: #855029
+
+ -- Sandro Tosi <mo...@debian.org> Tue, 14 Feb 2017 19:48:20 -0500
+
matplotlib (2.0.0+dfsg1-1) unstable; urgency=medium
* Import upstream tarball with necked_tensile_specimen.png removed
diff -Nru matplotlib-2.0.0+dfsg1/debian/.git-dpm
matplotlib-2.0.0+dfsg1/debian/.git-dpm
--- matplotlib-2.0.0+dfsg1/debian/.git-dpm 2017-02-12 16:13:26.000000000
-0500
+++ matplotlib-2.0.0+dfsg1/debian/.git-dpm 2017-02-14 19:48:20.000000000
-0500
@@ -1,6 +1,6 @@
# see git-dpm(1) from git-dpm package
-cb2f046ef7cc2dc44026a658e5a590685e122b5b
-cb2f046ef7cc2dc44026a658e5a590685e122b5b
+87576dc0ee642fc0c5a298807705eb13492d6d4f
+87576dc0ee642fc0c5a298807705eb13492d6d4f
b358b1f4101ba111166b027228d545973408d1b9
b358b1f4101ba111166b027228d545973408d1b9
matplotlib_2.0.0+dfsg1.orig.tar.gz
diff -Nru
matplotlib-2.0.0+dfsg1/debian/patches/0010-remove-interpolation_none_vs_nearest.py.patch
matplotlib-2.0.0+dfsg1/debian/patches/0010-remove-interpolation_none_vs_nearest.py.patch
---
matplotlib-2.0.0+dfsg1/debian/patches/0010-remove-interpolation_none_vs_nearest.py.patch
1969-12-31 19:00:00.000000000 -0500
+++
matplotlib-2.0.0+dfsg1/debian/patches/0010-remove-interpolation_none_vs_nearest.py.patch
2017-02-14 19:48:20.000000000 -0500
@@ -0,0 +1,81 @@
+From 87576dc0ee642fc0c5a298807705eb13492d6d4f Mon Sep 17 00:00:00 2001
+From: Sandro Tosi <mo...@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 -Nru matplotlib-2.0.0+dfsg1/debian/patches/series
matplotlib-2.0.0+dfsg1/debian/patches/series
--- matplotlib-2.0.0+dfsg1/debian/patches/series 2017-02-12
16:13:26.000000000 -0500
+++ matplotlib-2.0.0+dfsg1/debian/patches/series 2017-02-14
19:48:20.000000000 -0500
@@ -7,3 +7,4 @@
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
diff -Nru matplotlib-2.0.0+dfsg1/debian/rules
matplotlib-2.0.0+dfsg1/debian/rules
--- matplotlib-2.0.0+dfsg1/debian/rules 2017-02-12 16:13:26.000000000 -0500
+++ matplotlib-2.0.0+dfsg1/debian/rules 2017-02-14 19:48:20.000000000 -0500
@@ -21,7 +21,7 @@
dh_testdir
# build the doc
- -( cd doc ; MPLCONFIGDIR=.
MATPLOTLIBDATA=$(CURDIR)/lib/matplotlib/mpl-data/ \
+ ( cd doc ; MPLCONFIGDIR=.
MATPLOTLIBDATA=$(CURDIR)/lib/matplotlib/mpl-data/ \
PYTHONPATH=$(CURDIR)/build/lib.$(PY_PLATFORM)-$(DEFPY)
./make.py --small html )
touch $@
