Update to 2.0.1.

This commit is contained in:
Elliott Sales de Andrade 2017-09-28 01:15:02 -04:00
parent e9a5a6f0c0
commit 14e87c4546
9 changed files with 78 additions and 96 deletions

1
.gitignore vendored
View File

@ -13,3 +13,4 @@ matplotlib-1.0.0-without-gpc.tar.gz
/matplotlib-2.0.0rc2.tar.gz /matplotlib-2.0.0rc2.tar.gz
/matplotlib-2.0.0.tar.gz /matplotlib-2.0.0.tar.gz
/matplotlib-2.0.0-without-copyrighted.tar.xz /matplotlib-2.0.0-without-copyrighted.tar.xz
/matplotlib-2.0.1.tar.gz

View File

@ -1,6 +1,6 @@
--- a/lib/matplotlib/__init__.py 2016-04-04 12:54:26.427194940 +0200 --- a/lib/matplotlib/__init__.py 2016-04-04 12:54:26.427194940 +0200
+++ b/lib/matplotlib/__init__.py 2016-04-04 12:56:12.662590255 +0200 +++ b/lib/matplotlib/__init__.py 2016-04-04 12:56:12.662590255 +0200
@@ -682,9 +682,12 @@ @@ -713,9 +713,12 @@ def _get_data_path():
_file = _decode_filesystem_path(__file__) _file = _decode_filesystem_path(__file__)
path = os.sep.join([os.path.dirname(_file), 'mpl-data']) path = os.sep.join([os.path.dirname(_file), 'mpl-data'])
@ -13,7 +13,7 @@
# setuptools' namespace_packages may highjack this init file # setuptools' namespace_packages may highjack this init file
# so need to try something known to be in matplotlib, not basemap # so need to try something known to be in matplotlib, not basemap
import matplotlib.afm import matplotlib.afm
@@ -812,7 +815,7 @@ @@ -843,7 +846,7 @@ def matplotlib_fname():
home, '.matplotlib', 'matplotlibrc') home, '.matplotlib', 'matplotlibrc')
return fname return fname

View File

@ -1,7 +1,7 @@
diff -up matplotlib-1.5.1/lib/matplotlib/tests/test_image.py.tests matplotlib-1.5.1/lib/matplotlib/tests/test_image.py diff -up matplotlib-1.5.1/lib/matplotlib/tests/test_image.py.tests matplotlib-1.5.1/lib/matplotlib/tests/test_image.py
--- matplotlib-1.5.1/lib/matplotlib/tests/test_image.py.tests 2016-05-23 14:04:41.000000000 +0200 --- matplotlib-1.5.1/lib/matplotlib/tests/test_image.py.tests 2016-05-23 14:04:41.000000000 +0200
+++ matplotlib-1.5.1/lib/matplotlib/tests/test_image.py 2016-06-02 00:28:37.076703843 +0200 +++ matplotlib-1.5.1/lib/matplotlib/tests/test_image.py 2016-06-02 00:28:37.076703843 +0200
@@ -186,7 +186,8 @@ def test_cursor_data(): @@ -217,7 +217,8 @@ def test_cursor_data():
event = MouseEvent('motion_notify_event', fig.canvas, xdisp, ydisp) event = MouseEvent('motion_notify_event', fig.canvas, xdisp, ydisp)
z = im.get_cursor_data(event) z = im.get_cursor_data(event)
@ -11,7 +11,7 @@ diff -up matplotlib-1.5.1/lib/matplotlib/tests/test_image.py.tests matplotlib-1.
# Hmm, something is wrong here... I get 0, not None... # Hmm, something is wrong here... I get 0, not None...
# But, this works further down in the tests with extents flipped # But, this works further down in the tests with extents flipped
@@ -224,14 +225,16 @@ def test_cursor_data(): @@ -255,14 +256,16 @@ def test_cursor_data():
event = MouseEvent('motion_notify_event', fig.canvas, xdisp, ydisp) event = MouseEvent('motion_notify_event', fig.canvas, xdisp, ydisp)
z = im.get_cursor_data(event) z = im.get_cursor_data(event)

