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

Update to latest version.

This commit is contained in:
Elliott Sales de Andrade 2020-02-14 04:24:14 -05:00
parent 1f37c6ab3a
commit b0c798dbcb
8 changed files with 46 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -42,3 +42,4 @@ matplotlib-1.0.0-without-gpc.tar.gz
/matplotlib-3.1.1.tar.gz
/matplotlib-3.1.1-with-freetype-2.10.0.tar.gz
/matplotlib-3.1.2.tar.gz
/matplotlib-3.1.3.tar.gz

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

@ -1,4 +1,4 @@
From 7a2146f4de31667bf977ba11598078f76beaf89c Mon Sep 17 00:00:00 2001
From 9776757607af144c824d72920f8983efc35face3 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/4] matplotlibrc path search fix
@ -101,5 +101,5 @@ index d8fe73ceb..c3aeb58ef 100644
newlines = []
for line in rclines:
--
2.21.0
2.21.1

12
0002-Set-FreeType-version-to-2.10.0-and-update-tolerances.patch
View File

@ -1,4 +1,4 @@
From 53e911c1eb6b840036acfd6b630439bc55b4bdca Mon Sep 17 00:00:00 2001
From 939fcad1ab9dc4986bd86842f616dc50cb6398e2 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Sat, 4 May 2019 04:36:45 -0400
Subject: [PATCH 2/4] Set FreeType version to 2.10.0 and update tolerances.
@ -26,10 +26,10 @@ index 7a4115491..1bf9d3e03 100644
from matplotlib import ft2font
if (ft2font.__freetype_version__ != LOCAL_FREETYPE_VERSION or
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
index 8ff5ac45d..25f5695f3 100644
index 356b9ad42..84a1956ee 100644
--- a/lib/matplotlib/tests/test_axes.py
+++ b/lib/matplotlib/tests/test_axes.py
@@ -6198,7 +6198,7 @@ def test_normal_axes():
@@ -6207,7 +6207,7 @@ def test_normal_axes():
]
for nn, b in enumerate(bbaxis):
targetbb = mtransforms.Bbox.from_bounds(*target[nn])
@ -38,7 +38,7 @@ index 8ff5ac45d..25f5695f3 100644
target = [
[150.0, 119.999, 930.0, 11.111],
@@ -6216,7 +6216,7 @@ def test_normal_axes():
@@ -6225,7 +6225,7 @@ def test_normal_axes():
target = [85.5138, 75.88888, 1021.11, 1017.11]
targetbb = mtransforms.Bbox.from_bounds(*target)
@ -47,7 +47,7 @@ index 8ff5ac45d..25f5695f3 100644
# test that get_position roundtrips to get_window_extent
axbb = ax.get_position().transformed(fig.transFigure).bounds
@@ -6341,7 +6341,7 @@ def test_get_tightbbox_polar():
@@ -6350,7 +6350,7 @@ def test_get_tightbbox_polar():
fig.canvas.draw()
bb = ax.get_tightbbox(fig.canvas.get_renderer())
assert_allclose(bb.extents,
@ -110,5 +110,5 @@ index 3e8b382cc..2a3fc3ee7 100644
--
2.21.0
2.21.1

4
0003-Increase-tolerances-for-non-x86_64-arches.patch
View File

@ -1,4 +1,4 @@
From b3b02bdfe6db629bc68a87a472b5f88d988bf5f2 Mon Sep 17 00:00:00 2001
From 83ec21942e1b7d80000d801595c57a653eefa243 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 3/4] Increase tolerances for non-x86_64 arches.
@ -36,5 +36,5 @@ index 95b1ae5a3..e054196b4 100644
def test_anchored_direction_arrows():
fig, ax = plt.subplots()
--
2.21.0
2.21.1

42
0004-Increase-some-tolerances-for-32-bit-systems.patch
View File

@ -1,4 +1,4 @@
From fb6a3a64fe6f5b314c1c54bbef745b78ee512417 Mon Sep 17 00:00:00 2001
From d9fada8cc0ef89142222f4c163ec9dd155662cb6 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 4/4] Increase some tolerances for 32-bit systems.
@ -57,7 +57,7 @@ index 9bf15d0b9..5339dd2eb 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 25f5695f3..f6ddc4e95 100644
index 84a1956ee..50eb0e6a4 100644
--- a/lib/matplotlib/tests/test_axes.py
+++ b/lib/matplotlib/tests/test_axes.py
@@ -562,7 +562,7 @@ def test_single_point():
@ -107,7 +107,7 @@ index 25f5695f3..f6ddc4e95 100644
def test_arc_angles():
from matplotlib import patches
# Ellipse parameters
@@ -2635,7 +2637,7 @@ def test_boxplot_mod_artist_after_plotting():
@@ -2644,7 +2646,7 @@ def test_boxplot_mod_artist_after_plotting():
@image_comparison(baseline_images=['violinplot_vert_baseline',
'violinplot_vert_baseline'],
@ -116,7 +116,7 @@ index 25f5695f3..f6ddc4e95 100644
def test_vert_violinplot_baseline():
# First 9 digits of frac(sqrt(2))
np.random.seed(414213562)
@@ -2653,7 +2655,7 @@ def test_vert_violinplot_baseline():
@@ -2662,7 +2664,7 @@ def test_vert_violinplot_baseline():
@image_comparison(baseline_images=['violinplot_vert_showmeans'],
@ -125,7 +125,7 @@ index 25f5695f3..f6ddc4e95 100644
def test_vert_violinplot_showmeans():
ax = plt.axes()
# First 9 digits of frac(sqrt(3))
@@ -2664,7 +2666,7 @@ def test_vert_violinplot_showmeans():
@@ -2673,7 +2675,7 @@ def test_vert_violinplot_showmeans():
@image_comparison(baseline_images=['violinplot_vert_showextrema'],
@ -134,7 +134,7 @@ index 25f5695f3..f6ddc4e95 100644
def test_vert_violinplot_showextrema():
ax = plt.axes()
# First 9 digits of frac(sqrt(5))
@@ -2675,7 +2677,7 @@ def test_vert_violinplot_showextrema():
@@ -2684,7 +2686,7 @@ def test_vert_violinplot_showextrema():
@image_comparison(baseline_images=['violinplot_vert_showmedians'],
@ -143,7 +143,7 @@ index 25f5695f3..f6ddc4e95 100644
def test_vert_violinplot_showmedians():
ax = plt.axes()
# First 9 digits of frac(sqrt(7))
@@ -2686,7 +2688,7 @@ def test_vert_violinplot_showmedians():
@@ -2695,7 +2697,7 @@ def test_vert_violinplot_showmedians():
@image_comparison(baseline_images=['violinplot_vert_showall'],
@ -152,7 +152,7 @@ index 25f5695f3..f6ddc4e95 100644
def test_vert_violinplot_showall():
ax = plt.axes()
# First 9 digits of frac(sqrt(11))
@@ -2697,7 +2699,7 @@ def test_vert_violinplot_showall():
@@ -2706,7 +2708,7 @@ def test_vert_violinplot_showall():
@image_comparison(baseline_images=['violinplot_vert_custompoints_10'],
@ -161,7 +161,7 @@ index 25f5695f3..f6ddc4e95 100644
def test_vert_violinplot_custompoints_10():
ax = plt.axes()
# First 9 digits of frac(sqrt(13))
@@ -2708,7 +2710,7 @@ def test_vert_violinplot_custompoints_10():
@@ -2717,7 +2719,7 @@ def test_vert_violinplot_custompoints_10():
@image_comparison(baseline_images=['violinplot_vert_custompoints_200'],
@ -170,7 +170,7 @@ index 25f5695f3..f6ddc4e95 100644
def test_vert_violinplot_custompoints_200():
ax = plt.axes()
# First 9 digits of frac(sqrt(17))
@@ -2719,7 +2721,7 @@ def test_vert_violinplot_custompoints_200():
@@ -2728,7 +2730,7 @@ def test_vert_violinplot_custompoints_200():
@image_comparison(baseline_images=['violinplot_horiz_baseline'],
@ -179,7 +179,7 @@ index 25f5695f3..f6ddc4e95 100644
def test_horiz_violinplot_baseline():
ax = plt.axes()
# First 9 digits of frac(sqrt(19))
@@ -2730,7 +2732,7 @@ def test_horiz_violinplot_baseline():
@@ -2739,7 +2741,7 @@ def test_horiz_violinplot_baseline():
@image_comparison(baseline_images=['violinplot_horiz_showmedians'],
@ -188,7 +188,7 @@ index 25f5695f3..f6ddc4e95 100644
def test_horiz_violinplot_showmedians():
ax = plt.axes()
# First 9 digits of frac(sqrt(23))
@@ -2741,7 +2743,7 @@ def test_horiz_violinplot_showmedians():
@@ -2750,7 +2752,7 @@ def test_horiz_violinplot_showmedians():
@image_comparison(baseline_images=['violinplot_horiz_showmeans'],
@ -197,7 +197,7 @@ index 25f5695f3..f6ddc4e95 100644
def test_horiz_violinplot_showmeans():
ax = plt.axes()
# First 9 digits of frac(sqrt(29))
@@ -2752,7 +2754,7 @@ def test_horiz_violinplot_showmeans():
@@ -2761,7 +2763,7 @@ def test_horiz_violinplot_showmeans():
@image_comparison(baseline_images=['violinplot_horiz_showextrema'],
@ -206,7 +206,7 @@ index 25f5695f3..f6ddc4e95 100644
def test_horiz_violinplot_showextrema():
ax = plt.axes()
# First 9 digits of frac(sqrt(31))
@@ -2763,7 +2765,7 @@ def test_horiz_violinplot_showextrema():
@@ -2772,7 +2774,7 @@ def test_horiz_violinplot_showextrema():
@image_comparison(baseline_images=['violinplot_horiz_showall'],
@ -215,7 +215,7 @@ index 25f5695f3..f6ddc4e95 100644
def test_horiz_violinplot_showall():
ax = plt.axes()
# First 9 digits of frac(sqrt(37))
@@ -2774,7 +2776,7 @@ def test_horiz_violinplot_showall():
@@ -2783,7 +2785,7 @@ def test_horiz_violinplot_showall():
@image_comparison(baseline_images=['violinplot_horiz_custompoints_10'],
@ -224,7 +224,7 @@ index 25f5695f3..f6ddc4e95 100644
def test_horiz_violinplot_custompoints_10():
ax = plt.axes()
# First 9 digits of frac(sqrt(41))
@@ -2785,7 +2787,7 @@ def test_horiz_violinplot_custompoints_10():
@@ -2794,7 +2796,7 @@ def test_horiz_violinplot_custompoints_10():
@image_comparison(baseline_images=['violinplot_horiz_custompoints_200'],
@ -233,7 +233,7 @@ index 25f5695f3..f6ddc4e95 100644
def test_horiz_violinplot_custompoints_200():
ax = plt.axes()
# First 9 digits of frac(sqrt(43))
@@ -3509,8 +3511,7 @@ def test_vertex_markers():
@@ -3518,8 +3520,7 @@ def test_vertex_markers():
@image_comparison(baseline_images=['vline_hline_zorder',
@ -243,7 +243,7 @@ index 25f5695f3..f6ddc4e95 100644
def test_eb_line_zorder():
x = list(range(10))
@@ -4190,7 +4191,7 @@ def test_psd_noise():
@@ -4199,7 +4200,7 @@ def test_psd_noise():
@image_comparison(baseline_images=['csd_freqs'], remove_text=True,
@ -252,7 +252,7 @@ index 25f5695f3..f6ddc4e95 100644
def test_csd_freqs():
'''test axes.csd with sinusoidal stimuli'''
n = 10000
@@ -5108,7 +5109,7 @@ def test_rc_spines():
@@ -5117,7 +5118,7 @@ def test_rc_spines():
@image_comparison(baseline_images=['rc_grid'], extensions=['png'],
@ -261,7 +261,7 @@ index 25f5695f3..f6ddc4e95 100644
def test_rc_grid():
fig = plt.figure()
rc_dict0 = {
@@ -5670,7 +5671,7 @@ def test_date_timezone_y():
@@ -5679,7 +5680,7 @@ def test_date_timezone_y():
@image_comparison(baseline_images=['date_timezone_x_and_y'],
@ -654,5 +654,5 @@ index 4bfb6f8ff..a6eee9ff6 100644
def test_xyz(self):
fig, ax = plt.subplots(subplot_kw={"projection": "3d"})
--
2.21.0
2.21.1

14
0004-Increase-some-tolerances-for-non-x86-arches.patch
View File

@ -1,4 +1,4 @@
From 559f45bb0334b2c920f288a2a010b11c0dba9a49 Mon Sep 17 00:00:00 2001
From 390e418a5da886ce1b4358f454342c6af311b00a 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 4/4] Increase some tolerances for non-x86 arches.
@ -43,7 +43,7 @@ index de596a9e0..9f12effa6 100644
def test_fancyarrow_dpi_cor_200dpi():
"""
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
index 1168ef983..ab553e29e 100644
index 84a1956ee..eeafd816f 100644
--- a/lib/matplotlib/tests/test_axes.py
+++ b/lib/matplotlib/tests/test_axes.py
@@ -395,7 +395,7 @@ def test_annotate_default_arrow():
@ -55,7 +55,7 @@ index 1168ef983..ab553e29e 100644
def test_polar_annotations():
# you can specify the xypoint and the xytext in different
# positions and coordinate systems, and optionally turn on a
@@ -3502,7 +3502,7 @@ def test_vertex_markers():
@@ -3519,7 +3519,7 @@ def test_vertex_markers():
@image_comparison(baseline_images=['vline_hline_zorder',
'errorbar_zorder'],
@ -78,7 +78,7 @@ index ad23abe3f..7b9660f2b 100644
@pytest.mark.parametrize("backend", _get_testable_interactive_backends())
diff --git a/lib/matplotlib/tests/test_collections.py b/lib/matplotlib/tests/test_collections.py
index c12ed7004..bc741678f 100644
index 773093100..9cce4ed9f 100644
--- a/lib/matplotlib/tests/test_collections.py
+++ b/lib/matplotlib/tests/test_collections.py
@@ -442,7 +442,7 @@ def test_barb_limits():
@ -91,7 +91,7 @@ index c12ed7004..bc741678f 100644
def test_EllipseCollection():
# Test basic functionality
diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
index df3e5cf18..2d0d0f02a 100644
index e9ae292f6..8e1fcb36f 100644
--- a/lib/matplotlib/tests/test_constrainedlayout.py
+++ b/lib/matplotlib/tests/test_constrainedlayout.py
@@ -173,7 +173,7 @@ def test_constrained_layout9():
@ -148,7 +148,7 @@ index 6ecb3edbe..207659648 100644
# Check the figure.align_labels() command
fig = plt.figure(tight_layout=True)
diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
index ae803000d..0091fc03f 100644
index 22cd78d46..76149bce4 100644
--- a/lib/matplotlib/tests/test_image.py
+++ b/lib/matplotlib/tests/test_image.py
@@ -810,7 +810,7 @@ def test_imshow_endianess():
@ -262,5 +262,5 @@ index 32e1c884d..741d197b5 100644
def test_polar_box():
fig = plt.figure(figsize=(5, 5))
--
2.21.0
2.21.1

19
python-matplotlib.spec
View File

@ -43,7 +43,7 @@
%global ftver 2.10.0
Name: python-matplotlib
Version: 3.1.2
Version: 3.1.3
Release: 1%{?rctag:.%{rctag}}%{?dist}
Summary: Python 2D plotting library
# qt4_editor backend is MIT
@ -59,15 +59,9 @@ Patch0001: 0001-Force-using-system-qhull.patch
# Don't attempt to download jQuery and jQuery UI
Patch0002: 0001-Use-packaged-jquery-and-jquery-ui.patch
# Fix WebAgg test
# https://github.com/matplotlib/matplotlib/pull/15737
Patch0003: 0001-Fix-env-override-in-WebAgg-backend-test.patch
# https://github.com/matplotlib/matplotlib/pull/15763
Patch0004: 0001-Skip-webagg-test-if-tornado-is-not-available.patch
# Fedora-specific patches; see:
# https://github.com/fedora-python/matplotlib/tree/fedora-patches
# https://github.com/fedora-python/matplotlib/tree/fedora-patches-non-x86
# https://github.com/fedora-python/matplotlib/tree/fedora-patches-v3.1.x
# https://github.com/fedora-python/matplotlib/tree/fedora-patches-non-x86-v3.1.x
# Updated test images for new FreeType.
Source1000: https://github.com/QuLogic/mpl-images/archive/v%{mpl_images_version}-with-freetype-%{ftver}/matplotlib-%{mpl_images_version}-with-freetype-%{ftver}.tar.gz
# Search in /etc/matplotlibrc:
@ -266,10 +260,6 @@ Requires: python3-matplotlib%{?_isa} = %{version}-%{release}
%patch0002 -p1
%patch0003 -p1
%patch0004 -p1
# Fedora-specific patches follow:
%patch1001 -p1
# Updated test images for new FreeType.
@ -457,6 +447,9 @@ PYTHONDONTWRITEBYTECODE=1 \
%changelog
* Fri Feb 14 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.1.3-1
- Update to latest version
* Fri Nov 22 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.1.2-1
- Update to latest version

2
sources
View File

@ -1,2 +1,2 @@
SHA512 (matplotlib-3.1.2.tar.gz) = 514e66ff76381dccb185a8b8dee44ecbf5108e99ecc5ce46b56750e2a62b782e2b67f0ba02b01545541a1499ffe2347b6bc502077455d8a742796161017cba42
SHA512 (matplotlib-3.1.3.tar.gz) = d233a18449eac4c42ecc485d0df0c15e1e306f3945e5476b11b715d6bc190ca6f1c22e7d4b16d6c93c8a569e1c43b68b583339f0921f237a9920c7369854a09e
SHA512 (matplotlib-3.1.1-with-freetype-2.10.0.tar.gz) = 257546b047ff79302b616f1d37caa028a7b9abc1682cf10861e1347a3db9f437967abe24e11aee898ae11c6f163939d48bc5aeaec2894d6472b4326f8edaed8b