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 2019-03-02 18:39:03 -05:00
parent 6e771d1530
commit b5e6655ad8
9 changed files with 170 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -35,3 +35,4 @@ matplotlib-1.0.0-without-gpc.tar.gz
/matplotlib-3.0.1.tar.gz
/matplotlib-3.0.1-with-freetype-2.9.1.tar.gz
/matplotlib-3.0.2.tar.gz
/matplotlib-3.0.3.tar.gz

75
0001-Remove-ticks-and-titles-from-tight-bbox-tests.patch
View File

@ -1,75 +0,0 @@
From 9ef2402bac96bbfc0fd9a21f56d8c4b3aae6e9a1 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Sat, 10 Nov 2018 04:29:36 -0500
Subject: [PATCH] Remove ticks and titles from tight bbox tests.
These text elements may shift with different versions of FreeType,
making the tight bbox results unstable when building against external
newer versions.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
lib/matplotlib/tests/test_axes.py | 6 ++++--
lib/mpl_toolkits/tests/test_axes_grid1.py | 8 +++++---
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
index 5bc1b54bb..f6e3f733b 100644
--- a/lib/matplotlib/tests/test_axes.py
+++ b/lib/matplotlib/tests/test_axes.py
@@ -16,7 +16,8 @@ import pytest
import warnings
import matplotlib
-from matplotlib.testing.decorators import image_comparison, check_figures_equal
+from matplotlib.testing.decorators import (
+ image_comparison, check_figures_equal, remove_ticks_and_titles)
import matplotlib.pyplot as plt
import matplotlib.markers as mmarkers
import matplotlib.patches as mpatches
@@ -5913,9 +5914,10 @@ def test_cartopy_backcompat():
def test_gettightbbox_ignoreNaN():
fig, ax = plt.subplots()
+ remove_ticks_and_titles(fig)
t = ax.text(np.NaN, 1, 'Boo')
renderer = fig.canvas.get_renderer()
- np.testing.assert_allclose(ax.get_tightbbox(renderer).width, 532.444444)
+ np.testing.assert_allclose(ax.get_tightbbox(renderer).width, 496)
def test_scatter_series_non_zero_index(pd):
diff --git a/lib/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py
index 537a8a2c8..2a630bb14 100644
--- a/lib/mpl_toolkits/tests/test_axes_grid1.py
+++ b/lib/mpl_toolkits/tests/test_axes_grid1.py
@@ -1,6 +1,7 @@
import matplotlib
import matplotlib.pyplot as plt
-from matplotlib.testing.decorators import image_comparison
+from matplotlib.testing.decorators import (
+ image_comparison, remove_ticks_and_titles)
from mpl_toolkits.axes_grid1 import host_subplot
from mpl_toolkits.axes_grid1 import make_axes_locatable
@@ -409,7 +410,6 @@ def test_image_grid():
def test_gettightbbox():
-
fig, ax = plt.subplots(figsize=(8, 6))
l, = ax.plot([1, 2, 3], [0, 1, 0])
@@ -418,6 +418,8 @@ def test_gettightbbox():
ax_zoom.plot([1, 2, 3], [0, 1, 0])
mark_inset(ax, ax_zoom, loc1=1, loc2=3, fc="none", ec='0.3')
+
+ remove_ticks_and_titles(fig)
bbox = fig.get_tightbbox(fig.canvas.get_renderer())
np.testing.assert_array_almost_equal(bbox.extents,
- [-18.022743, -14.118056, 7.332813, 5.4625])
+ [-17.7, -13.9, 7.2, 5.4])
--
2.17.1

113
0001-Use-packaged-jquery-and-jquery-ui.patch Normal file
View File