View File

@ -1,6 +1,6 @@
--- matplotlib-2.0.0rc2/lib/matplotlib/tests/test_axes.py 2016-12-18 11:40:53.000000000 -0800 --- matplotlib-2.0.0rc2/lib/matplotlib/tests/test_axes.py 2016-12-18 11:40:53.000000000 -0800
+++ matplotlib-2.0.0rc2/lib/matplotlib/tests/test_axes.py.new 2017-01-07 21:28:07.736224906 -0800 +++ matplotlib-2.0.0rc2/lib/matplotlib/tests/test_axes.py.new 2017-01-07 21:28:07.736224906 -0800
@@ -1285,7 +1285,7 @@ @@ -1322,7 +1322,7 @@ def test_contour_colorbar():
cbar.add_lines(cs2, erase=False) cbar.add_lines(cs2, erase=False)
@ -9,31 +9,9 @@
def test_hist2d(): def test_hist2d():
np.random.seed(0) np.random.seed(0)
# make it not symetric in case we switch x and y axis # make it not symetric in case we switch x and y axis
--- matplotlib-2.0.0rc2/lib/matplotlib/tests/test_quiver.py 2016-12-18 11:40:53.000000000 -0800
+++ matplotlib-2.0.0rc2/lib/matplotlib/tests/test_quiver.py.new 2017-01-07 21:29:53.441682625 -0800
@@ -135,7 +135,7 @@
ax.quiverkey(q, 0, 0.5, 1, 'W', labelpos='W')
-@image_comparison(baseline_images=['barbs_test_image'],
+@image_comparison(baseline_images=['barbs_test_image'], tol=0.8,
extensions=['png'], remove_text=True)
def test_barbs():
x = np.linspace(-5, 5, 5)
--- matplotlib-2.0.0rc2/lib/matplotlib/tests/test_transforms.py 2016-12-18 11:40:53.000000000 -0800
+++ matplotlib-2.0.0rc2/lib/matplotlib/tests/test_transforms.py.new 2017-01-07 21:21:29.478503151 -0800
@@ -82,7 +82,7 @@
@image_comparison(baseline_images=['pre_transform_data'],
- tol=0.08)
+ tol=0.9)
def test_pre_transform_plotting():
# a catch-all for as many as possible plot layouts which handle
# pre-transforming the data NOTE: The axis range is important in this
--- matplotlib-2.0.0rc2/lib/matplotlib/tests/test_mlab.py 2016-12-18 11:40:53.000000000 -0800 --- matplotlib-2.0.0rc2/lib/matplotlib/tests/test_mlab.py 2016-12-18 11:40:53.000000000 -0800
+++ matplotlib-2.0.0rc2/lib/matplotlib/tests/test_mlab.py.new 2017-01-07 21:30:47.502916717 -0800 +++ matplotlib-2.0.0rc2/lib/matplotlib/tests/test_mlab.py.new 2017-01-07 21:30:47.502916717 -0800
@@ -2279,90 +2279,6 @@ @@ -2279,90 +2279,6 @@ class spectral_testcase_nosig_complex_defaultsided(
iscomplex=True, sides='default', nsides=2) iscomplex=True, sides='default', nsides=2)
@ -124,3 +102,25 @@
class spectral_testcase_nosig_real_onesided_noNFFT( class spectral_testcase_nosig_real_onesided_noNFFT(
spectral_testcase_nosig_real_onesided): spectral_testcase_nosig_real_onesided):
def setUp(self): def setUp(self):
--- matplotlib-2.0.0rc2/lib/matplotlib/tests/test_quiver.py 2016-12-18 11:40:53.000000000 -0800
+++ matplotlib-2.0.0rc2/lib/matplotlib/tests/test_quiver.py.new 2017-01-07 21:29:53.441682625 -0800
@@ -135,7 +135,7 @@ def test_quiver_key_pivot():
ax.quiverkey(q, 0, 0.5, 1, 'W', labelpos='W')
-@image_comparison(baseline_images=['barbs_test_image'],
+@image_comparison(baseline_images=['barbs_test_image'], tol=0.8,
extensions=['png'], remove_text=True)
def test_barbs():
x = np.linspace(-5, 5, 5)
--- matplotlib-2.0.0rc2/lib/matplotlib/tests/test_transforms.py 2016-12-18 11:40:53.000000000 -0800
+++ matplotlib-2.0.0rc2/lib/matplotlib/tests/test_transforms.py.new 2017-01-07 21:21:29.478503151 -0800
@@ -82,7 +82,7 @@ def test_external_transform_api():
@image_comparison(baseline_images=['pre_transform_data'],
- tol=0.08)
+ tol=0.9)
def test_pre_transform_plotting():
# a catch-all for as many as possible plot layouts which handle
# pre-transforming the data NOTE: The axis range is important in this

