Compare commits
3 Commits
f27
...
python-mat
| Author | SHA1 | Date | |
|---|---|---|---|
|
59c1d84890 | ||
|
|
3f62acac2a | ||
|
|
96a7a97c6d |
1
.cvsignore
Normal file
1
.cvsignore
Normal file
@@ -0,0 +1 @@
|
||||
matplotlib-0.99.1.2.tar.gz
|
||||
15
.gitignore
vendored
15
.gitignore
vendored
@@ -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
|
||||
@@ -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')
|
||||
21
Makefile
Normal file
21
Makefile
Normal file
@@ -0,0 +1,21 @@
|
||||
# Makefile for source rpm: python-matplotlib
|
||||
# $Id$
|
||||
NAME := python-matplotlib
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attept a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
||||
13
matplotlib-0.87.7-matplotlibrc.patch
Normal file
13
matplotlib-0.87.7-matplotlibrc.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
--- matplotlib-0.87/setup.py.orig 2006-02-14 11:11:32.000000000 -0700
|
||||
+++ matplotlib-0.87/setup.py 2006-02-27 15:19:28.000000000 -0700
|
||||
@@ -258,8 +258,8 @@
|
||||
|
||||
# packagers: set rc['numerix'] and rc['backend'] here to override the auto
|
||||
# defaults, eg
|
||||
-#rc['numerix'] = numpy
|
||||
-#rc['backend'] = GTKAgg
|
||||
+rc['numerix'] = 'numpy'
|
||||
+rc['backend'] = 'GTKAgg'
|
||||
if sys.platform=='win32':
|
||||
rc = dict(backend='TkAgg', numerix='Numeric')
|
||||
template = file('matplotlibrc.template').read()
|
||||
53
matplotlib-0.90.1-setup.patch
Normal file
53
matplotlib-0.90.1-setup.patch
Normal file
@@ -0,0 +1,53 @@
|
||||
--- matplotlib-0.90.1/setup.py.tkagg 2007-06-04 10:34:46.000000000 -0600
|
||||
+++ matplotlib-0.90.1/setup.py 2007-06-04 10:54:44.000000000 -0600
|
||||
@@ -28,13 +28,13 @@
|
||||
# it. It makes very nice antialiased output and also supports alpha
|
||||
# blending
|
||||
BUILD_AGG = 1
|
||||
-BUILD_GTKAGG = 'auto'
|
||||
-BUILD_GTK = 'auto'
|
||||
+BUILD_GTKAGG = 1
|
||||
+BUILD_GTK = 1
|
||||
|
||||
# build TK GUI with Agg renderer ; requires Tkinter Python extension
|
||||
# and Tk includes
|
||||
# Use False or 0 if you don't want to build
|
||||
-BUILD_TKAGG = 'auto'
|
||||
+BUILD_TKAGG = 1
|
||||
|
||||
# build wxPython extension code to efficiently blit agg into wx. Only
|
||||
# needed for wxpython <2.8 if you plan on doing animations
|
||||
@@ -226,11 +226,11 @@
|
||||
|
||||
havegtk.gotit = None
|
||||
|
||||
-if BUILD_GTK and havegtk():
|
||||
+if BUILD_GTK:
|
||||
build_gdk(ext_modules, packages, NUMERIX)
|
||||
rc['backend'] = 'GTK'
|
||||
|
||||
-if BUILD_GTKAGG and havegtk():
|
||||
+if BUILD_GTKAGG:
|
||||
BUILD_AGG = 1
|
||||
build_gtkagg(ext_modules, packages, NUMERIX)
|
||||
rc['backend'] = 'GTKAgg'
|
||||
@@ -245,16 +245,9 @@
|
||||
print 'Tkinter present but import failed'
|
||||
BUILD_TKAGG = 0
|
||||
else:
|
||||
- try:
|
||||
- tk = Tkinter.Tk()
|
||||
- tk.withdraw()
|
||||
- except Tkinter.TclError:
|
||||
- print 'Tkinter present, but window failed to open'
|
||||
- BUILD_TKAGG = 0
|
||||
- else:
|
||||
- BUILD_AGG = 1
|
||||
- build_tkagg(ext_modules, packages, NUMERIX)
|
||||
- rc['backend'] = 'TkAgg'
|
||||
+ BUILD_AGG = 1
|
||||
+ build_tkagg(ext_modules, packages, NUMERIX)
|
||||
+ rc['backend'] = 'TkAgg'
|
||||
|
||||
if BUILD_WXAGG:
|
||||
try:
|
||||
63
matplotlib-gcc43.patch
Normal file
63
matplotlib-gcc43.patch
Normal file
@@ -0,0 +1,63 @@
|
||||
diff -u -r matplotlib-0.91.2-old/ttconv/pprdrv.h matplotlib-0.91.2/ttconv/pprdrv.h
|
||||
--- matplotlib-0.91.2-old/ttconv/pprdrv.h 2007-11-29 17:36:53.000000000 -0900
|
||||
+++ matplotlib-0.91.2/ttconv/pprdrv.h 2008-03-21 13:58:01.000000000 -0800
|
||||
@@ -20,7 +20,7 @@
|
||||
*/
|
||||
|
||||
#include <vector>
|
||||
-#include <assert.h>
|
||||
+#include <cassert>
|
||||
|
||||
/*
|
||||
* Encapsulates all of the output to write to an arbitrary output
|
||||
diff -u -r matplotlib-0.91.2-old/ttconv/pprdrv_tt2.cpp matplotlib-0.91.2/ttconv/pprdrv_tt2.cpp
|
||||
--- matplotlib-0.91.2-old/ttconv/pprdrv_tt2.cpp 2007-11-29 17:36:53.000000000 -0900
|
||||
+++ matplotlib-0.91.2/ttconv/pprdrv_tt2.cpp 2008-03-21 16:04:49.000000000 -0800
|
||||
@@ -31,10 +31,11 @@
|
||||
*/
|
||||
|
||||
#include "global_defines.h"
|
||||
-#include <math.h>
|
||||
-#include <stdlib.h>
|
||||
-#include <string.h>
|
||||
-#include <memory.h>
|
||||
+#include <cmath>
|
||||
+#include <cstdlib>
|
||||
+#include <cstdio>
|
||||
+#include <cstring>
|
||||
+#include <memory>
|
||||
#include "pprdrv.h"
|
||||
#include "truetype.h"
|
||||
#include <algorithm>
|
||||
diff -u -r matplotlib-0.91.2-old/ttconv/pprdrv_tt.cpp matplotlib-0.91.2/ttconv/pprdrv_tt.cpp
|
||||
--- matplotlib-0.91.2-old/ttconv/pprdrv_tt.cpp 2007-11-29 17:36:53.000000000 -0900
|
||||
+++ matplotlib-0.91.2/ttconv/pprdrv_tt.cpp 2008-03-21 15:57:42.000000000 -0800
|
||||
@@ -23,9 +23,9 @@
|
||||
*/
|
||||
|
||||
#include "global_defines.h"
|
||||
-#include <stdio.h>
|
||||
-#include <stdlib.h>
|
||||
-#include <string.h>
|
||||
+#include <cstdio>
|
||||
+#include <cstdlib>
|
||||
+#include <cstring>
|
||||
#include "pprdrv.h"
|
||||
#include "truetype.h"
|
||||
#include <sstream>
|
||||
diff -u -r matplotlib-0.91.2-old/ttconv/ttutil.cpp matplotlib-0.91.2/ttconv/ttutil.cpp
|
||||
--- matplotlib-0.91.2-old/ttconv/ttutil.cpp 2007-11-29 17:36:53.000000000 -0900
|
||||
+++ matplotlib-0.91.2/ttconv/ttutil.cpp 2008-03-24 11:25:06.000000000 -0800
|
||||
@@ -8,9 +8,9 @@
|
||||
/* (c) Frank Siegert 1996 */
|
||||
|
||||
#include "global_defines.h"
|
||||
-#include <stdio.h>
|
||||
-#include <stdarg.h>
|
||||
-#include <stdlib.h>
|
||||
+#include <cstdio>
|
||||
+#include <cstdarg>
|
||||
+#include <cstdlib>
|
||||
#include "pprdrv.h"
|
||||
|
||||
#if DEBUG_TRUETYPE
|
||||
@@ -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'])
|
||||
@@ -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:
|
||||
@@ -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):
|
||||
@@ -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
|
||||
|
||||
@@ -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))
|
||||
@@ -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):
|
||||
@@ -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>
|
||||
|
||||
|
||||
@@ -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
@@ -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
|
||||
80
setup.cfg
80
setup.cfg
@@ -1,5 +1,81 @@
|
||||
[packages]
|
||||
tests = True
|
||||
# Rename this file to setup.cfg to modify matplotlib's
|
||||
# build options.
|
||||
|
||||
[egg_info]
|
||||
tag_svn_revision = 1
|
||||
|
||||
[status]
|
||||
# To suppress display of the dependencies and their versions
|
||||
# at the top of the build log, uncomment the following line:
|
||||
#suppress = True
|
||||
#
|
||||
# Uncomment to insert lots of diagnostic prints in extension code
|
||||
#verbose = True
|
||||
|
||||
[provide_packages]
|
||||
# By default, matplotlib checks for a few dependencies and
|
||||
# installs them if missing. This feature can be turned off
|
||||
# by uncommenting the following lines. Acceptible values are:
|
||||
# True: install, overwrite an existing installation
|
||||
# False: do not install
|
||||
# auto: install only if the package is unavailable. This
|
||||
# is the default behavior
|
||||
#
|
||||
## Date/timezone support:
|
||||
#pytz = False
|
||||
#dateutil = False
|
||||
#
|
||||
## Experimental config package support:
|
||||
enthought.traits = False
|
||||
configobj = False
|
||||
|
||||
[gui_support]
|
||||
# Matplotlib supports multiple GUI toolkits, including Cocoa,
|
||||
# GTK, Fltk, Qt, Qt4, Tk, and WX. Support for many of these
|
||||
# toolkits requires AGG, the Anti-Grain Geometry library, which
|
||||
# is provided by matplotlib and built by default.
|
||||
#
|
||||
# Some backends are written in pure Python, and others require
|
||||
# extension code to be compiled. By default, matplotlib checks
|
||||
# for these GUI toolkits during installation and, if present,
|
||||
# compiles the required extensions to support the toolkit. GTK
|
||||
# support requires the GTK runtime environment and PyGTK. Wx
|
||||
# support requires wxWidgets and wxPython. Tk support requires
|
||||
# Tk and Tkinter. The other GUI toolkits do not require any
|
||||
# extension code, and can be used as long as the libraries are
|
||||
# installed on your system.
|
||||
#
|
||||
# You can uncomment any the following lines if you know you do
|
||||
# not want to use the GUI toolkit. Acceptible values are:
|
||||
# True: build the extension. Exits with a warning if the
|
||||
# required dependencies are not available
|
||||
# False: do not build the extension
|
||||
# auto: build if the required dependencies are available,
|
||||
# otherwise skip silently. This is the default
|
||||
# behavior
|
||||
#
|
||||
gtk = True
|
||||
gtkagg = True
|
||||
tkagg = True
|
||||
wxagg = False
|
||||
|
||||
[rc_options]
|
||||
# User-configurable options
|
||||
#
|
||||
# Default backend, one of: Agg, Cairo, CocoaAgg, GTK, GTKAgg,
|
||||
# GTKCairo, FltkAgg, Pdf, Ps, QtAgg, Qt4Agg, SVG, TkAgg, WX, WXAgg.
|
||||
#
|
||||
# The Agg, Ps, Pdf and SVG backends do not require external
|
||||
# dependencies. Do not choose GTK, GTKAgg, GTKCairo, TkAgg or WXAgg if
|
||||
# you have disabled the relevent extension modules. Agg will be used
|
||||
# by default.
|
||||
#
|
||||
backend = GTKAgg
|
||||
#
|
||||
# The numerix module was historically used to provide
|
||||
# compatibility between the Numeric, numarray, and NumPy array
|
||||
# packages. Now that NumPy has emerge as the universal array
|
||||
# package for python, numerix is not really necessary and is
|
||||
# maintained to provide backward compatibility. Do not change
|
||||
# this unless you have a compelling reason to do so.
|
||||
numerix = numpy
|
||||
|
||||
Reference in New Issue
Block a user