peeweep/python-matplotlib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to 1.5.2rc2.

Browse Source 
- Drop wrong hunk from use-system-six patch.
- Patch new qhull paths on F25+ instead of using sed.
- Rebase failing tests patch.
This commit is contained in:
Dominik Mierzejewski
2016-06-18 03:08:09 +02:00
parent da083597a2
commit 844271bb32
4 changed files with 68 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -8,3 +8,4 @@ matplotlib-1.0.0-without-gpc.tar.gz
/matplotlib-1.4.3-without-extern.tar.xz
/matplotlib-1.5.1-without-extern.tar.xz
/matplotlib-1.5.1.tar.gz
/matplotlib-1.5.2rc2.tar.gz
python-matplotlib-disable-failing-tests.patch
+53 -98
View File
@@ -1,6 +1,6 @@
diff -up matplotlib-1.5.1/lib/matplotlib/sphinxext/tests/test_tinypages.py.tests matplotlib-1.5.1/lib/matplotlib/sphinxext/tests/test_tinypages.py
--- matplotlib-1.5.1/lib/matplotlib/sphinxext/tests/test_tinypages.py.tests 2016-01-10 23:20:20.000000000 +0100
+++ matplotlib-1.5.1/lib/matplotlib/sphinxext/tests/test_tinypages.py 2016-05-23 14:04:41.780810625 +0200
diff -up matplotlib-1.5.2rc2/lib/matplotlib/sphinxext/tests/test_tinypages.py.tests matplotlib-1.5.2rc2/lib/matplotlib/sphinxext/tests/test_tinypages.py
--- matplotlib-1.5.2rc2/lib/matplotlib/sphinxext/tests/test_tinypages.py.tests 2016-05-27 04:19:34.000000000 +0200
+++ matplotlib-1.5.2rc2/lib/matplotlib/sphinxext/tests/test_tinypages.py 2016-06-18 00:51:20.449769054 +0200
@@ -1,6 +1,7 @@
""" Tests for tinypages build using sphinx extensions """
@@ -18,106 +18,49 @@ diff -up matplotlib-1.5.1/lib/matplotlib/sphinxext/tests/test_tinypages.py.tests
try:
ret = call(['sphinx-build', '--help'], stdout=PIPE, stderr=PIPE)
except OSError:
diff -up matplotlib-1.5.1/lib/matplotlib/tests/test_axes.py.tests matplotlib-1.5.1/lib/matplotlib/tests/test_axes.py
--- matplotlib-1.5.1/lib/matplotlib/tests/test_axes.py.tests 2016-01-10 23:20:20.000000000 +0100
+++ matplotlib-1.5.1/lib/matplotlib/tests/test_axes.py 2016-05-23 14:04:41.780810625 +0200
@@ -79,13 +79,6 @@ def test_formatter_ticker():
ax.autoscale_view()
diff -up matplotlib-1.5.2rc2/lib/matplotlib/tests/test_axes.py.tests matplotlib-1.5.2rc2/lib/matplotlib/tests/test_axes.py
--- matplotlib-1.5.2rc2/lib/matplotlib/tests/test_axes.py.tests 2016-05-27 04:19:34.000000000 +0200
+++ matplotlib-1.5.2rc2/lib/matplotlib/tests/test_axes.py 2016-06-18 01:07:54.058379133 +0200
@@ -5,6 +5,7 @@ import six
from six.moves import xrange
from itertools import chain
import io
+from distutils.version import LooseVersion
from nose.tools import assert_equal, assert_raises, assert_false, assert_true
from nose.plugins.skip import SkipTest
@@ -84,7 +85,7 @@ def test_formatter_ticker():
-@image_comparison(baseline_images=["formatter_large_small"])
-def test_formatter_large_small():
- # github issue #617, pull #619
- fig, ax = plt.subplots(1)
- x = [0.500000001, 0.500000002]
- y = [1e64, 1.1e64]
- ax.plot(x, y)
@image_comparison(baseline_images=["formatter_large_small"])
def test_formatter_large_small():
- if tuple(map(int, np.__version__.split('.'))) >= (1, 11, 0):
+ if LooseVersion(np.__version__) >= LooseVersion('1.11.0'):
raise KnownFailureTest("Fall out from a fixed numpy bug")
# github issue #617, pull #619
fig, ax = plt.subplots(1)
diff -up matplotlib-1.5.2rc2/lib/matplotlib/tests/test_bbox_tight.py.tests matplotlib-1.5.2rc2/lib/matplotlib/tests/test_bbox_tight.py
--- matplotlib-1.5.2rc2/lib/matplotlib/tests/test_bbox_tight.py.tests 2016-06-18 00:51:19.000000000 +0200
+++ matplotlib-1.5.2rc2/lib/matplotlib/tests/test_bbox_tight.py 2016-06-18 01:09:11.314805850 +0200
@@ -3,6 +3,7 @@ from __future__ import (absolute_import,
import six
from six.moves import xrange
+from distutils.version import LooseVersion
@image_comparison(baseline_images=["twin_axis_locaters_formatters"])
diff -up matplotlib-1.5.1/lib/matplotlib/tests/test_backend_ps.py.tests matplotlib-1.5.1/lib/matplotlib/tests/test_backend_ps.py
--- matplotlib-1.5.1/lib/matplotlib/tests/test_backend_ps.py.tests 2016-05-23 14:04:41.066816181 +0200
+++ matplotlib-1.5.1/lib/matplotlib/tests/test_backend_ps.py 2016-05-23 14:04:41.780810625 +0200
@@ -69,12 +69,6 @@ def test_savefig_to_stringio_with_distil
_test_savefig_to_stringio()
import numpy as np
-@cleanup
-@needs_tex
-def test_savefig_to_stringio_with_usetex():
- matplotlib.rcParams['text.latex.unicode'] = True
- matplotlib.rcParams['text.usetex'] = True
- _test_savefig_to_stringio()
@cleanup
diff -up matplotlib-1.5.1/lib/matplotlib/tests/test_bbox_tight.py.tests matplotlib-1.5.1/lib/matplotlib/tests/test_bbox_tight.py
--- matplotlib-1.5.1/lib/matplotlib/tests/test_bbox_tight.py.tests 2016-05-23 14:04:41.111815831 +0200
+++ matplotlib-1.5.1/lib/matplotlib/tests/test_bbox_tight.py 2016-05-23 14:04:41.780810625 +0200
@@ -86,13 +86,6 @@ def test_bbox_inches_tight_clipping():
plt.gcf().artists.append(patch)
-@image_comparison(baseline_images=['bbox_inches_tight_raster'],
- remove_text=True, savefig_kwarg={'bbox_inches': 'tight'})
-def test_bbox_inches_tight_raster():
- """Test rasterization with tight_layout"""
- fig = plt.figure()
- ax = fig.add_subplot(111)
- ax.plot([1.0, 2.0], rasterized=True)
if __name__ == '__main__':
import nose
diff -up matplotlib-1.5.1/lib/matplotlib/tests/test_collections.py.tests matplotlib-1.5.1/lib/matplotlib/tests/test_collections.py
--- matplotlib-1.5.1/lib/matplotlib/tests/test_collections.py.tests 2016-05-23 14:04:41.148815543 +0200
+++ matplotlib-1.5.1/lib/matplotlib/tests/test_collections.py 2016-05-23 14:04:41.781810617 +0200
@@ -464,28 +464,6 @@ def test_barb_limits():
decimal=1)
-@image_comparison(baseline_images=['EllipseCollection_test_image'],
- extensions=['png'],
- remove_text=True)
-def test_EllipseCollection():
- # Test basic functionality
- fig, ax = plt.subplots()
- x = np.arange(4)
- y = np.arange(3)
- X, Y = np.meshgrid(x, y)
- XY = np.vstack((X.ravel(), Y.ravel())).T
-
- ww = X/float(x[-1])
- hh = Y/float(y[-1])
- aa = np.ones_like(ww) * 20 # first axis is 20 degrees CCW from x axis
-
- ec = mcollections.EllipseCollection(ww, hh, aa,
- units='x',
- offsets=XY,
- transOffset=ax.transData,
- facecolors='none')
- ax.add_collection(ec)
- ax.autoscale_view()
@image_comparison(baseline_images=['polycollection_close'],
diff -up matplotlib-1.5.1/lib/matplotlib/tests/test_style.py.tests matplotlib-1.5.1/lib/matplotlib/tests/test_style.py
--- matplotlib-1.5.1/lib/matplotlib/tests/test_style.py.tests 2016-05-23 14:04:41.150815527 +0200
+++ matplotlib-1.5.1/lib/matplotlib/tests/test_style.py 2016-05-23 14:04:41.781810617 +0200
@@ -57,11 +57,6 @@ def test_use():
assert mpl.rcParams[PARAM] == VALUE
-@attr('network')
-def test_use_url():
- with temp_style('test', DUMMY_SETTINGS):
- with style.context('https://gist.github.com/adrn/6590261/raw'):
- assert mpl.rcParams['axes.facecolor'] == "#adeade"
def test_context():
diff -up matplotlib-1.5.1/lib/matplotlib/tests/test_text.py.tests matplotlib-1.5.1/lib/matplotlib/tests/test_text.py
--- matplotlib-1.5.1/lib/matplotlib/tests/test_text.py.tests 2016-05-23 14:04:41.108815854 +0200
+++ matplotlib-1.5.1/lib/matplotlib/tests/test_text.py 2016-05-23 14:04:41.781810617 +0200
@@ -91,7 +92,7 @@ def test_bbox_inches_tight_clipping():
remove_text=True, savefig_kwarg={'bbox_inches': 'tight'})
def test_bbox_inches_tight_raster():
"""Test rasterization with tight_layout"""
- if tuple(map(int, np.__version__.split('.'))) >= (1, 11, 0):
+ if LooseVersion(np.__version__) >= LooseVersion('1.11.0'):
raise KnownFailureTest("Fall out from a fixed numpy bug")
fig = plt.figure()
ax = fig.add_subplot(111)
diff -up matplotlib-1.5.2rc2/lib/matplotlib/tests/test_text.py.tests matplotlib-1.5.2rc2/lib/matplotlib/tests/test_text.py
--- matplotlib-1.5.2rc2/lib/matplotlib/tests/test_text.py.tests 2016-06-18 00:51:19.803773859 +0200
+++ matplotlib-1.5.2rc2/lib/matplotlib/tests/test_text.py 2016-06-18 00:51:20.450769046 +0200
@@ -18,91 +18,6 @@ from matplotlib.text import Annotation,
from matplotlib.backends.backend_agg import RendererAgg
@@ -210,3 +153,15 @@ diff -up matplotlib-1.5.1/lib/matplotlib/tests/test_text.py.tests matplotlib-1.5
@image_comparison(baseline_images=['multiline'])
diff -up matplotlib-1.5.2rc2/tests.py.tests matplotlib-1.5.2rc2/tests.py
--- matplotlib-1.5.2rc2/tests.py.tests 2016-05-27 04:19:34.000000000 +0200
+++ matplotlib-1.5.2rc2/tests.py 2016-06-18 00:51:20.450769046 +0200
@@ -66,7 +66,7 @@ if __name__ == '__main__':
if '--no-network' in sys.argv:
from matplotlib.testing import disable_internet
disable_internet.turn_off_internet()
- extra_args.extend(['--eval-attr="not network"'])
+ extra_args.extend(['-a','!network'])
sys.argv.remove('--no-network')
run(extra_args)
python-matplotlib.spec
+13 -4
View File
@@ -43,15 +43,17 @@
# Use the same directory of the main package for subpackage licence and docs
%global _docdir_fmt %{name}
%global rctag rc2
Name: python-matplotlib
Version: 1.5.1
Release: 6%{?dist}
Version: 1.5.2
Release: 0.1%{?rctag:.%{rctag}}%{?dist}
Summary: Python 2D plotting library
Group: Development/Libraries
# qt4_editor backend is MIT
License: Python and MIT
URL: http://matplotlib.org
Source0: https://github.com/matplotlib/matplotlib/archive/v%{version}.tar.gz#/matplotlib-%{version}.tar.gz
Source0: https://github.com/matplotlib/matplotlib/archive/v%{version}%{?rctag}.tar.gz#/matplotlib-%{version}%{?rctag}.tar.gz
Source1: setup.cfg
#Patch0: %{name}-noagg.patch
@@ -60,6 +62,7 @@ Patch2: 20_matplotlibrc_path_search_fix.patch
Patch5: 70_bts720549_try_StayPuft_for_xkcd.patch
# https://github.com/matplotlib/matplotlib/issues/6537
Patch6: python-matplotlib-use-system-six.patch
# https://github.com/matplotlib/matplotlib/pull/6558
# https://github.com/matplotlib/matplotlib/issues/6539
Patch7: python-matplotlib-disable-failing-tests.patch
# https://github.com/matplotlib/matplotlib/issues/6538
@@ -354,7 +357,7 @@ Requires: python3-tkinter
%endif
%prep
%setup -q -n matplotlib-%{version}
%setup -q -n matplotlib-%{version}%{?rctag}
rm -r {extern/qhull,lib/matplotlib/externals}
# Copy setup.cfg to the builddir
@@ -578,6 +581,12 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \
%endif
%changelog
* Fri Jun 03 2016 Dominik Mierzejewski <rpm@greysector.net> - 1.5.1-7
- Update to 1.5.2rc2.
- Drop wrong hunk from use-system-six patch.
- Patch new qhull paths on F25+ instead of using sed.
- Rebase failing tests patch.
* Mon May 23 2016 Dominik Mierzejewski <rpm@greysector.net> - 1.5.1-6
- Upstream no longer ships non-free images, use pristine source.
sources
+1 -1
View File
@@ -1 +1 @@
b22dc4962f36aab919a7125b3b35953b matplotlib-1.5.1.tar.gz
495f6bdf126b40f63c316c9404349e40 matplotlib-1.5.2rc2.tar.gz