Compare commits

...

71 Commits

Author SHA1 Message Date
Troy Dawson
c1cba6ae2d epel8-playground decommissioned : https://pagure.io/epel/issue/136 2022-01-31 15:33:48 -08:00
Orion Poplawski
588e490738 Disable qt4 and wx for EPEL8 2019-09-17 20:42:07 -06:00
Zbigniew Jędrzejewski-Szmek
6ae3a9e1d1 Remove comment after %endif
RPM 4.15 complains.
2019-07-03 11:55:57 +02:00
Zbigniew Jędrzejewski-Szmek
831ec4cba0 Update Obsoletes to be later than the last python2 builds 2019-07-03 11:55:18 +02:00
Miro Hrončok
49e6227f01 Skip test_tinypages
tmpdir = local('/tmp/pytest-of-mockbuild/pytest-0/popen-gw2/test_tinypages0')
    def test_tinypages(tmpdir):
        html_dir = pjoin(str(tmpdir), 'html')
        doctree_dir = pjoin(str(tmpdir), 'doctrees')
        # Build the pages with warnings turned into errors
        cmd = [sys.executable, '-msphinx', '-W', '-b', 'html', '-d', doctree_dir,
               pjoin(dirname(__file__), 'tinypages'), html_dir]
        proc = Popen(cmd, stdout=PIPE, stderr=PIPE, universal_newlines=True)
        out, err = proc.communicate()
        assert proc.returncode == 0, \
            "sphinx build failed with stdout:\n{}\nstderr:\n{}\n".format(out, err)
        if err:
            pytest.fail("sphinx build emitted the following warnings:\n{}"
>                       .format(err))
E           Failed: sphinx build emitted the following warnings:
E           /usr/lib/python3.7/site-packages/sphinx/util/docutils.py:311: RemovedInSphinx30Warning: function based directive support is now deprecated. Use class based directive instead.
E             RemovedInSphinx30Warning)
../../BUILDROOT/python-matplotlib-3.0.3-1.fc31.x86_64/usr/lib64/python3.7/site-packages/matplotlib/sphinxext/tests/test_tinypages.py:28: Failed
2019-04-23 13:33:26 +02:00
Miro Hrončok
120f1b74da Support pytest 4 2019-04-23 13:33:26 +02:00
Elliott Sales de Andrade
b5e6655ad8 Update to latest version. 2019-03-04 04:05:00 -05:00
Miro Hrončok
6e771d1530 https://fedoraproject.org/wiki/Changes/Python_Extension_Flags 2019-02-13 00:54:28 +01:00
Fedora Release Engineering
b1b97b1ed1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-02 07:42:18 +00:00
Elliott Sales de Andrade
17130085de Fix missing changelog. 2018-11-13 19:36:37 -05:00
Elliott Sales de Andrade
f171297f40 Update to latest version. 2018-11-10 04:33:30 -05:00
Elliott Sales de Andrade
af995aa143 Upload sources for 3.0.1. 2018-10-31 05:07:20 -04:00
Elliott Sales de Andrade
308245a86e Remove unused patch. 2018-10-31 04:51:30 -04:00
Elliott Sales de Andrade
7424178997 Update to 3.0.1. 2018-10-31 04:07:46 -04:00
Miro Hrončok
cc106d1c4a Obsolete old python-matplotlib-data* to prevent conflicts and provide an upgrade path 2018-09-21 12:29:49 +02:00
Elliott Sales de Andrade
7901631a85 Add correct license for bundled fonts. 2018-09-21 04:25:34 -04:00
Elliott Sales de Andrade
b4eba4ae21 Rename *data packages to avoid conflict with python2. 2018-09-19 14:47:47 -04:00
Elliott Sales de Andrade
b8683378dd Update changelog. 2018-09-19 14:46:05 -04:00
Elliott Sales de Andrade
9fde50abab Stop setting a default backend.
It will be picked automatically by Matplotlib.
2018-09-19 14:42:58 -04:00
Elliott Sales de Andrade
ed3fa9581d Remove unnecessary dependencies. 2018-09-19 04:39:50 -04:00
Elliott Sales de Andrade
c08eccf6ad Run Qt5 tests separately to not conflict with Qt4. 2018-09-19 03:23:05 -04:00
Elliott Sales de Andrade
a0fbf93967 Add patch to fix Qt4 backends. 2018-09-18 23:52:36 -04:00
Elliott Sales de Andrade
6f3ec368b4 Stop setting explicit backend during testing. 2018-09-18 22:01:33 -04:00
Elliott Sales de Andrade
d2fa0263b8 Update to final 3.0.0. 2018-09-18 04:51:42 -04:00
Elliott Sales de Andrade
c385e2c1a9 Update to 3.0.0rc2. 2018-08-29 00:38:38 -04:00
Elliott Sales de Andrade
6995ee3297 Update backend package splits.
There is a WX backend that was never split, and without its proper
dependencies. Also, there are new *Cairo backends in this version.
2018-08-28 03:17:29 -04:00
Elliott Sales de Andrade
19b5ff96fa Remove old Fedora FreeType support.
This will not be built on Fedora < 29.
2018-08-28 03:17:29 -04:00
Elliott Sales de Andrade
1dcb7afa2a Update to 3.0.0rc1. 2018-08-28 03:17:28 -04:00
Elliott Sales de Andrade
ee42f59462 Add explicit gcc/gcc-c++ BR. 2018-08-18 02:15:48 -04:00
Elliott Sales de Andrade
8293bc2589 Remove Python 2 subpackages. 2018-08-18 02:15:45 -04:00
Elliott Sales de Andrade
20e40c3953 Don't run test_nose_image_comparison in parallel.
These tests overwrite certain names that causes issues when testing in
parallel. These tests will be gone with Matplotlib 3.0, so I don't want
to spend much time fixing them. Just ignore them and run in serial
afterwards.
2018-08-17 23:59:22 -04:00
Elliott Sales de Andrade
a6c4a06cef Update to latest version. 2018-08-13 21:27:10 -04:00
Elliott Sales de Andrade
862f207d27 Add missing texlive-cm BR. 2018-07-20 18:19:21 -04:00
Elliott Sales de Andrade
6f741c4a02 Don't use unversioned Python in build. 2018-07-20 16:23:12 -04:00
Fedora Release Engineering
b89d120a97 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-14 00:55:43 +00:00
Miro Hrončok
1b8cd73b7e Fix the release tag 2018-06-22 16:52:47 +02:00
Lumir Balhar
69d38c5f1e Fix tolerances and a timeout to fix build with Python 3.7 2018-06-22 09:50:26 +02:00
Miro Hrončok
725edd957b Rebuilt for Python 3.7 2018-06-19 11:08:46 +02:00
Elliott Sales de Andrade
c48ca2e7fd Add python?-matplotlib-test-data subpackages. 2018-04-27 03:51:51 -04:00
Elliott Sales de Andrade
5c2bf08c46 Remove bytecode produced by pytest. 2018-04-17 02:36:20 -04:00
Elliott Sales de Andrade
7930b4df8d Remove old sources. 2018-04-17 02:21:12 -04:00
Dominik 'Rathann' Mierzejewski
ffa18cbcd2 add missed 2.2.2 source 2018-04-12 14:36:42 +02:00
Elliott Sales de Andrade
c0a5a7d07f Add support for Rawhide / FreeType 2.9. 2018-04-01 15:14:21 -04:00
Elliott Sales de Andrade
c1840d0738 Skip another test that uses mpl_toolkits on Py2. 2018-04-01 03:44:29 -04:00
Elliott Sales de Andrade
c89bd06dd9 Skip flaky slowness test. 2018-03-31 20:08:43 -04:00
Elliott Sales de Andrade
b11ac2671c Patch out the rctemplate tests properly. 2018-03-31 20:07:46 -04:00
Elliott Sales de Andrade
15844872fc Update to latest version. 2018-03-31 03:28:44 -04:00
Elliott Sales de Andrade
ad961d502c Run tests in parallel. 2018-03-13 17:47:17 -04:00
Elliott Sales de Andrade
bf010710f1 Use more python2- dependencies where available. 2018-03-13 17:42:07 -04:00
Elliott Sales de Andrade
f46b703e96 Trim trailing whitespace. 2018-03-13 17:40:02 -04:00
Elliott Sales de Andrade
da0bd4c413 Add changelog entry about cleanup. 2018-03-13 17:40:02 -04:00
Elliott Sales de Andrade
c409bffb3d Remove checks for non-Fedora systems. 2018-03-13 17:40:01 -04:00
Elliott Sales de Andrade
172edad3e8 Remove support for Fedora 26.
It doesn't appear to be getting built there and adds extra conditionals.
2018-03-13 05:25:32 -04:00
Elliott Sales de Andrade
c3e31d8c7e Remove old workaround.
The F27+ packages include the correct Requires now.
2018-03-13 05:23:20 -04:00
Karsten Hopp
bc53b538e3 update and fix spec file conditionals 2018-02-05 17:47:47 +01:00
Elliott Sales de Andrade
14e86457fd Add patch to link with libdl. 2018-01-24 15:09:42 -05:00
Elliott Sales de Andrade
8d6885671d Increase tolerances on non-x86 systems. 2018-01-24 03:07:15 -05:00
Elliott Sales de Andrade
b470c189c1 Also apply tolerance patch for 32-bit systems. 2018-01-24 03:07:15 -05:00
Elliott Sales de Andrade
75d0d8966b Add test images re-generated with FreeType 2.8. 2018-01-24 03:07:14 -05:00
Elliott Sales de Andrade
0326098544 Update to latest release. 2018-01-21 04:05:53 -05:00
Elliott Sales de Andrade
2d712efe1e Update to latest version. 2017-12-10 05:16:41 -05:00
Elliott Sales de Andrade
09769170a4 Add changelog for update. 2017-10-16 02:44:45 -04:00
Elliott Sales de Andrade
3f6380df61 Increase some tolerances for 32-bit systems. 2017-10-15 22:31:31 -04:00
Elliott Sales de Andrade
c9345fa6ce Simplify and update patches. 2017-10-15 18:16:56 -04:00
Elliott Sales de Andrade
4cf6018279 Use 24-bit screen for Xvfb.
Without this mode, the Qt5 test crashes.
2017-10-07 04:44:54 -04:00
Elliott Sales de Andrade
f28833ef2d Disable broken tests. 2017-10-07 03:15:09 -04:00
Elliott Sales de Andrade
58a05487aa Update to final 2.1.0 release. 2017-10-06 19:29:27 -04:00
Elliott Sales de Andrade
5ff9cbe460 Update to 2.1.0 rc1. 2017-10-02 23:20:12 -04:00
Elliott Sales de Andrade
730689d98e Update to Matplotlib 2.0.2. 2017-09-28 02:40:53 -04:00
Elliott Sales de Andrade
14e87c4546 Update to 2.0.1. 2017-09-28 02:36:10 -04:00
Elliott Sales de Andrade
e9a5a6f0c0 Remove outdated patches. 2017-09-27 19:58:07 -04:00
15 changed files with 1 additions and 1583 deletions