View File

@ -1,6 +1,6 @@
--- matplotlib-2.0.0rc2/lib/matplotlib/tests/test_axes.py 2016-12-18 11:40:53.000000000 -0800 --- matplotlib-2.0.0rc2/lib/matplotlib/tests/test_axes.py 2016-12-18 11:40:53.000000000 -0800
+++ matplotlib-2.0.0rc2/lib/matplotlib/tests/test_axes.py.new 2017-01-07 21:35:06.874039829 -0800 +++ matplotlib-2.0.0rc2/lib/matplotlib/tests/test_axes.py.new 2017-01-07 21:35:06.874039829 -0800
@@ -361,7 +361,7 @@ @@ -389,7 +389,7 @@ def test_single_point():
plt.plot('b','b', 'o', data=data) plt.plot('b','b', 'o', data=data)
@ -9,7 +9,7 @@
def test_single_date(): def test_single_date():
time1 = [721964.0] time1 = [721964.0]
data1 = [-65.54] data1 = [-65.54]
@@ -4696,7 +4696,7 @@ @@ -4759,7 +4759,7 @@ def test_date_timezone_y():
@image_comparison(baseline_images=['date_timezone_x_and_y'], @image_comparison(baseline_images=['date_timezone_x_and_y'],
@ -20,7 +20,7 @@
time_index = [pytz.timezone('UTC').localize(datetime.datetime( time_index = [pytz.timezone('UTC').localize(datetime.datetime(
--- matplotlib-2.0.0rc2/lib/matplotlib/tests/test_collections.py 2016-12-18 11:40:53.000000000 -0800 --- matplotlib-2.0.0rc2/lib/matplotlib/tests/test_collections.py 2016-12-18 11:40:53.000000000 -0800
+++ matplotlib-2.0.0rc2/lib/matplotlib/tests/test_collections.py.new 2017-01-07 21:35:52.016235301 -0800 +++ matplotlib-2.0.0rc2/lib/matplotlib/tests/test_collections.py.new 2017-01-07 21:35:52.016235301 -0800
@@ -489,7 +489,7 @@ @@ -489,7 +489,7 @@ def test_EllipseCollection():
ax.autoscale_view() ax.autoscale_view()
@ -31,7 +31,7 @@
from mpl_toolkits.mplot3d import Axes3D from mpl_toolkits.mplot3d import Axes3D
--- matplotlib-2.0.0rc2/lib/matplotlib/tests/test_contour.py 2016-12-18 11:40:53.000000000 -0800 --- matplotlib-2.0.0rc2/lib/matplotlib/tests/test_contour.py 2016-12-18 11:40:53.000000000 -0800
+++ matplotlib-2.0.0rc2/lib/matplotlib/tests/test_contour.py.new 2017-01-07 21:36:29.283396673 -0800 +++ matplotlib-2.0.0rc2/lib/matplotlib/tests/test_contour.py.new 2017-01-07 21:36:29.283396673 -0800
@@ -233,7 +233,7 @@ @@ -233,7 +233,7 @@ def test_contour_datetime_axis():
label.set_rotation(30) label.set_rotation(30)
@ -40,20 +40,9 @@
extensions=['png'], remove_text=True) extensions=['png'], remove_text=True)
def test_labels(): def test_labels():
# Adapted from pylab_examples example code: contour_demo.py # Adapted from pylab_examples example code: contour_demo.py
--- matplotlib-2.0.0rc2/lib/mpl_toolkits/tests/test_mplot3d.py 2016-12-18 11:40:53.000000000 -0800
+++ matplotlib-2.0.0rc2/lib/mpl_toolkits/tests/test_mplot3d.py.new 2017-01-07 21:37:04.144547626 -0800
@@ -171,7 +171,7 @@
ax.set_zlabel('Z axis')
-@image_comparison(baseline_images=['trisurf3d'], remove_text=True, tol=0.03)
+@image_comparison(baseline_images=['trisurf3d'], remove_text=True, tol=0.081)
def test_trisurf3d():
n_angles = 36
n_radii = 8
--- matplotlib-2.0.0rc2/lib/matplotlib/tests/test_transforms.py 2016-12-18 11:40:53.000000000 -0800 --- matplotlib-2.0.0rc2/lib/matplotlib/tests/test_transforms.py 2016-12-18 11:40:53.000000000 -0800
+++ matplotlib-2.0.0rc2/lib/matplotlib/tests/test_transforms.py.new 2017-01-07 21:21:29.478503151 -0800 +++ matplotlib-2.0.0rc2/lib/matplotlib/tests/test_transforms.py.new 2017-01-07 21:21:29.478503151 -0800
@@ -82,7 +82,7 @@ @@ -82,7 +82,7 @@ def test_external_transform_api():
@image_comparison(baseline_images=['pre_transform_data'], @image_comparison(baseline_images=['pre_transform_data'],
@ -62,4 +51,15 @@
def test_pre_transform_plotting(): def test_pre_transform_plotting():
# a catch-all for as many as possible plot layouts which handle # a catch-all for as many as possible plot layouts which handle
# pre-transforming the data NOTE: The axis range is important in this # pre-transforming the data NOTE: The axis range is important in this
--- matplotlib-2.0.0rc2/lib/mpl_toolkits/tests/test_mplot3d.py 2016-12-18 11:40:53.000000000 -0800
+++ matplotlib-2.0.0rc2/lib/mpl_toolkits/tests/test_mplot3d.py.new 2017-01-07 21:37:04.144547626 -0800
@@ -171,7 +171,7 @@ def test_text3d():
ax.set_zlabel('Z axis')
-@image_comparison(baseline_images=['trisurf3d'], remove_text=True, tol=0.03)
+@image_comparison(baseline_images=['trisurf3d'], remove_text=True, tol=0.081)
def test_trisurf3d():
n_angles = 36
n_radii = 8

View File

@ -1,17 +1,39 @@
--- matplotlib-2.0.0rc2/lib/matplotlib/testing/decorators.py 2016-12-18 11:40:53.000000000 -0800 --- matplotlib-2.0.0rc2/lib/matplotlib/testing/decorators.py 2016-12-18 11:40:53.000000000 -0800
+++ matplotlib-2.0.0rc2/lib/matplotlib/testing/decorators.py.new 2017-01-07 21:19:51.078081193 -0800 +++ matplotlib-2.0.0rc2/lib/matplotlib/testing/decorators.py.new 2017-01-07 21:19:51.078081193 -0800
@@ -266,7 +266,7 @@ @@ -266,7 +266,7 @@ class ImageComparisonTest(CleanupTest):
yield do_test, fignum, actual_fname, expected_fname yield do_test, fignum, actual_fname, expected_fname
-def image_comparison(baseline_images=None, extensions=None, tol=0, -def image_comparison(baseline_images=None, extensions=None, tol=0,
+def image_comparison(baseline_images=None, extensions=None, tol=0.306, +def image_comparison(baseline_images=None, extensions=None, tol=0.306,
freetype_version=None, remove_text=False, freetype_version=None, remove_text=False,
savefig_kwarg=None, style='classic'): savefig_kwarg=None, style='_classic_test'):
""" """
--- matplotlib-2.0.0rc2/lib/matplotlib/tests/test_mathtext.py 2016-12-18 11:40:53.000000000 -0800
+++ matplotlib-2.0.0rc2/lib/matplotlib/tests/test_mathtext.py.new 2017-01-07 22:02:42.396426402 -0800
@@ -159,7 +159,7 @@ for fonts, chars in font_test_specs:
def make_set(basename, fontset, tests, extensions=None):
def make_test(filename, test):
- @image_comparison(baseline_images=[filename], extensions=extensions)
+ @image_comparison(baseline_images=[filename], extensions=extensions, tol=0.310)
def single_test():
matplotlib.rcParams['mathtext.fontset'] = fontset
fig = plt.figure(figsize=(5.25, 0.75))
--- matplotlib-2.0.0rc2/lib/matplotlib/tests/test_patheffects.py 2016-12-18 11:40:53.000000000 -0800
+++ matplotlib-2.0.0rc2/lib/matplotlib/tests/test_patheffects.py.new 2017-01-07 21:21:08.014411109 -0800
@@ -138,7 +138,7 @@ def test_SimplePatchShadow_offset():
assert_equal(pe._offset, (4, 5))
-@image_comparison(baseline_images=['collection'], tol=0.015)
+@image_comparison(baseline_images=['collection'], tol=0.083)
def test_collection():
x, y = np.meshgrid(np.linspace(0, 10, 150), np.linspace(-5, 5, 100))
data = np.sin(x) + np.cos(y)
--- matplotlib-2.0.0rc2/lib/matplotlib/tests/test_png.py 2016-12-18 11:40:53.000000000 -0800 --- matplotlib-2.0.0rc2/lib/matplotlib/tests/test_png.py 2016-12-18 11:40:53.000000000 -0800
+++ matplotlib-2.0.0rc2/lib/matplotlib/tests/test_png.py.new 2017-01-07 21:20:22.388215456 -0800 +++ matplotlib-2.0.0rc2/lib/matplotlib/tests/test_png.py.new 2017-01-07 21:20:22.388215456 -0800
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@ on_win = (sys.platform == 'win32')
@image_comparison(baseline_images=['pngsuite'], extensions=['png'], @image_comparison(baseline_images=['pngsuite'], extensions=['png'],
@ -22,7 +44,7 @@
os.path.dirname(__file__), os.path.dirname(__file__),
--- matplotlib-2.0.0rc2/lib/matplotlib/tests/test_streamplot.py 2016-12-18 11:40:53.000000000 -0800 --- matplotlib-2.0.0rc2/lib/matplotlib/tests/test_streamplot.py 2016-12-18 11:40:53.000000000 -0800
+++ matplotlib-2.0.0rc2/lib/matplotlib/tests/test_streamplot.py.new 2017-01-07 21:20:42.180300328 -0800 +++ matplotlib-2.0.0rc2/lib/matplotlib/tests/test_streamplot.py.new 2017-01-07 21:20:42.180300328 -0800
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@ def velocity_field():
@image_comparison(baseline_images=['streamplot_colormap'], @image_comparison(baseline_images=['streamplot_colormap'],
@ -31,25 +53,3 @@
def test_colormap(): def test_colormap():
X, Y, U, V = velocity_field() X, Y, U, V = velocity_field()
plt.streamplot(X, Y, U, V, color=U, density=0.6, linewidth=2, plt.streamplot(X, Y, U, V, color=U, density=0.6, linewidth=2,
--- matplotlib-2.0.0rc2/lib/matplotlib/tests/test_patheffects.py 2016-12-18 11:40:53.000000000 -0800
+++ matplotlib-2.0.0rc2/lib/matplotlib/tests/test_patheffects.py.new 2017-01-07 21:21:08.014411109 -0800
@@ -110,7 +110,7 @@
assert_equal(pe._offset, (4, 5))
-@image_comparison(baseline_images=['collection'], tol=0.015)
+@image_comparison(baseline_images=['collection'], tol=0.083)
def test_collection():
x, y = np.meshgrid(np.linspace(0, 10, 150), np.linspace(-5, 5, 100))
data = np.sin(x) + np.cos(y)
--- matplotlib-2.0.0rc2/lib/matplotlib/tests/test_mathtext.py 2016-12-18 11:40:53.000000000 -0800
+++ matplotlib-2.0.0rc2/lib/matplotlib/tests/test_mathtext.py.new 2017-01-07 22:02:42.396426402 -0800
@@ -158,7 +158,7 @@
def make_set(basename, fontset, tests, extensions=None):
def make_test(filename, test):
- @image_comparison(baseline_images=[filename], extensions=extensions)
+ @image_comparison(baseline_images=[filename], extensions=extensions, tol=0.310)
def single_test():
matplotlib.rcParams['mathtext.fontset'] = fontset
fig = plt.figure(figsize=(5.25, 0.75))

View File

@ -54,15 +54,14 @@
#global rctag rc2 #global rctag rc2
Name: python-matplotlib Name: python-matplotlib
Version: 2.0.0 Version: 2.0.1
Release: 3%{?rctag:.%{rctag}}%{?dist}.2 Release: 1%{?rctag:.%{rctag}}%{?dist}
Summary: Python 2D plotting library Summary: Python 2D plotting library
Group: Development/Libraries Group: Development/Libraries
# qt4_editor backend is MIT # qt4_editor backend is MIT
License: Python and MIT License: Python and MIT
URL: http://matplotlib.org URL: http://matplotlib.org
#Source0: https://github.com/matplotlib/matplotlib/archive/v%{version}%{?rctag}.tar.gz#/matplotlib-%{version}%{?rctag}.tar.gz Source0: https://github.com/matplotlib/matplotlib/archive/v%{version}%{?rctag}.tar.gz#/matplotlib-%{version}%{?rctag}.tar.gz
Source0: matplotlib-%{version}-without-copyrighted.tar.xz
Source1: setup.cfg Source1: setup.cfg
Patch2: 20_matplotlibrc_path_search_fix.patch Patch2: 20_matplotlibrc_path_search_fix.patch
@ -617,6 +616,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \
%endif %endif
%changelog %changelog
* Thu Sep 28 2017 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.0.1-1
- Update to latest release
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-3.2 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-3.2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

View File

@ -1,21 +0,0 @@
#! /bin/sh
version=$1
[ -z $version ] && exit 1
dir=matplotlib-${version}
file=matplotlib-${version}.tar.gz
result=matplotlib-${version}-without-copyrighted.tar.xz
test -f $file || exit 1
rm -rf matplotlib-${version}
tar xzf $file
# https://github.com/matplotlib/matplotlib/issues/8034
rm -vr matplotlib-${version}/lib/matplotlib/mpl-data/sample_data/necked_tensile_specimen.png
rm -vr matplotlib-${version}/examples/images_contours_and_fields/interpolation_none_vs_nearest.py
rm -f $result
tar cJf $result $dir

View File

@ -1 +1 @@
SHA512 (matplotlib-2.0.0-without-copyrighted.tar.xz) = 6413b0187b3d7ce5e4cbfaf7de4f42a747f1a415dbe3dca71c5f0ff0b8ac7139dc2807302bfbc67428281cfc7744cc23c6bbda041cd0568eff71801a740b862d SHA512 (matplotlib-2.0.1.tar.gz) = 763e7b980d66a66b8928f2dcb09b48a8e13f1092a6aa52ffa5d0247ee10747f97d35cf059f0cce51a95fce240850c4c03c6e49d9b26fddfcc4f049864d8767ce