@ -0,0 +1,113 @@
From fede0d8731c1301720f16e2d46df8275e8ecf9e8 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Sat, 2 Mar 2019 18:18:29 -0500
Subject: [PATCH] Use packaged jquery and jquery-ui.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
.../backends/web_backend/all_figures.html | 6 +--
.../backends/web_backend/single_figure.html | 6 +--
setup.py | 46 -------------------
3 files changed, 6 insertions(+), 52 deletions(-)
diff --git a/lib/matplotlib/backends/web_backend/all_figures.html b/lib/matplotlib/backends/web_backend/all_figures.html
index 41f48dc6d..69097eb4f 100644
--- a/lib/matplotlib/backends/web_backend/all_figures.html
+++ b/lib/matplotlib/backends/web_backend/all_figures.html
@@ -3,9 +3,9 @@
<link rel="stylesheet" href="{{ prefix }}/_static/css/page.css" type="text/css">
<link rel="stylesheet" href="{{ prefix }}/_static/css/boilerplate.css" type="text/css" />
<link rel="stylesheet" href="{{ prefix }}/_static/css/fbm.css" type="text/css" />
- <link rel="stylesheet" href="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.css" >
- <script src="{{ prefix }}/_static/jquery-ui-1.12.1/external/jquery/jquery.js"></script>
- <script src="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.js"></script>
+ <link rel="stylesheet" href="/usr/share/javascript/jquery_ui/jquery-ui.min.css" >
+ <script src="/usr/share/javascript/jquery/latest/jquery.min.js"></script>
+ <script src="/usr/share/javascript/jquery_ui/jquery-ui.min.js"></script>
<script src="{{ prefix }}/_static/js/mpl_tornado.js"></script>
<script src="{{ prefix }}/js/mpl.js"></script>
diff --git a/lib/matplotlib/backends/web_backend/single_figure.html b/lib/matplotlib/backends/web_backend/single_figure.html
index 4d5a366fb..c11c86618 100644
--- a/lib/matplotlib/backends/web_backend/single_figure.html
+++ b/lib/matplotlib/backends/web_backend/single_figure.html
@@ -3,9 +3,9 @@
<link rel="stylesheet" href="{{ prefix }}/_static/css/page.css" type="text/css">
<link rel="stylesheet" href="{{ prefix }}/_static/css/boilerplate.css" type="text/css" />
<link rel="stylesheet" href="{{ prefix }}/_static/css/fbm.css" type="text/css" />
- <link rel="stylesheet" href="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.css" >
- <script src="{{ prefix }}/_static/jquery-ui-1.12.1/external/jquery/jquery.js"></script>
- <script src="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.js"></script>
+ <link rel="stylesheet" href="/usr/share/javascript/jquery_ui/jquery-ui.min.css" >
+ <script src="/usr/share/javascript/jquery/latest/jquery.min.js"></script>
+ <script src="/usr/share/javascript/jquery_ui/jquery-ui.min.js"></script>
<script src="{{ prefix }}/_static/js/mpl_tornado.js"></script>
<script src="{{ prefix }}/js/mpl.js"></script>
<script>
diff --git a/setup.py b/setup.py
index 94c8106d3..42ae7e294 100644
--- a/setup.py
+++ b/setup.py
@@ -28,8 +28,6 @@ from zipfile import ZipFile
from setuptools import setup
from setuptools.command.build_ext import build_ext as BuildExtCommand
-from setuptools.command.develop import develop as DevelopCommand
-from setuptools.command.install_lib import install_lib as InstallLibCommand
from setuptools.command.test import test as TestCommand
# The setuptools version of sdist adds a setup.cfg file to the tree.
@@ -121,50 +119,6 @@ cmdclass['test'] = NoopTestCommand
cmdclass['build_ext'] = BuildExtraLibraries
-def _download_jquery_to(dest):
- # Note: When bumping the jquery-ui version, also update the versions in
- # single_figure.html and all_figures.html.
- url = "https://jqueryui.com/resources/download/jquery-ui-1.12.1.zip"
- sha = 'f8233674366ab36b2c34c577ec77a3d70cac75d2e387d8587f3836345c0f624d'
- if not os.path.exists(os.path.join(dest, "jquery-ui-1.12.1")):
- _makedirs(dest, exist_ok=True)
- try:
- buff = download_or_cache(url, sha)
- except Exception:
- raise IOError("Failed to download jquery-ui. Please download " +
- "{url} and extract it to {dest}.".format(
- url=url, dest=dest))
- with ZipFile(buff) as zf:
- zf.extractall(dest)
-
-
-# Relying on versioneer's implementation detail.
-class sdist_with_jquery(cmdclass['sdist']):
- def make_release_tree(self, base_dir, files):
- super(sdist_with_jquery, self).make_release_tree(base_dir, files)
- _download_jquery_to(
- os.path.join(base_dir, "lib/matplotlib/backends/web_backend/"))
-
-
-# Affects install and bdist_wheel.
-class install_lib_with_jquery(InstallLibCommand):
- def run(self):
- super(install_lib_with_jquery, self).run()
- _download_jquery_to(
- os.path.join(self.install_dir, "matplotlib/backends/web_backend/"))
-
-
-class develop_with_jquery(DevelopCommand):
- def run(self):
- super(develop_with_jquery, self).run()
- _download_jquery_to("lib/matplotlib/backends/web_backend/")
-
-
-cmdclass['sdist'] = sdist_with_jquery
-cmdclass['install_lib'] = install_lib_with_jquery
-cmdclass['develop'] = develop_with_jquery
-
-
# One doesn't normally see `if __name__ == '__main__'` blocks in a setup.py,
# however, this is needed on Windows to avoid creating infinite subprocesses
# when using multiprocessing.
--
2.20.1

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