15
.gitignore vendored
View File

@@ -1,15 +0,0 @@
matplotlib-1.0.0-without-gpc.tar.gz
/matplotlib-1.0.1-without-gpc.tar.gz
/mpl_sampledata-1.0.1.tar.gz
/matplotlib-1.2.0-without-gpc.tar.gz
/matplotlib-1.3.0-without-gpc.tar.xz
/matplotlib-1.3.1-without-gpc.tar.xz
/matplotlib-1.4.3-without-gpc.tar.xz
/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
/matplotlib-2.0.0b4.tar.gz
/matplotlib-2.0.0rc2.tar.gz
/matplotlib-2.0.0.tar.gz
/matplotlib-2.0.0-without-copyrighted.tar.xz

View File

@@ -1,24 +0,0 @@
--- 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
@@ -682,9 +682,12 @@
_file = _decode_filesystem_path(__file__)
path = os.sep.join([os.path.dirname(_file), 'mpl-data'])
+ path = '/usr/share/matplotlib/mpl-data'
if os.path.isdir(path):
return path
+ raise RuntimeError('Could not find the matplotlib data files')
+
# setuptools' namespace_packages may highjack this init file
# so need to try something known to be in matplotlib, not basemap
import matplotlib.afm
@@ -812,7 +815,7 @@
home, '.matplotlib', 'matplotlibrc')
return fname
- path = get_data_path() # guaranteed to exist or raise
+ path = '/etc' # guaranteed to exist or raise
fname = os.path.join(path, 'matplotlibrc')
if not os.path.exists(fname):
warnings.warn('Could not find matplotlibrc; using defaults')

