Compare commits
136 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
93f88a6307 | ||
|
|
853e3b217e | ||
|
|
d4f07f68ab | ||
|
|
e71d6832cc | ||
|
|
dbe22df6a2 | ||
|
|
4ed16b6299 | ||
|
|
ca0fc90842 | ||
|
|
50a5dee18f | ||
|
|
15d6bc1d48 | ||
|
|
4e3179c9e2 | ||
|
|
c4148f5979 | ||
|
|
171d221430 | ||
|
|
2b82ad2a3b | ||
|
|
98cb5a1a9b | ||
|
|
ac8946e2f5 | ||
|
|
4cdf22e67a | ||
|
|
7da34af983 | ||
|
|
c24355dafa | ||
|
|
e3697cc92e | ||
|
|
3995507d1b | ||
|
|
ad9824fe33 | ||
|
|
f853587a87 | ||
|
|
4524214523 | ||
|
|
26c79f2797 | ||
|
|
c7c1d89af8 | ||
|
|
9d428b07ae | ||
|
|
037e6aee2b | ||
|
|
02546b29b2 | ||
|
|
107b5a1d51 | ||
|
|
8d41fb7796 | ||
|
|
d52452b8de | ||
|
|
ec400d341f | ||
|
|
bea895839b | ||
|
|
713ad4038b | ||
|
|
d613f4be7e | ||
|
|
f5b673f304 | ||
|
|
3fa499ba45 | ||
|
|
ea129e4586 | ||
|
|
e6f3591340 | ||
|
|
304a359289 | ||
|
|
8d98548134 | ||
|
|
1f37c6ab3a | ||
|
|
c533793071 | ||
|
|
e8c7e2c6d2 | ||
|
|
cb1f3493dc | ||
|
|
3009a9a10c | ||
|
|
685e53f794 | ||
|
|
c4446bc9c0 | ||
|
|
2441db0faa | ||
|
|
9046bbb237 | ||
|
|
3652785c8e | ||
|
|
6ae3a9e1d1 | ||
|
|
831ec4cba0 | ||
|
|
49e6227f01 | ||
|
|
120f1b74da | ||
|
|
b5e6655ad8 | ||
|
|
6e771d1530 | ||
|
|
b1b97b1ed1 | ||
|
|
17130085de | ||
|
|
f171297f40 | ||
|
|
af995aa143 | ||
|
|
308245a86e | ||
|
|
7424178997 | ||
|
|
cc106d1c4a | ||
|
|
7901631a85 | ||
|
|
b4eba4ae21 | ||
|
|
b8683378dd | ||
|
|
9fde50abab | ||
|
|
ed3fa9581d | ||
|
|
c08eccf6ad | ||
|
|
a0fbf93967 | ||
|
|
6f3ec368b4 | ||
|
|
d2fa0263b8 | ||
|
|
c385e2c1a9 | ||
|
|
6995ee3297 | ||
|
|
19b5ff96fa | ||
|
|
1dcb7afa2a | ||
|
|
ee42f59462 | ||
|
|
8293bc2589 | ||
|
|
20e40c3953 | ||
|
|
a6c4a06cef | ||
|
|
862f207d27 | ||
|
|
6f741c4a02 | ||
|
|
b89d120a97 | ||
|
|
1b8cd73b7e | ||
|
|
69d38c5f1e | ||
|
|
725edd957b | ||
|
|
c48ca2e7fd | ||
|
|
5c2bf08c46 | ||
|
|
7930b4df8d | ||
|
|
ffa18cbcd2 | ||
|
|
c0a5a7d07f | ||
|
|
c1840d0738 | ||
|
|
c89bd06dd9 | ||
|
|
b11ac2671c | ||
|
|
15844872fc | ||
|
|
ad961d502c | ||
|
|
bf010710f1 | ||
|
|
f46b703e96 | ||
|
|
da0bd4c413 | ||
|
|
c409bffb3d | ||
|
|
172edad3e8 | ||
|
|
c3e31d8c7e | ||
|
|
bc53b538e3 | ||
|
|
14e86457fd | ||
|
|
8d6885671d | ||
|
|
b470c189c1 | ||
|
|
75d0d8966b | ||
|
|
0326098544 | ||
|
|
2d712efe1e | ||
|
|
09769170a4 | ||
|
|
3f6380df61 | ||
|
|
c9345fa6ce | ||
|
|
4cf6018279 | ||
|
|
f28833ef2d | ||
|
|
58a05487aa | ||
|
|
5ff9cbe460 | ||
|
|
730689d98e | ||
|
|
14e87c4546 | ||
|
|
e9a5a6f0c0 | ||
|
|
68a10c0be2 | ||
|
|
cf584d71bb | ||
|
|
c20c3de8d0 | ||
|
|
33684553c0 | ||
|
|
0505957232 | ||
|
|
886c137f30 | ||
|
|
61b48deb75 | ||
|
|
af22a586b1 | ||
|
|
2e2f0e7aa2 | ||
|
|
cab430591a | ||
|
|
cf0338c697 | ||
|
|
08fc8aa374 | ||
|
|
82ec7425cf | ||
|
|
8c2171471b | ||
|
|
b295321e02 | ||
|
|
00a8b9c8fd |
59
.gitignore
vendored
59
.gitignore
vendored
@@ -9,3 +9,62 @@ matplotlib-1.0.0-without-gpc.tar.gz
|
||||
/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
|
||||
/matplotlib-2.0.1.tar.gz
|
||||
/matplotlib-2.0.2.tar.gz
|
||||
/matplotlib-2.1.0rc1.tar.gz
|
||||
/matplotlib-2.1.0.tar.gz
|
||||
/matplotlib-2.1.1.tar.gz
|
||||
/matplotlib-2.1.2.tar.gz
|
||||
/matplotlib-2.1.2-with-freetype-2.8.tar.gz
|
||||
/matplotlib-2.2.2.tar.gz
|
||||
/matplotlib-2.2.2-with-freetype-2.8.tar.gz
|
||||
/matplotlib-2.2.2-with-freetype-2.9.tar.gz
|
||||
/matplotlib-2.2.3.tar.gz
|
||||
/matplotlib-2.2.3-with-freetype-2.8.tar.gz
|
||||
/matplotlib-2.2.3-with-freetype-2.9.1.tar.gz
|
||||
/matplotlib-3.0.0rc1.tar.gz
|
||||
/matplotlib-3.0.0rc1-with-freetype-2.9.1.tar.gz
|
||||
/matplotlib-3.0.0rc2.tar.gz
|
||||
/matplotlib-3.0.0rc2-with-freetype-2.9.1.tar.gz
|
||||
/matplotlib-3.0.0.tar.gz
|
||||
/matplotlib-3.0.0-with-freetype-2.9.1.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
|
||||
/matplotlib-3.1.0rc1.tar.gz
|
||||
/matplotlib-3.1.0.tar.gz
|
||||
/matplotlib-3.1.0-with-freetype-2.10.0.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.2.0rc3.tar.gz
|
||||
/matplotlib-3.2.0rc3-with-freetype-2.10.1.tar.gz
|
||||
/matplotlib-3.2.0.tar.gz
|
||||
/matplotlib-3.2.0-with-freetype-2.10.1.tar.gz
|
||||
/matplotlib-3.2.1.tar.gz
|
||||
/matplotlib-3.2.2.tar.gz
|
||||
/matplotlib-3.2.2-with-freetype-2.10.1.tar.gz
|
||||
/matplotlib-3.3.0rc1.tar.gz
|
||||
/matplotlib-3.3.0rc1-with-freetype-2.10.1.tar.gz
|
||||
/matplotlib-3.3.0.tar.gz
|
||||
/matplotlib-3.3.0-with-freetype-2.10.2.tar.gz
|
||||
/matplotlib-3.3.1.tar.gz
|
||||
/matplotlib-3.3.2.tar.gz
|
||||
/matplotlib-3.3.3.tar.gz
|
||||
/matplotlib-3.3.3-with-freetype-2.10.4.tar.gz
|
||||
/matplotlib-3.3.4.tar.gz
|
||||
/matplotlib-3.4.0rc1.tar.gz
|
||||
/matplotlib-3.4.0rc1-with-freetype-2.10.4.tar.gz
|
||||
/matplotlib-3.4.0rc3.tar.gz
|
||||
/matplotlib-3.4.1.tar.gz
|
||||
/matplotlib-3.4.1-with-freetype-2.10.4.tar.gz
|
||||
/matplotlib-3.4.2.tar.gz
|
||||
/matplotlib-3.4.1-with-freetype-2.11.0.tar.gz
|
||||
/matplotlib-3.4.3.tar.gz
|
||||
/matplotlib-3.4.3-with-freetype-2.10.4.tar.gz
|
||||
/matplotlib-3.4.3-with-freetype-2.11.0.tar.gz
|
||||
|
||||
43
0001-matplotlibrc-path-search-fix.patch
Normal file
43
0001-matplotlibrc-path-search-fix.patch
Normal file
@@ -0,0 +1,43 @@
|
||||
From 60ab4094d885067c50694d2f11cd640dc5c0f0c6 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/2] matplotlibrc path search fix
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
lib/matplotlib/__init__.py | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
|
||||
index 71c68a3d6b..88be8e97b0 100644
|
||||
--- a/lib/matplotlib/__init__.py
|
||||
+++ b/lib/matplotlib/__init__.py
|
||||
@@ -473,7 +473,8 @@ def get_cachedir():
|
||||
@_logged_cached('matplotlib data path: %s')
|
||||
def get_data_path():
|
||||
"""Return the path to Matplotlib data."""
|
||||
- return str(Path(__file__).with_name("mpl-data"))
|
||||
+ return str(Path(__file__).parent.parent.parent.parent.parent /
|
||||
+ 'share/matplotlib/mpl-data')
|
||||
|
||||
|
||||
def matplotlib_fname():
|
||||
@@ -493,6 +494,7 @@ def matplotlib_fname():
|
||||
is not defined)
|
||||
- On other platforms,
|
||||
- ``$HOME/.matplotlib/matplotlibrc`` if ``$HOME`` is defined
|
||||
+ - ``/etc/matplotlibrc``
|
||||
- Lastly, it looks in ``$MATPLOTLIBDATA/matplotlibrc``, which should always
|
||||
exist.
|
||||
"""
|
||||
@@ -511,6 +513,7 @@ def matplotlib_fname():
|
||||
yield matplotlibrc
|
||||
yield os.path.join(matplotlibrc, 'matplotlibrc')
|
||||
yield os.path.join(get_configdir(), 'matplotlibrc')
|
||||
+ yield '/etc/matplotlibrc'
|
||||
yield os.path.join(get_data_path(), 'matplotlibrc')
|
||||
|
||||
for fname in gen_candidates():
|
||||
--
|
||||
2.31.1
|
||||
|
||||
165
0002-Set-FreeType-version-to-2.10.4-and-update-tolerances.patch
Normal file
165
0002-Set-FreeType-version-to-2.10.4-and-update-tolerances.patch
Normal file
@@ -0,0 +1,165 @@
|
||||
From 7ca8afa7fa3e141464c1ef2b2c58b23b586bf310 Mon Sep 17 00:00:00 2001
|
||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
Date: Fri, 14 Feb 2020 06:05:42 -0500
|
||||
Subject: [PATCH 2/2] Set FreeType version to 2.10.4 and update tolerances.
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
lib/matplotlib/__init__.py | 2 +-
|
||||
lib/matplotlib/tests/test_axes.py | 4 ++--
|
||||
lib/matplotlib/tests/test_constrainedlayout.py | 2 +-
|
||||
lib/matplotlib/tests/test_mathtext.py | 7 +++++--
|
||||
lib/matplotlib/tests/test_polar.py | 2 +-
|
||||
lib/matplotlib/tests/test_tightlayout.py | 10 +++++-----
|
||||
setupext.py | 9 ++++++++-
|
||||
7 files changed, 23 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
|
||||
index 88be8e97b0..22dc74181e 100644
|
||||
--- a/lib/matplotlib/__init__.py
|
||||
+++ b/lib/matplotlib/__init__.py
|
||||
@@ -1137,7 +1137,7 @@ default_test_modules = [
|
||||
def _init_tests():
|
||||
# The version of FreeType to install locally for running the
|
||||
# tests. This must match the value in `setupext.py`
|
||||
- LOCAL_FREETYPE_VERSION = '2.6.1'
|
||||
+ LOCAL_FREETYPE_VERSION = '2.10.4'
|
||||
|
||||
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 7950e5b830..046dbbe1b8 100644
|
||||
--- a/lib/matplotlib/tests/test_axes.py
|
||||
+++ b/lib/matplotlib/tests/test_axes.py
|
||||
@@ -6500,7 +6500,7 @@ def test_normal_axes():
|
||||
]
|
||||
for nn, b in enumerate(bbaxis):
|
||||
targetbb = mtransforms.Bbox.from_bounds(*target[nn])
|
||||
- assert_array_almost_equal(b.bounds, targetbb.bounds, decimal=2)
|
||||
+ assert_array_almost_equal(b.bounds, targetbb.bounds, decimal=0)
|
||||
|
||||
target = [
|
||||
[150.0, 119.999, 930.0, 11.111],
|
||||
@@ -6518,7 +6518,7 @@ def test_normal_axes():
|
||||
|
||||
target = [85.5138, 75.88888, 1021.11, 1017.11]
|
||||
targetbb = mtransforms.Bbox.from_bounds(*target)
|
||||
- assert_array_almost_equal(bbtb.bounds, targetbb.bounds, decimal=2)
|
||||
+ assert_array_almost_equal(bbtb.bounds, targetbb.bounds, decimal=0)
|
||||
|
||||
# test that get_position roundtrips to get_window_extent
|
||||
axbb = ax.get_position().transformed(fig.transFigure).bounds
|
||||
diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
|
||||
index 117b221cc2..d009912dfa 100644
|
||||
--- a/lib/matplotlib/tests/test_constrainedlayout.py
|
||||
+++ b/lib/matplotlib/tests/test_constrainedlayout.py
|
||||
@@ -429,7 +429,7 @@ def test_hidden_axes():
|
||||
extents1 = np.copy(axs[0, 0].get_position().extents)
|
||||
|
||||
np.testing.assert_allclose(
|
||||
- extents1, [0.045552, 0.543288, 0.47819, 0.982638], rtol=1e-5)
|
||||
+ extents1, [0.045552, 0.543288, 0.47819, 0.982638], rtol=1e-2)
|
||||
|
||||
|
||||
def test_colorbar_align():
|
||||
diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
|
||||
index b5fd906d2f..8e3801a231 100644
|
||||
--- a/lib/matplotlib/tests/test_mathtext.py
|
||||
+++ b/lib/matplotlib/tests/test_mathtext.py
|
||||
@@ -1,5 +1,6 @@
|
||||
import io
|
||||
import os
|
||||
+import platform
|
||||
import re
|
||||
|
||||
import numpy as np
|
||||
@@ -189,7 +190,8 @@ def baseline_images(request, fontset, index, text):
|
||||
@pytest.mark.parametrize(
|
||||
'fontset', ['cm', 'stix', 'stixsans', 'dejavusans', 'dejavuserif'])
|
||||
@pytest.mark.parametrize('baseline_images', ['mathtext'], indirect=True)
|
||||
-@image_comparison(baseline_images=None)
|
||||
+@image_comparison(baseline_images=None,
|
||||
+ tol=0.011 if platform.machine() in ('ppc64le', 's390x') else 0)
|
||||
def test_mathtext_rendering(baseline_images, fontset, index, text):
|
||||
mpl.rcParams['mathtext.fontset'] = fontset
|
||||
fig = plt.figure(figsize=(5.25, 0.75))
|
||||
@@ -213,7 +215,8 @@ def test_mathtext_rendering_lightweight(baseline_images, fontset, index, text):
|
||||
@pytest.mark.parametrize(
|
||||
'fontset', ['cm', 'stix', 'stixsans', 'dejavusans', 'dejavuserif'])
|
||||
@pytest.mark.parametrize('baseline_images', ['mathfont'], indirect=True)
|
||||
-@image_comparison(baseline_images=None, extensions=['png'])
|
||||
+@image_comparison(baseline_images=None, extensions=['png'],
|
||||
+ tol=0.011 if platform.machine() in ('ppc64le', 's390x') else 0)
|
||||
def test_mathfont_rendering(baseline_images, fontset, index, text):
|
||||
mpl.rcParams['mathtext.fontset'] = fontset
|
||||
fig = plt.figure(figsize=(5.25, 0.75))
|
||||
diff --git a/lib/matplotlib/tests/test_polar.py b/lib/matplotlib/tests/test_polar.py
|
||||
index c614eff027..daf4e26fb8 100644
|
||||
--- a/lib/matplotlib/tests/test_polar.py
|
||||
+++ b/lib/matplotlib/tests/test_polar.py
|
||||
@@ -312,7 +312,7 @@ def test_get_tightbbox_polar():
|
||||
fig.canvas.draw()
|
||||
bb = ax.get_tightbbox(fig.canvas.get_renderer())
|
||||
assert_allclose(
|
||||
- bb.extents, [107.7778, 29.2778, 539.7847, 450.7222], rtol=1e-03)
|
||||
+ bb.extents, [107.7778, 29.2778, 539.7847, 450.7222], rtol=1)
|
||||
|
||||
|
||||
@check_figures_equal(extensions=["png"])
|
||||
diff --git a/lib/matplotlib/tests/test_tightlayout.py b/lib/matplotlib/tests/test_tightlayout.py
|
||||
index 23d363b508..e94c863477 100644
|
||||
--- a/lib/matplotlib/tests/test_tightlayout.py
|
||||
+++ b/lib/matplotlib/tests/test_tightlayout.py
|
||||
@@ -172,12 +172,12 @@ def test_outward_ticks():
|
||||
plt.tight_layout()
|
||||
# These values were obtained after visual checking that they correspond
|
||||
# to a tight layouting that did take the ticks into account.
|
||||
- ans = [[[0.091, 0.607], [0.433, 0.933]],
|
||||
- [[0.579, 0.607], [0.922, 0.933]],
|
||||
- [[0.091, 0.140], [0.433, 0.466]],
|
||||
- [[0.579, 0.140], [0.922, 0.466]]]
|
||||
+ ans = [[[0.09, 0.61], [0.43, 0.93]],
|
||||
+ [[0.58, 0.61], [0.92, 0.93]],
|
||||
+ [[0.09, 0.14], [0.43, 0.47]],
|
||||
+ [[0.58, 0.14], [0.92, 0.47]]]
|
||||
for nn, ax in enumerate(fig.axes):
|
||||
- assert_array_equal(np.round(ax.get_position().get_points(), 3),
|
||||
+ assert_array_equal(np.round(ax.get_position().get_points(), 2),
|
||||
ans[nn])
|
||||
|
||||
|
||||
diff --git a/setupext.py b/setupext.py
|
||||
index d8d0b6b393..e44d3b046a 100644
|
||||
--- a/setupext.py
|
||||
+++ b/setupext.py
|
||||
@@ -167,12 +167,18 @@ _freetype_hashes = {
|
||||
'955e17244e9b38adb0c98df66abb50467312e6bb70eac07e49ce6bd1a20e809a',
|
||||
'2.10.1':
|
||||
'3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110',
|
||||
+ '2.10.2':
|
||||
+ 'e09aa914e4f7a5d723ac381420949c55c0b90b15744adce5d1406046022186ab',
|
||||
+ '2.10.4':
|
||||
+ '5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac',
|
||||
+ '2.11.0':
|
||||
+ 'a45c6b403413abd5706f3582f04c8339d26397c4304b78fa552f2215df64101f',
|
||||
}
|
||||
# This is the version of FreeType to use when building a local
|
||||
# version. It must match the value in
|
||||
# lib/matplotlib.__init__.py and also needs to be changed below in the
|
||||
# embedded windows build script (grep for "REMINDER" in this file)
|
||||
-LOCAL_FREETYPE_VERSION = '2.6.1'
|
||||
+LOCAL_FREETYPE_VERSION = '2.10.4'
|
||||
LOCAL_FREETYPE_HASH = _freetype_hashes.get(LOCAL_FREETYPE_VERSION, 'unknown')
|
||||
|
||||
LOCAL_QHULL_VERSION = '2020.2'
|
||||
@@ -565,6 +571,7 @@ class FreeType(SetupPackage):
|
||||
ext.extra_objects.insert(
|
||||
0, str(src_path / 'objs' / '.libs' / libfreetype))
|
||||
ext.define_macros.append(('FREETYPE_BUILD_TYPE', 'local'))
|
||||
+ ext.libraries.append('brotlidec')
|
||||
|
||||
def do_custom_build(self, env):
|
||||
# We're using a system freetype
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@@ -1,36 +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')
|
||||
--- a/lib/matplotlib/cbook.py 2016-05-20 14:14:52.000000000 +0200
|
||||
+++ b/lib/matplotlib/cbook.py 2016-05-20 19:28:57.373601582 +0200
|
||||
@@ -823,8 +823,7 @@ def get_sample_data(fname, asfileobj=Tru
|
||||
if matplotlib.rcParams['examples.directory']:
|
||||
root = matplotlib.rcParams['examples.directory']
|
||||
else:
|
||||
- root = os.path.join(os.path.dirname(__file__),
|
||||
- "mpl-data", "sample_data")
|
||||
+ root = os.path.join(matplotlib._get_data_path(), 'sample_data')
|
||||
path = os.path.join(root, fname)
|
||||
|
||||
if asfileobj:
|
||||
@@ -1,19 +0,0 @@
|
||||
Description: Try to use also StayPuft (a free font) for xkcd
|
||||
Author: Sandro Tosi <morph@debian.org>
|
||||
Origin: vendor
|
||||
Bug: http://bugs.debian.org/720549
|
||||
Forwarded: not-needed
|
||||
Last-Update: 2013-10-06
|
||||
---
|
||||
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
||||
--- a/lib/matplotlib/pyplot.py
|
||||
+++ b/lib/matplotlib/pyplot.py
|
||||
@@ -301,7 +301,7 @@ def xkcd(scale=1, length=100, randomness
|
||||
from matplotlib import patheffects
|
||||
context = rc_context()
|
||||
try:
|
||||
- rcParams['font.family'] = ['Humor Sans', 'Comic Sans MS']
|
||||
+ rcParams['font.family'] = ['Humor Sans', 'Comic Sans MS', 'StayPuft']
|
||||
rcParams['font.size'] = 14.0
|
||||
rcParams['path.sketch'] = (scale, length, randomness)
|
||||
rcParams['path.effects'] = [
|
||||
@@ -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,167 +0,0 @@
|
||||
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 """
|
||||
|
||||
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:
|
||||
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():
|
||||
- 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
|
||||
|
||||
import numpy as np
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
-@image_comparison(baseline_images=['font_styles'])
|
||||
-def test_font_styles():
|
||||
- from matplotlib import _get_data_path
|
||||
- data_path = _get_data_path()
|
||||
-
|
||||
- def find_matplotlib_font(**kw):
|
||||
- prop = FontProperties(**kw)
|
||||
- path = findfont(prop, directory=data_path)
|
||||
- return FontProperties(fname=path)
|
||||
-
|
||||
- from matplotlib.font_manager import FontProperties, findfont
|
||||
- warnings.filterwarnings(
|
||||
- 'ignore',
|
||||
- ('findfont: Font family \[u?\'Foo\'\] not found. Falling back to .'),
|
||||
- UserWarning,
|
||||
- module='matplotlib.font_manager')
|
||||
-
|
||||
- plt.figure()
|
||||
- ax = plt.subplot(1, 1, 1)
|
||||
-
|
||||
- normalFont = find_matplotlib_font(
|
||||
- family="sans-serif",
|
||||
- style="normal",
|
||||
- variant="normal",
|
||||
- size=14)
|
||||
- ax.annotate(
|
||||
- "Normal Font",
|
||||
- (0.1, 0.1),
|
||||
- xycoords='axes fraction',
|
||||
- fontproperties=normalFont)
|
||||
-
|
||||
- boldFont = find_matplotlib_font(
|
||||
- family="Foo",
|
||||
- style="normal",
|
||||
- variant="normal",
|
||||
- weight="bold",
|
||||
- stretch=500,
|
||||
- size=14)
|
||||
- ax.annotate(
|
||||
- "Bold Font",
|
||||
- (0.1, 0.2),
|
||||
- xycoords='axes fraction',
|
||||
- fontproperties=boldFont)
|
||||
-
|
||||
- boldItemFont = find_matplotlib_font(
|
||||
- family="sans serif",
|
||||
- style="italic",
|
||||
- variant="normal",
|
||||
- weight=750,
|
||||
- stretch=500,
|
||||
- size=14)
|
||||
- ax.annotate(
|
||||
- "Bold Italic Font",
|
||||
- (0.1, 0.3),
|
||||
- xycoords='axes fraction',
|
||||
- fontproperties=boldItemFont)
|
||||
-
|
||||
- lightFont = find_matplotlib_font(
|
||||
- family="sans-serif",
|
||||
- style="normal",
|
||||
- variant="normal",
|
||||
- weight=200,
|
||||
- stretch=500,
|
||||
- size=14)
|
||||
- ax.annotate(
|
||||
- "Light Font",
|
||||
- (0.1, 0.4),
|
||||
- xycoords='axes fraction',
|
||||
- fontproperties=lightFont)
|
||||
-
|
||||
- condensedFont = find_matplotlib_font(
|
||||
- family="sans-serif",
|
||||
- style="normal",
|
||||
- variant="normal",
|
||||
- weight=500,
|
||||
- stretch=100,
|
||||
- size=14)
|
||||
- ax.annotate(
|
||||
- "Condensed Font",
|
||||
- (0.1, 0.5),
|
||||
- xycoords='axes fraction',
|
||||
- fontproperties=condensedFont)
|
||||
-
|
||||
- ax.set_xticks([])
|
||||
- ax.set_yticks([])
|
||||
|
||||
|
||||
@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)
|
||||
@@ -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
10
setup.cfg
10
setup.cfg
@@ -1,2 +1,8 @@
|
||||
[rc_options]
|
||||
backend = GTKAgg
|
||||
[libs]
|
||||
system_freetype = True
|
||||
system_qhull = True
|
||||
|
||||
[packages]
|
||||
tests = True
|
||||
toolkits = True
|
||||
toolkits_tests = True
|
||||
|
||||
3
sources
3
sources
@@ -1 +1,2 @@
|
||||
495f6bdf126b40f63c316c9404349e40 matplotlib-1.5.2rc2.tar.gz
|
||||
SHA512 (matplotlib-3.4.3.tar.gz) = e346c7d0f33b7d2fb5b48a4578ec99a40c2e5b959d109526ccbe7582a37f10abb91d53062711c37eb4ccaf462fd8684e1557405c50ccf43139bc371601a60e80
|
||||
SHA512 (matplotlib-3.4.3-with-freetype-2.10.4.tar.gz) = 665870e9c34fa562c69c28432b6d378e02c63ff2b14a34f982a16c89ecdb3b012cdf3306e84a052d689710f2ddff069c8a207b63971c73e5c867d6562e1f6241
|
||||
|
||||
Reference in New Issue
Block a user