@ -1,4 +1,4 @@
From d417058d3d02f79188cc7bcfab0f3f2a5c97b7a0 Mon Sep 17 00:00:00 2001
From eeeee74ff61646d321500490bbb9dbbcde424e14 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
@ -97,5 +97,5 @@ index 7eec4d421..4c74619f6 100644
newlines = []
for line in rclines:
--
2.17.1
2.20.1

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

@ -1,4 +1,4 @@
From 4628d65ebf811eee3ea50499cabc1a5ce76c5dd7 Mon Sep 17 00:00:00 2001
From 64c0ea2ea7986d6cb05b41d37226f510ffe41b76 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 f1ededf67..762781cf5 100644
index ddbf7e9f7..86e49cc45 100644
--- a/lib/mpl_toolkits/tests/test_axes_grid1.py
+++ b/lib/mpl_toolkits/tests/test_axes_grid1.py
@@ -360,7 +360,7 @@ def test_zooming_with_inverted_axes():
@@ -361,7 +361,7 @@ def test_zooming_with_inverted_axes():
@image_comparison(baseline_images=['anchored_direction_arrows'],
@ -36,5 +36,5 @@ index f1ededf67..762781cf5 100644
def test_anchored_direction_arrows():
fig, ax = plt.subplots()
--
2.17.1
2.20.1

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

@ -1,4 +1,4 @@
From 7d114c59042314c1478ed5fad061c998a1f31b19 Mon Sep 17 00:00:00 2001
From 4b3c9145a4c247197a40c5314151566e437f7bbe 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,10 +57,10 @@ 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 629517406..edb7b5ed7 100644
index c0e0e560d..6e88c167c 100644
--- a/lib/matplotlib/tests/test_axes.py
+++ b/lib/matplotlib/tests/test_axes.py
@@ -553,7 +553,7 @@ def test_single_point():
@@ -554,7 +554,7 @@ def test_single_point():
@image_comparison(baseline_images=['single_date'], extensions=['png'],
@ -69,7 +69,7 @@ index 629517406..edb7b5ed7 100644
def test_single_date():
time1 = [721964.0]
data1 = [-65.54]
@@ -1027,7 +1027,7 @@ def test_fill_between_interpolate():
@@ -1028,7 +1028,7 @@ def test_fill_between_interpolate():
@image_comparison(baseline_images=['fill_between_interpolate_decreasing'],
@ -78,7 +78,7 @@ index 629517406..edb7b5ed7 100644
def test_fill_between_interpolate_decreasing():
p = np.array([724.3, 700, 655])
t = np.array([9.4, 7, 2.2])
@@ -1109,7 +1109,8 @@ def test_pcolormesh():
@@ -1110,7 +1110,8 @@ def test_pcolormesh():
@image_comparison(baseline_images=['pcolormesh_datetime_axis'],
@ -88,7 +88,7 @@ index 629517406..edb7b5ed7 100644
def test_pcolormesh_datetime_axis():
fig = plt.figure()
fig.subplots_adjust(hspace=0.4, top=0.98, bottom=.15)
@@ -1135,7 +1136,8 @@ def test_pcolormesh_datetime_axis():
@@ -1136,7 +1137,8 @@ def test_pcolormesh_datetime_axis():
@image_comparison(baseline_images=['pcolor_datetime_axis'],
@ -98,7 +98,7 @@ index 629517406..edb7b5ed7 100644
def test_pcolor_datetime_axis():
fig = plt.figure()
fig.subplots_adjust(hspace=0.4, top=0.98, bottom=.15)
@@ -1192,7 +1194,7 @@ def test_canonical():
@@ -1193,7 +1195,7 @@ def test_canonical():
@image_comparison(baseline_images=['arc_angles'], remove_text=True,
@ -107,7 +107,7 @@ index 629517406..edb7b5ed7 100644
def test_arc_angles():
from matplotlib import patches
# Ellipse parameters
@@ -2539,7 +2541,7 @@ def test_boxplot_mod_artist_after_plotting():
@@ -2540,7 +2542,7 @@ def test_boxplot_mod_artist_after_plotting():
@image_comparison(baseline_images=['violinplot_vert_baseline',
'violinplot_vert_baseline'],
@ -116,7 +116,7 @@ index 629517406..edb7b5ed7 100644
def test_vert_violinplot_baseline():
# First 9 digits of frac(sqrt(2))
np.random.seed(414213562)
@@ -2557,7 +2559,7 @@ def test_vert_violinplot_baseline():
@@ -2558,7 +2560,7 @@ def test_vert_violinplot_baseline():
@image_comparison(baseline_images=['violinplot_vert_showmeans'],
@ -125,7 +125,7 @@ index 629517406..edb7b5ed7 100644
def test_vert_violinplot_showmeans():
ax = plt.axes()
# First 9 digits of frac(sqrt(3))
@@ -2568,7 +2570,7 @@ def test_vert_violinplot_showmeans():
@@ -2569,7 +2571,7 @@ def test_vert_violinplot_showmeans():
@image_comparison(baseline_images=['violinplot_vert_showextrema'],
@ -134,7 +134,7 @@ index 629517406..edb7b5ed7 100644
def test_vert_violinplot_showextrema():
ax = plt.axes()
# First 9 digits of frac(sqrt(5))
@@ -2579,7 +2581,7 @@ def test_vert_violinplot_showextrema():
@@ -2580,7 +2582,7 @@ def test_vert_violinplot_showextrema():
@image_comparison(baseline_images=['violinplot_vert_showmedians'],
@ -143,7 +143,7 @@ index 629517406..edb7b5ed7 100644
def test_vert_violinplot_showmedians():
ax = plt.axes()
# First 9 digits of frac(sqrt(7))
@@ -2590,7 +2592,7 @@ def test_vert_violinplot_showmedians():
@@ -2591,7 +2593,7 @@ def test_vert_violinplot_showmedians():
@image_comparison(baseline_images=['violinplot_vert_showall'],
@ -152,7 +152,7 @@ index 629517406..edb7b5ed7 100644
def test_vert_violinplot_showall():
ax = plt.axes()
# First 9 digits of frac(sqrt(11))
@@ -2601,7 +2603,7 @@ def test_vert_violinplot_showall():
@@ -2602,7 +2604,7 @@ def test_vert_violinplot_showall():
@image_comparison(baseline_images=['violinplot_vert_custompoints_10'],
@ -161,7 +161,7 @@ index 629517406..edb7b5ed7 100644
def test_vert_violinplot_custompoints_10():
ax = plt.axes()
# First 9 digits of frac(sqrt(13))
@@ -2612,7 +2614,7 @@ def test_vert_violinplot_custompoints_10():
@@ -2613,7 +2615,7 @@ def test_vert_violinplot_custompoints_10():
@image_comparison(baseline_images=['violinplot_vert_custompoints_200'],
@ -170,7 +170,7 @@ index 629517406..edb7b5ed7 100644
def test_vert_violinplot_custompoints_200():
ax = plt.axes()
# First 9 digits of frac(sqrt(17))
@@ -2623,7 +2625,7 @@ def test_vert_violinplot_custompoints_200():
@@ -2624,7 +2626,7 @@ def test_vert_violinplot_custompoints_200():
@image_comparison(baseline_images=['violinplot_horiz_baseline'],
@ -179,7 +179,7 @@ index 629517406..edb7b5ed7 100644
def test_horiz_violinplot_baseline():
ax = plt.axes()
# First 9 digits of frac(sqrt(19))
@@ -2634,7 +2636,7 @@ def test_horiz_violinplot_baseline():
@@ -2635,7 +2637,7 @@ def test_horiz_violinplot_baseline():
@image_comparison(baseline_images=['violinplot_horiz_showmedians'],
@ -188,7 +188,7 @@ index 629517406..edb7b5ed7 100644
def test_horiz_violinplot_showmedians():
ax = plt.axes()
# First 9 digits of frac(sqrt(23))
@@ -2645,7 +2647,7 @@ def test_horiz_violinplot_showmedians():
@@ -2646,7 +2648,7 @@ def test_horiz_violinplot_showmedians():
@image_comparison(baseline_images=['violinplot_horiz_showmeans'],
@ -197,7 +197,7 @@ index 629517406..edb7b5ed7 100644
def test_horiz_violinplot_showmeans():
ax = plt.axes()
# First 9 digits of frac(sqrt(29))
@@ -2656,7 +2658,7 @@ def test_horiz_violinplot_showmeans():
@@ -2657,7 +2659,7 @@ def test_horiz_violinplot_showmeans():
@image_comparison(baseline_images=['violinplot_horiz_showextrema'],
@ -206,7 +206,7 @@ index 629517406..edb7b5ed7 100644
def test_horiz_violinplot_showextrema():
ax = plt.axes()
# First 9 digits of frac(sqrt(31))
@@ -2667,7 +2669,7 @@ def test_horiz_violinplot_showextrema():
@@ -2668,7 +2670,7 @@ def test_horiz_violinplot_showextrema():
@image_comparison(baseline_images=['violinplot_horiz_showall'],
@ -215,7 +215,7 @@ index 629517406..edb7b5ed7 100644
def test_horiz_violinplot_showall():
ax = plt.axes()
# First 9 digits of frac(sqrt(37))
@@ -2678,7 +2680,7 @@ def test_horiz_violinplot_showall():
@@ -2679,7 +2681,7 @@ def test_horiz_violinplot_showall():
@image_comparison(baseline_images=['violinplot_horiz_custompoints_10'],
@ -224,7 +224,7 @@ index 629517406..edb7b5ed7 100644
def test_horiz_violinplot_custompoints_10():
ax = plt.axes()
# First 9 digits of frac(sqrt(41))
@@ -2689,7 +2691,7 @@ def test_horiz_violinplot_custompoints_10():
@@ -2690,7 +2692,7 @@ def test_horiz_violinplot_custompoints_10():
@image_comparison(baseline_images=['violinplot_horiz_custompoints_200'],
@ -233,7 +233,7 @@ index 629517406..edb7b5ed7 100644
def test_horiz_violinplot_custompoints_200():
ax = plt.axes()
# First 9 digits of frac(sqrt(43))
@@ -3368,8 +3370,7 @@ def test_vertex_markers():
@@ -3369,8 +3371,7 @@ def test_vertex_markers():
@image_comparison(baseline_images=['vline_hline_zorder',
@ -243,7 +243,7 @@ index 629517406..edb7b5ed7 100644
def test_eb_line_zorder():
x = list(range(10))
@@ -4049,7 +4050,7 @@ def test_psd_noise():
@@ -4050,7 +4051,7 @@ def test_psd_noise():
@image_comparison(baseline_images=['csd_freqs'], remove_text=True,
@ -252,7 +252,7 @@ index 629517406..edb7b5ed7 100644
def test_csd_freqs():
'''test axes.csd with sinusoidal stimuli'''
n = 10000
@@ -4942,7 +4943,7 @@ def test_rc_spines():
@@ -4943,7 +4944,7 @@ def test_rc_spines():
@image_comparison(baseline_images=['rc_grid'], extensions=['png'],
@ -261,7 +261,7 @@ index 629517406..edb7b5ed7 100644
def test_rc_grid():
fig = plt.figure()
rc_dict0 = {
@@ -5461,7 +5462,7 @@ def test_date_timezone_y():
@@ -5462,7 +5463,7 @@ def test_date_timezone_y():
@image_comparison(baseline_images=['date_timezone_x_and_y'],
@ -408,7 +408,7 @@ index 8184d3eee..5a067f8e0 100644
def test_linestylecycle_basic():
fig, ax = plt.subplots()
diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
index 7cb5af621..d7d5ba2f0 100644
index 4c688eb05..826b44869 100644
--- a/lib/matplotlib/tests/test_figure.py
+++ b/lib/matplotlib/tests/test_figure.py
@@ -13,8 +13,7 @@ import numpy as np
@ -422,10 +422,10 @@ index 7cb5af621..d7d5ba2f0 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 893108258..b409e9453 100644
index c0ffc061a..ace55c2f5 100644
--- a/lib/matplotlib/tests/test_image.py
+++ b/lib/matplotlib/tests/test_image.py
@@ -757,7 +757,7 @@ def test_imshow_endianess():
@@ -766,7 +766,7 @@ def test_imshow_endianess():
@image_comparison(baseline_images=['imshow_masked_interpolation'],
@ -654,5 +654,5 @@ index bc9c43ec7..48727de52 100644
def test_xyz(self):
fig, ax = plt.subplots(subplot_kw={"projection": "3d"})
--
2.17.1
2.20.1

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

@ -1,4 +1,4 @@
From fe4dfe11f191f52fe4126a174658e13943abbf5f Mon Sep 17 00:00:00 2001
From 179885bd9a442bc171e562a8997abde2824997fa 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.
@ -44,10 +44,10 @@ 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 629517406..c5b5a12ea 100644
index c0e0e560d..0021bbda4 100644
--- a/lib/matplotlib/tests/test_axes.py
+++ b/lib/matplotlib/tests/test_axes.py
@@ -386,7 +386,7 @@ def test_annotate_default_arrow():
@@ -387,7 +387,7 @@ def test_annotate_default_arrow():
assert ann.arrow_patch is not None
@ -56,7 +56,7 @@ index 629517406..c5b5a12ea 100644
def test_polar_annotations():
# you can specify the xypoint and the xytext in different
# positions and coordinate systems, and optionally turn on a
@@ -3369,7 +3369,7 @@ def test_vertex_markers():
@@ -3370,7 +3370,7 @@ def test_vertex_markers():
@image_comparison(baseline_images=['vline_hline_zorder',
'errorbar_zorder'],
@ -65,7 +65,7 @@ index 629517406..c5b5a12ea 100644
def test_eb_line_zorder():
x = list(range(10))
@@ -5141,7 +5141,7 @@ def test_title_location_roundtrip():
@@ -5142,7 +5142,7 @@ def test_title_location_roundtrip():
@image_comparison(baseline_images=["loglog"], remove_text=True,
extensions=['png'],
@ -145,7 +145,7 @@ index 8184d3eee..73b0f216d 100644
def test_linestylecycle_basic():
fig, ax = plt.subplots()
diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
index 7cb5af621..128cae5ec 100644
index 4c688eb05..63f562770 100644
--- a/lib/matplotlib/tests/test_figure.py
+++ b/lib/matplotlib/tests/test_figure.py
@@ -14,7 +14,7 @@ import pytest
@ -158,10 +158,10 @@ index 7cb5af621..128cae5ec 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 893108258..cf7975071 100644
index c0ffc061a..ca15df113 100644
--- a/lib/matplotlib/tests/test_image.py
+++ b/lib/matplotlib/tests/test_image.py
@@ -757,7 +757,7 @@ def test_imshow_endianess():
@@ -766,7 +766,7 @@ def test_imshow_endianess():
@image_comparison(baseline_images=['imshow_masked_interpolation'],
@ -285,5 +285,5 @@ index 32e1c884d..741d197b5 100644
def test_polar_box():
fig = plt.figure(figsize=(5, 5))
--
2.17.1
2.20.1

15
python-matplotlib.spec
View File

@ -43,8 +43,8 @@
%global ftver 2.9.1
Name: python-matplotlib
Version: 3.0.2
Release: 1%{?rctag:.%{rctag}}%{?dist}.1
Version: 3.0.3
Release: 1%{?rctag:.%{rctag}}%{?dist}
Summary: Python 2D plotting library
# qt4_editor backend is MIT
License: Python and MIT
@ -56,8 +56,8 @@ Source1: setup.cfg
# https://src.fedoraproject.org/rpms/qhull/pull-request/1
Patch0001: 0001-Force-using-system-qhull.patch
# https://github.com/matplotlib/matplotlib/pull/12790
Patch0002: 0001-Remove-ticks-and-titles-from-tight-bbox-tests.patch
# Don't attempt to download jQuery and jQuery UI
Patch0002: 0001-Use-packaged-jquery-and-jquery-ui.patch
# Fedora-specific patches; see:
# https://github.com/QuLogic/matplotlib/tree/fedora-patches
@ -229,6 +229,10 @@ BuildRequires: graphviz
BuildRequires: python3-sphinx
BuildRequires: tex(latex)
BuildRequires: tex-preview
BuildRequires: js-jquery >= 3.2.1
BuildRequires: xstatic-jquery-ui-common
Requires: js-jquery >= 3.2.1
Requires: xstatic-jquery-ui-common
%endif
Requires: python3-matplotlib%{?_isa} = %{version}-%{release}
%{?python_provide:%python_provide python3-matplotlib-doc}
@ -440,6 +444,9 @@ PYTHONDONTWRITEBYTECODE=1 \
%changelog
* Sat Mar 02 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.0.3-1
- Update to latest version
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

2
sources
View File

@ -1,2 +1,2 @@
SHA512 (matplotlib-3.0.2.tar.gz) = 40db6cf6023483f3f9b3020735f87f1e53fdaeb177d2a82a5326a139222380ab67f6f007dd30f5a204877246baad0aefced6cf63b36dab32771124f55559491c
SHA512 (matplotlib-3.0.3.tar.gz) = 9fe00b8d0ca6dcf2f1b907118b656353e115b73f8b21adeb4391c87e164c111a4994c3ac17cdd02e75b896d9aa26c279618132f9a7bfe995c0f7c62356ed85ad
SHA512 (matplotlib-3.0.1-with-freetype-2.9.1.tar.gz) = 7d2f9fa2a1ae58107283877cbb96d74f79cfda4d6328bdee90d88b2a286eaad9ae8ff6d764f10a5c05eec6fb5de8598cada168fe7c85d33bd07873fdfc142e3a