1
dead.package Normal file
View File

@@ -0,0 +1 @@
epel8-playground decommissioned : https://pagure.io/epel/issue/136

View File

@@ -1,32 +0,0 @@
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 2016-06-02 00:28:37.076703843 +0200
@@ -186,7 +186,8 @@ def test_cursor_data():
event = MouseEvent('motion_notify_event', fig.canvas, xdisp, ydisp)
z = im.get_cursor_data(event)
- assert z is None, "Did not get None, got %d" % z
+ #0 instead of None on armv7hl
+ #assert z is None, "Did not get None, got %d" % z
# Hmm, something is wrong here... I get 0, not None...
# But, this works further down in the tests with extents flipped
@@ -224,14 +225,16 @@ def test_cursor_data():
event = MouseEvent('motion_notify_event', fig.canvas, xdisp, ydisp)
z = im.get_cursor_data(event)
- assert z is None, "Did not get None, got %d" % z
+ #0 instead of None on armv7hl
+ #assert z is None, "Did not get None, got %d" % z
x, y = 0.01, -0.01
xdisp, ydisp = ax.transData.transform_point([x, y])
event = MouseEvent('motion_notify_event', fig.canvas, xdisp, ydisp)
z = im.get_cursor_data(event)
- assert z is None, "Did not get None, got %d" % z
+ #0 instead of None on armv7hl
+ #assert z is None, "Did not get None, got %d" % z
@image_comparison(baseline_images=['image_clip'])

