rpms
/
python-matplotlib
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to 3.0.1.

This commit is contained in:
Elliott Sales de Andrade 2018-10-31 02:47:13 -04:00
parent cc106d1c4a
commit 7424178997
5 changed files with 64 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
0001-matplotlibrc-path-search-fix.patch
View File

@ -1,4 +1,4 @@
From 2ff8ec9b9047b8197d96e651e038eab73e3a6cd2 Mon Sep 17 00:00:00 2001
From 67089439c9e2b84ba1e75a6edc1a060420c16a80 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Wed, 27 Sep 2017 19:35:59 -0400
Subject: [PATCH 1/3] matplotlibrc path search fix
@ -10,7 +10,7 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
2 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
index f7b37ee3b..508e1658d 100644
index ae64a61b5..789501a85 100644
--- a/lib/matplotlib/__init__.py
+++ b/lib/matplotlib/__init__.py
@@ -664,18 +664,7 @@ def _get_data_path():

6
0002-Increase-tolerances-for-non-x86_64-arches.patch
View File

@ -1,4 +1,4 @@
From 9b67dee47af3705cacc41d639f31a9bc99934111 Mon Sep 17 00:00:00 2001
From d34f76c48da2ee2e743be8b456753368bef624da Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Tue, 23 Jan 2018 20:27:17 -0500
Subject: [PATCH 2/3] Increase tolerances for non-x86_64 arches.
@ -23,10 +23,10 @@ index 17c0d1967..e261513df 100644
def test_masks_and_nans():
X, Y, U, V = velocity_field()
diff --git a/lib/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py
index 896ba503f..bd48bee72 100644
index 2ac9d7d08..89f72fa86 100644
--- a/lib/mpl_toolkits/tests/test_axes_grid1.py
+++ b/lib/mpl_toolkits/tests/test_axes_grid1.py
@@ -359,7 +359,7 @@ def test_zooming_with_inverted_axes():
@@ -360,7 +360,7 @@ def test_zooming_with_inverted_axes():
@image_comparison(baseline_images=['anchored_direction_arrows'],

66
0003-Increase-some-tolerances-for-32-bit-systems.patch
View File

@ -1,4 +1,4 @@
From a9c30f31914db1afc25a7e56ab0a02633b7b1f37 Mon Sep 17 00:00:00 2001
From 293da37b505be24404df8aea605ab424e0420f1b Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Sat, 31 Mar 2018 00:15:14 -0400
Subject: [PATCH 3/3] Increase some tolerances for 32-bit systems.
@ -57,7 +57,7 @@ index 283db9abe..2ae11142c 100644
exterior = mpath.Path.unit_rectangle().deepcopy()
exterior.vertices *= 4
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
index 6afed91f3..e931e7a4a 100644
index 3c9b7dfc5..12a7d2466 100644
--- a/lib/matplotlib/tests/test_axes.py
+++ b/lib/matplotlib/tests/test_axes.py
@@ -553,7 +553,7 @@ def test_single_point():
@ -107,7 +107,7 @@ index 6afed91f3..e931e7a4a 100644
def test_arc_angles():
from matplotlib import patches
# Ellipse parameters
@@ -2533,7 +2535,7 @@ def test_boxplot_mod_artist_after_plotting():
@@ -2539,7 +2541,7 @@ def test_boxplot_mod_artist_after_plotting():
@image_comparison(baseline_images=['violinplot_vert_baseline',
'violinplot_vert_baseline'],
@ -116,7 +116,7 @@ index 6afed91f3..e931e7a4a 100644
def test_vert_violinplot_baseline():
# First 9 digits of frac(sqrt(2))
np.random.seed(414213562)
@@ -2551,7 +2553,7 @@ def test_vert_violinplot_baseline():
@@ -2557,7 +2559,7 @@ def test_vert_violinplot_baseline():
@image_comparison(baseline_images=['violinplot_vert_showmeans'],
@ -125,7 +125,7 @@ index 6afed91f3..e931e7a4a 100644
def test_vert_violinplot_showmeans():
ax = plt.axes()
# First 9 digits of frac(sqrt(3))
@@ -2562,7 +2564,7 @@ def test_vert_violinplot_showmeans():
@@ -2568,7 +2570,7 @@ def test_vert_violinplot_showmeans():
@image_comparison(baseline_images=['violinplot_vert_showextrema'],
@ -134,7 +134,7 @@ index 6afed91f3..e931e7a4a 100644
def test_vert_violinplot_showextrema():
ax = plt.axes()
# First 9 digits of frac(sqrt(5))
@@ -2573,7 +2575,7 @@ def test_vert_violinplot_showextrema():
@@ -2579,7 +2581,7 @@ def test_vert_violinplot_showextrema():
@image_comparison(baseline_images=['violinplot_vert_showmedians'],
@ -143,7 +143,7 @@ index 6afed91f3..e931e7a4a 100644
def test_vert_violinplot_showmedians():
ax = plt.axes()
# First 9 digits of frac(sqrt(7))
@@ -2584,7 +2586,7 @@ def test_vert_violinplot_showmedians():
@@ -2590,7 +2592,7 @@ def test_vert_violinplot_showmedians():
@image_comparison(baseline_images=['violinplot_vert_showall'],
@ -152,7 +152,7 @@ index 6afed91f3..e931e7a4a 100644
def test_vert_violinplot_showall():
ax = plt.axes()
# First 9 digits of frac(sqrt(11))
@@ -2595,7 +2597,7 @@ def test_vert_violinplot_showall():
@@ -2601,7 +2603,7 @@ def test_vert_violinplot_showall():
@image_comparison(baseline_images=['violinplot_vert_custompoints_10'],
@ -161,7 +161,7 @@ index 6afed91f3..e931e7a4a 100644
def test_vert_violinplot_custompoints_10():
ax = plt.axes()
# First 9 digits of frac(sqrt(13))
@@ -2606,7 +2608,7 @@ def test_vert_violinplot_custompoints_10():
@@ -2612,7 +2614,7 @@ def test_vert_violinplot_custompoints_10():
@image_comparison(baseline_images=['violinplot_vert_custompoints_200'],
@ -170,7 +170,7 @@ index 6afed91f3..e931e7a4a 100644
def test_vert_violinplot_custompoints_200():
ax = plt.axes()
# First 9 digits of frac(sqrt(17))
@@ -2617,7 +2619,7 @@ def test_vert_violinplot_custompoints_200():
@@ -2623,7 +2625,7 @@ def test_vert_violinplot_custompoints_200():
@image_comparison(baseline_images=['violinplot_horiz_baseline'],
@ -179,7 +179,7 @@ index 6afed91f3..e931e7a4a 100644
def test_horiz_violinplot_baseline():
ax = plt.axes()
# First 9 digits of frac(sqrt(19))
@@ -2628,7 +2630,7 @@ def test_horiz_violinplot_baseline():
@@ -2634,7 +2636,7 @@ def test_horiz_violinplot_baseline():
@image_comparison(baseline_images=['violinplot_horiz_showmedians'],
@ -188,7 +188,7 @@ index 6afed91f3..e931e7a4a 100644
def test_horiz_violinplot_showmedians():
ax = plt.axes()
# First 9 digits of frac(sqrt(23))
@@ -2639,7 +2641,7 @@ def test_horiz_violinplot_showmedians():
@@ -2645,7 +2647,7 @@ def test_horiz_violinplot_showmedians():
@image_comparison(baseline_images=['violinplot_horiz_showmeans'],
@ -197,7 +197,7 @@ index 6afed91f3..e931e7a4a 100644
def test_horiz_violinplot_showmeans():
ax = plt.axes()
# First 9 digits of frac(sqrt(29))
@@ -2650,7 +2652,7 @@ def test_horiz_violinplot_showmeans():
@@ -2656,7 +2658,7 @@ def test_horiz_violinplot_showmeans():
@image_comparison(baseline_images=['violinplot_horiz_showextrema'],
@ -206,7 +206,7 @@ index 6afed91f3..e931e7a4a 100644
def test_horiz_violinplot_showextrema():
ax = plt.axes()
# First 9 digits of frac(sqrt(31))
@@ -2661,7 +2663,7 @@ def test_horiz_violinplot_showextrema():
@@ -2667,7 +2669,7 @@ def test_horiz_violinplot_showextrema():
@image_comparison(baseline_images=['violinplot_horiz_showall'],
@ -215,7 +215,7 @@ index 6afed91f3..e931e7a4a 100644
def test_horiz_violinplot_showall():
ax = plt.axes()
# First 9 digits of frac(sqrt(37))
@@ -2672,7 +2674,7 @@ def test_horiz_violinplot_showall():
@@ -2678,7 +2680,7 @@ def test_horiz_violinplot_showall():
@image_comparison(baseline_images=['violinplot_horiz_custompoints_10'],
@ -224,7 +224,7 @@ index 6afed91f3..e931e7a4a 100644
def test_horiz_violinplot_custompoints_10():
ax = plt.axes()
# First 9 digits of frac(sqrt(41))
@@ -2683,7 +2685,7 @@ def test_horiz_violinplot_custompoints_10():
@@ -2689,7 +2691,7 @@ def test_horiz_violinplot_custompoints_10():
@image_comparison(baseline_images=['violinplot_horiz_custompoints_200'],
@ -233,7 +233,7 @@ index 6afed91f3..e931e7a4a 100644
def test_horiz_violinplot_custompoints_200():
ax = plt.axes()
# First 9 digits of frac(sqrt(43))
@@ -3347,8 +3349,7 @@ def test_vertex_markers():
@@ -3368,8 +3370,7 @@ def test_vertex_markers():
@image_comparison(baseline_images=['vline_hline_zorder',
@ -243,7 +243,7 @@ index 6afed91f3..e931e7a4a 100644
def test_eb_line_zorder():
x = list(range(10))
@@ -4028,7 +4029,7 @@ def test_psd_noise():
@@ -4049,7 +4050,7 @@ def test_psd_noise():
@image_comparison(baseline_images=['csd_freqs'], remove_text=True,
@ -252,7 +252,7 @@ index 6afed91f3..e931e7a4a 100644
def test_csd_freqs():
'''test axes.csd with sinusoidal stimuli'''
n = 10000
@@ -4921,7 +4922,7 @@ def test_rc_spines():
@@ -4942,7 +4943,7 @@ def test_rc_spines():
@image_comparison(baseline_images=['rc_grid'], extensions=['png'],
@ -261,7 +261,7 @@ index 6afed91f3..e931e7a4a 100644
def test_rc_grid():
fig = plt.figure()
rc_dict0 = {
@@ -5440,7 +5441,7 @@ def test_date_timezone_y():
@@ -5461,7 +5462,7 @@ def test_date_timezone_y():
@image_comparison(baseline_images=['date_timezone_x_and_y'],
@ -284,10 +284,10 @@ index 6812ee1ad..5e5f19aac 100644
from mpl_toolkits.mplot3d import Axes3D
diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py
index 56a829418..949eaf1b7 100644
index 6137da4af..ba2815603 100644
--- a/lib/matplotlib/tests/test_colorbar.py
+++ b/lib/matplotlib/tests/test_colorbar.py
@@ -93,7 +93,7 @@ def _colorbar_extension_length(spacing):
@@ -94,7 +94,7 @@ def _colorbar_extension_length(spacing):
@image_comparison(
baseline_images=['colorbar_extensions_shape_uniform',
'colorbar_extensions_shape_proportional'],
@ -296,7 +296,7 @@ index 56a829418..949eaf1b7 100644
def test_colorbar_extension_shape():
'''Test rectangular colorbar extensions.'''
# Create figures for uniform and proportionally spaced colorbars.
@@ -103,7 +103,7 @@ def test_colorbar_extension_shape():
@@ -104,7 +104,7 @@ def test_colorbar_extension_shape():
@image_comparison(baseline_images=['colorbar_extensions_uniform',
'colorbar_extensions_proportional'],
@ -305,7 +305,7 @@ index 56a829418..949eaf1b7 100644
def test_colorbar_extension_length():
'''Test variable length colorbar extensions.'''
# Create figures for uniform and proportionally spaced colorbars.
@@ -117,7 +117,7 @@ def test_colorbar_extension_length():
@@ -118,7 +118,7 @@ def test_colorbar_extension_length():
'cbar_sharing',
],
extensions=['png'], remove_text=True,
@ -314,7 +314,7 @@ index 56a829418..949eaf1b7 100644
def test_colorbar_positioning():
data = np.arange(1200).reshape(30, 40)
levels = [0, 200, 400, 600, 800, 1000, 1200]
@@ -171,7 +171,7 @@ def test_colorbar_positioning():
@@ -172,7 +172,7 @@ def test_colorbar_positioning():
@image_comparison(baseline_images=['cbar_with_subplots_adjust'],
extensions=['png'], remove_text=True,
@ -323,7 +323,7 @@ index 56a829418..949eaf1b7 100644
def test_gridspec_make_colorbar():
plt.figure()
data = np.arange(1200).reshape(30, 40)
@@ -230,7 +230,8 @@ def test_colorbarbase():
@@ -231,7 +231,8 @@ def test_colorbarbase():
@image_comparison(
baseline_images=['colorbar_closed_patch'],
@ -334,7 +334,7 @@ index 56a829418..949eaf1b7 100644
fig = plt.figure(figsize=(8, 6))
ax1 = fig.add_axes([0.05, 0.85, 0.9, 0.1])
diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
index 0803504ce..b3a615d5a 100644
index e282cb6ad..701683198 100644
--- a/lib/matplotlib/tests/test_constrainedlayout.py
+++ b/lib/matplotlib/tests/test_constrainedlayout.py
@@ -246,7 +246,7 @@ def test_constrained_layout12():
@ -347,7 +347,7 @@ index 0803504ce..b3a615d5a 100644
def test_constrained_layout13():
'Test that padding works.'
diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
index 9868f4023..d8a490794 100644
index c1f27b9ef..149afadb9 100644
--- a/lib/matplotlib/tests/test_contour.py
+++ b/lib/matplotlib/tests/test_contour.py
@@ -227,7 +227,8 @@ def test_given_colors_levels_and_extends():
@ -567,17 +567,17 @@ index 6275d5b54..a5c03f0a3 100644
# a catch-all for as many as possible plot layouts which handle
# pre-transforming the data NOTE: The axis range is important in this
diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py
index 20840d7b8..80744294d 100644
index fec498af3..fe8f3f383 100644
--- a/lib/matplotlib/tests/test_units.py
+++ b/lib/matplotlib/tests/test_units.py
@@ -41,7 +41,6 @@ class Quantity(object):
@@ -75,7 +75,6 @@ def quantity_converter():
# Tests that the conversion machinery works properly for classes that
# work as a facade over numpy arrays (like pint)
@image_comparison(baseline_images=['plot_pint'],
- tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
extensions=['png'], remove_text=False, style='mpl20')
def test_numpy_facade():
# Create an instance of the conversion interface and
def test_numpy_facade(quantity_converter):
# Register the class
diff --git a/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py b/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py
index 929c0368a..e6e5ca1ff 100644
--- a/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py
@ -601,7 +601,7 @@ index 929c0368a..e6e5ca1ff 100644
fig = plt.figure(figsize=(5, 5))
fig.clf()
diff --git a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
index 0f5e86322..590430315 100644
index 32e1c884d..2b38866c5 100644
--- a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
+++ b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
@@ -17,7 +17,7 @@ from mpl_toolkits.axisartist.grid_helper_curvelinear import \

39
0003-Increase-some-tolerances-for-non-x86-arches.patch
View File

@ -1,4 +1,4 @@
From 642f104f23c78af5d6010916961ec62779290ea5 Mon Sep 17 00:00:00 2001
From dbab6d1e9cf6a18b3464e0d568f1f1468af6c009 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Sat, 31 Mar 2018 00:33:37 -0400
Subject: [PATCH 3/3] Increase some tolerances for non-x86 arches.
@ -18,8 +18,8 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
lib/matplotlib/tests/test_scale.py | 2 +-
lib/matplotlib/tests/test_streamplot.py | 2 +-
lib/matplotlib/tests/test_units.py | 4 ++--
.../tests/test_axisartist_grid_helper_curvelinear.py | 2 +-
14 files changed, 22 insertions(+), 22 deletions(-)
.../tests/test_axisartist_grid_helper_curvelinear.py | 4 ++--
14 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py
index f678fbed3..bac0cb802 100644
@ -44,7 +44,7 @@ index f678fbed3..bac0cb802 100644
def test_fancyarrow_dpi_cor_200dpi():
"""
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
index 6afed91f3..755be5570 100644
index 3c9b7dfc5..2373010eb 100644
--- a/lib/matplotlib/tests/test_axes.py
+++ b/lib/matplotlib/tests/test_axes.py
@@ -386,7 +386,7 @@ def test_annotate_default_arrow():
@ -56,7 +56,7 @@ index 6afed91f3..755be5570 100644
def test_polar_annotations():
# you can specify the xypoint and the xytext in different
# positions and coordinate systems, and optionally turn on a
@@ -3348,7 +3348,7 @@ def test_vertex_markers():
@@ -3369,7 +3369,7 @@ def test_vertex_markers():
@image_comparison(baseline_images=['vline_hline_zorder',
'errorbar_zorder'],
@ -65,7 +65,7 @@ index 6afed91f3..755be5570 100644
def test_eb_line_zorder():
x = list(range(10))
@@ -5120,7 +5120,7 @@ def test_title_location_roundtrip():
@@ -5141,7 +5141,7 @@ def test_title_location_roundtrip():
@image_comparison(baseline_images=["loglog"], remove_text=True,
extensions=['png'],
@ -75,10 +75,10 @@ index 6afed91f3..755be5570 100644
fig, ax = plt.subplots()
x = np.arange(1, 11)
diff --git a/lib/matplotlib/tests/test_backends_interactive.py b/lib/matplotlib/tests/test_backends_interactive.py
index 7ba47be93..bf05c5286 100644
index 0cb17c9d1..4fb8fb76c 100644
--- a/lib/matplotlib/tests/test_backends_interactive.py
+++ b/lib/matplotlib/tests/test_backends_interactive.py
@@ -101,7 +101,7 @@ fig.canvas.mpl_connect("draw_event", lambda event: timer.start())
@@ -103,7 +103,7 @@ fig.canvas.mpl_connect("draw_event", lambda event: timer.start())
plt.show()
"""
@ -101,7 +101,7 @@ index 6812ee1ad..582aabb5c 100644
def test_EllipseCollection():
# Test basic functionality
diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
index 0803504ce..63e3c6781 100644
index e282cb6ad..f1844fd86 100644
--- a/lib/matplotlib/tests/test_constrainedlayout.py
+++ b/lib/matplotlib/tests/test_constrainedlayout.py
@@ -173,7 +173,7 @@ def test_constrained_layout9():
@ -241,19 +241,19 @@ index e261513df..c8c8faf99 100644
def test_linewidth():
X, Y, U, V = velocity_field()
diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py
index 20840d7b8..ddddcdc44 100644
index fec498af3..12a8d8a3e 100644
--- a/lib/matplotlib/tests/test_units.py
+++ b/lib/matplotlib/tests/test_units.py
@@ -41,7 +41,7 @@ class Quantity(object):
@@ -75,7 +75,7 @@ def quantity_converter():
# Tests that the conversion machinery works properly for classes that
# work as a facade over numpy arrays (like pint)
@image_comparison(baseline_images=['plot_pint'],
- tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
+ tol=0.003,
extensions=['png'], remove_text=False, style='mpl20')
def test_numpy_facade():
# Create an instance of the conversion interface and
@@ -86,7 +86,7 @@ def test_numpy_facade():
def test_numpy_facade(quantity_converter):
# Register the class
@@ -100,7 +100,7 @@ def test_numpy_facade(quantity_converter):
# Tests gh-8908
@image_comparison(baseline_images=['plot_masked_units'],
@ -263,9 +263,18 @@ index 20840d7b8..ddddcdc44 100644
def test_plot_masked_units():
data = np.linspace(-5, 5)
diff --git a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
index 0f5e86322..83c1054a4 100644
index 32e1c884d..741d197b5 100644
--- a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
+++ b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
@@ -17,7 +17,7 @@ from mpl_toolkits.axisartist.grid_helper_curvelinear import \
@image_comparison(baseline_images=['custom_transform'],
- extensions=['png'], style='default', tol=0.03)
+ extensions=['png'], style='default', tol=0.04)
def test_custom_transform():
class MyTransform(Transform):
input_dims = 2
@@ -85,7 +85,7 @@ def test_custom_transform():

7
python-matplotlib.spec
View File

@ -40,8 +40,8 @@
%global ftver 2.9.1
Name: python-matplotlib
Version: 3.0.0
Release: 2%{?rctag:.%{rctag}}%{?dist}
Version: 3.0.1
Release: 1%{?rctag:.%{rctag}}%{?dist}
Summary: Python 2D plotting library
# qt4_editor backend is MIT
License: Python and MIT
@ -52,8 +52,6 @@ Source1: setup.cfg
# Because the qhull package stopped shipping pkgconfig files.
# https://src.fedoraproject.org/rpms/qhull/pull-request/1
Patch0001: 0001-Force-using-system-qhull.patch
# https://github.com/matplotlib/matplotlib/pull/12157
Patch0002: 12157.patch
# Fedora-specific patches; see:
# https://github.com/QuLogic/matplotlib/tree/fedora-patches
@ -244,7 +242,6 @@ Requires: python3-matplotlib%{?_isa} = %{version}-%{release}
%prep
%autosetup -n matplotlib-%{version}%{?rctag} -N
%patch0001 -p1
%patch0002 -p1
# Fedora-specific patches follow:
%patch1001 -p1