View File

@@ -1,20 +0,0 @@
diff -up matplotlib-2.0.0b3/lib/matplotlib/sphinxext/tests/test_tinypages.py.tests matplotlib-2.0.0b3/lib/matplotlib/sphinxext/tests/test_tinypages.py
--- matplotlib-2.0.0b3/lib/matplotlib/sphinxext/tests/test_tinypages.py.tests 2016-07-17 01:04:11.000000000 +0200
+++ matplotlib-2.0.0b3/lib/matplotlib/sphinxext/tests/test_tinypages.py 2016-08-29 13:41:47.661198880 +0200
@@ -1,6 +1,7 @@
""" Tests for tinypages build using sphinx extensions """
import shutil
+import sys
import tempfile
from os.path import (join as pjoin, dirname, isdir)
@@ -16,6 +17,8 @@ TINY_PAGES = pjoin(HERE, 'tinypages')
def setup():
# Check we have the sphinx-build command
+ if sys.version_info[0] >= 3:
+ raise SkipTest('sphinx-build works only with python 2.x')
try:
ret = call(['sphinx-build', '--help'], stdout=PIPE, stderr=PIPE)
except OSError:

View File

@@ -1,126 +0,0 @@
--- 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
@@ -1285,7 +1285,7 @@
cbar.add_lines(cs2, erase=False)
-@image_comparison(baseline_images=['hist2d', 'hist2d'])
+@image_comparison(baseline_images=['hist2d', 'hist2d'], tol=10.677)
def test_hist2d():
np.random.seed(0)
# 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.new 2017-01-07 21:30:47.502916717 -0800
@@ -2279,90 +2279,6 @@
iscomplex=True, sides='default', nsides=2)
-class spectral_testcase_Fs4_real_onesided(
- spectral_testcase_nosig_real_onesided):
- def setUp(self):
- self.createStim(fstims=[4],
- iscomplex=False, sides='onesided', nsides=1)
-
-
-class spectral_testcase_Fs4_real_twosided(
- spectral_testcase_nosig_real_onesided):
- def setUp(self):
- self.createStim(fstims=[4],
- iscomplex=False, sides='twosided', nsides=2)
-
-
-class spectral_testcase_Fs4_real_defaultsided(
- spectral_testcase_nosig_real_onesided):
- def setUp(self):
- self.createStim(fstims=[4],
- iscomplex=False, sides='default', nsides=1)
-
-
-class spectral_testcase_Fs4_complex_onesided(
- spectral_testcase_nosig_real_onesided):
- def setUp(self):
- self.createStim(fstims=[4],
- iscomplex=True, sides='onesided', nsides=1)
-
-
-class spectral_testcase_Fs4_complex_twosided(
- spectral_testcase_nosig_real_onesided):
- def setUp(self):
- self.createStim(fstims=[4],
- iscomplex=True, sides='twosided', nsides=2)
-
-
-class spectral_testcase_Fs4_complex_defaultsided(
- spectral_testcase_nosig_real_onesided):
- def setUp(self):
- self.createStim(fstims=[4],
- iscomplex=True, sides='default', nsides=2)
-
-
-class spectral_testcase_FsAll_real_onesided(
- spectral_testcase_nosig_real_onesided):
- def setUp(self):
- self.createStim(fstims=[4, 5, 10],
- iscomplex=False, sides='onesided', nsides=1)
-
-
-class spectral_testcase_FsAll_real_twosided(
- spectral_testcase_nosig_real_onesided):
- def setUp(self):
- self.createStim(fstims=[4, 5, 10],
- iscomplex=False, sides='twosided', nsides=2)
-
-
-class spectral_testcase_FsAll_real_defaultsided(
- spectral_testcase_nosig_real_onesided):
- def setUp(self):
- self.createStim(fstims=[4, 5, 10],
- iscomplex=False, sides='default', nsides=1)
-
-
-class spectral_testcase_FsAll_complex_onesided(
- spectral_testcase_nosig_real_onesided):
- def setUp(self):
- self.createStim(fstims=[4, 5, 10],
- iscomplex=True, sides='onesided', nsides=1)
-
-
-class spectral_testcase_FsAll_complex_twosided(
- spectral_testcase_nosig_real_onesided):
- def setUp(self):
- self.createStim(fstims=[4, 5, 10],
- iscomplex=True, sides='twosided', nsides=2)
-
-
-class spectral_testcase_FsAll_complex_defaultsided(
- spectral_testcase_nosig_real_onesided):
- def setUp(self):
- self.createStim(fstims=[4, 5, 10],
- iscomplex=True, sides='default', nsides=2)
-
-
class spectral_testcase_nosig_real_onesided_noNFFT(
spectral_testcase_nosig_real_onesided):
def setUp(self):

View File

@@ -1,65 +0,0 @@
--- 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
@@ -361,7 +361,7 @@
plt.plot('b','b', 'o', data=data)
-@image_comparison(baseline_images=['single_date'])
+@image_comparison(baseline_images=['single_date'], tol=1.97)
def test_single_date():
time1 = [721964.0]
data1 = [-65.54]
@@ -4696,7 +4696,7 @@
@image_comparison(baseline_images=['date_timezone_x_and_y'],
- extensions=['png'])
+ extensions=['png'], tol=3.042)
def test_date_timezone_x_and_y():
# Tests issue 5575
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.new 2017-01-07 21:35:52.016235301 -0800
@@ -489,7 +489,7 @@
ax.autoscale_view()
-@image_comparison(baseline_images=['polycollection_close'],
+@image_comparison(baseline_images=['polycollection_close'], tol=0.446,
extensions=['png'], remove_text=True)
def test_polycollection_close():
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.new 2017-01-07 21:36:29.283396673 -0800
@@ -233,7 +233,7 @@
label.set_rotation(30)
-@image_comparison(baseline_images=['contour_test_label_transforms'],
+@image_comparison(baseline_images=['contour_test_label_transforms'], tol=0.731,
extensions=['png'], remove_text=True)
def test_labels():
# 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.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.15)
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,55 +0,0 @@
--- 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
@@ -266,7 +266,7 @@
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.306,
freetype_version=None, remove_text=False,
savefig_kwarg=None, style='classic'):
"""
--- 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
@@ -17,7 +17,7 @@
@image_comparison(baseline_images=['pngsuite'], extensions=['png'],
- tol=0.01 if on_win else 0)
+ tol=0.014)
def test_pngsuite():
dirname = os.path.join(
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.new 2017-01-07 21:20:42.180300328 -0800
@@ -18,7 +18,7 @@
@image_comparison(baseline_images=['streamplot_colormap'],
- tol=0.002)
+ tol=0.009)
def test_colormap():
X, Y, U, V = velocity_field()
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

@@ -1,33 +0,0 @@
--- setupext.py.orig 2013-08-02 09:39:43.914247832 +0200
+++ setupext.py 2013-08-02 09:40:14.785304342 +0200
@@ -914,28 +914,13 @@ class LibAgg(SetupPackage):
self.__class__.found_external = True
try:
return self._check_for_pkg_config(
- 'libagg', 'agg2/agg_basics.h', min_version='PATCH')
+ 'libagg', 'agg2/agg_basics.h', min_version='2.5.0')
except CheckFailed as e:
self.__class__.found_external = False
return str(e) + ' Using local copy.'
def add_flags(self, ext):
- if self.found_external:
- pkg_config.setup_extension(ext, 'libagg')
- else:
- ext.include_dirs.append('extern/agg24/include')
- agg_sources = [
- 'agg_bezier_arc.cpp',
- 'agg_curves.cpp',
- 'agg_image_filters.cpp',
- 'agg_trans_affine.cpp',
- 'agg_vcgen_contour.cpp',
- 'agg_vcgen_dash.cpp',
- 'agg_vcgen_stroke.cpp',
- 'agg_vpgen_segmentator.cpp'
- ]
- ext.sources.extend(
- os.path.join('extern', 'agg24', 'src', x) for x in agg_sources)
+ pkg_config.setup_extension(ext, 'libagg', default_include_dirs=["/usr/include/agg2"])
class FreeType(SetupPackage):

View File

@@ -1,24 +0,0 @@
diff -up matplotlib-1.5.2rc2/setupext.py.qh matplotlib-1.5.2rc2/setupext.py
--- matplotlib-1.5.2rc2/setupext.py.qh 2016-06-04 00:09:22.605827942 +0200
+++ matplotlib-1.5.2rc2/setupext.py 2016-06-04 00:09:22.611827972 +0200
@@ -1018,7 +1018,7 @@ class Qhull(SetupPackage):
# present on this system, so check if the header files can be
# found.
include_dirs = [
- os.path.join(x, 'qhull') for x in get_include_dirs()]
+ os.path.join(x, 'libqhull') for x in get_include_dirs()]
if has_include_file(include_dirs, 'qhull_a.h'):
return 'Using system Qhull (version unknown, no pkg-config info)'
else:
diff -up matplotlib-1.5.2rc2/src/qhull_wrap.c.qh matplotlib-1.5.2rc2/src/qhull_wrap.c
--- matplotlib-1.5.2rc2/src/qhull_wrap.c.qh 2016-05-27 04:19:34.000000000 +0200
+++ matplotlib-1.5.2rc2/src/qhull_wrap.c 2016-06-04 00:09:22.608827957 +0200
@@ -7,7 +7,7 @@
*/
#include "Python.h"
#include "numpy/noprefix.h"
-#include "qhull/qhull_a.h"
+#include <libqhull/qhull_a.h>
#include <stdio.h>

View File

@@ -1,34 +0,0 @@
diff -up matplotlib-1.5.1/setupext.py.six matplotlib-1.5.1/setupext.py
--- matplotlib-1.5.1/setupext.py.six 2016-01-10 23:20:20.000000000 +0100
+++ matplotlib-1.5.1/setupext.py 2016-05-18 13:44:21.534494158 +0200
@@ -1026,6 +1026,18 @@ class Qhull(SetupPackage):
ext.sources.extend(glob.glob('extern/qhull/*.c'))
+class Six(SetupPackage):
+ name = "six"
+
+ def check(self):
+ try:
+ import six
+ except ImportError:
+ return 'not found. pip may install it below.'
+
+ return 'version %s' % six.__version__
+
+
class TTConv(SetupPackage):
name = "ttconv"
diff -up matplotlib-1.5.1/setup.py.six matplotlib-1.5.1/setup.py
--- matplotlib-1.5.1/setup.py.six 2016-01-10 23:20:20.000000000 +0100
+++ matplotlib-1.5.1/setup.py 2016-05-18 13:44:21.528494040 +0200
@@ -84,7 +84,7 @@ mpl_packages = [
setupext.Delaunay(),
setupext.QhullWrap(),
setupext.Tri(),
- setupext.Externals(),
+ setupext.Six(),
'Optional subpackages',
setupext.SampleData(),
setupext.Toolkits(),

File diff suppressed because it is too large Load Diff

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,5 +0,0 @@
[packages]
tests = True
[rc_options]
backend = GTKAgg

View File

@@ -1 +0,0 @@
SHA512 (matplotlib-2.0.0-without-copyrighted.tar.xz) = 6413b0187b3d7ce5e4cbfaf7de4f42a747f1a415dbe3dca71c5f0ff0b8ac7139dc2807302bfbc67428281cfc7744cc23c6bbda041cd0568eff71801a740b862d