Compare commits
207 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
97d2c5437b | ||
|
|
1d44751f59 | ||
|
|
c26fa011b2 | ||
|
|
cb921b4252 | ||
|
|
65d146772c | ||
|
|
b5a125ff69 | ||
|
|
4836060bd0 | ||
|
|
1b16bcd2b0 | ||
|
|
b10c4c84d1 | ||
|
|
52ef239853 | ||
|
|
829c70b69a | ||
|
|
df0d40dcb0 | ||
|
|
acd2786cac | ||
|
|
e812a3aea3 | ||
|
|
6e57c9f80c | ||
|
|
a366353832 | ||
|
|
05ffcff315 | ||
|
|
bca414e4f1 | ||
|
|
13941a96df | ||
|
|
545cd052bc | ||
|
|
cec6c4b5b4 | ||
|
|
a567434c0d | ||
|
|
6053ff6f06 | ||
|
|
0b92076142 | ||
|
|
c601b679e9 | ||
|
|
2b3a520dad | ||
|
|
0744231c69 | ||
|
|
a5632a4923 | ||
|
|
5f242fa596 | ||
|
|
fbc57eefdb | ||
|
|
06a8e578fd | ||
|
|
c30bc8df54 | ||
|
|
8b94e4ad13 | ||
|
|
704b8e1dc2 | ||
|
|
36d9ebc96c | ||
|
|
d955e87bd5 | ||
|
|
14bebd4f34 | ||
|
|
96d053da3b | ||
|
|
4f115cba4b | ||
|
|
5603b45e28 | ||
|
|
9d8fa3fec2 | ||
|
|
ab79f788aa | ||
|
|
5c523b9ecb | ||
|
|
3d6adc14f9 | ||
|
|
f97a7a2b07 | ||
|
|
1caa632e0f | ||
|
|
fab6d6a412 | ||
|
|
48535648bd | ||
|
|
4c568cf6a5 | ||
|
|
0c4b36d5bf | ||
|
|
209ed580d1 | ||
|
|
4dfd2f126f | ||
|
|
1b0f98b373 | ||
|
|
d965724300 | ||
|
|
a289f8ffd9 | ||
|
|
58b78d7e5b | ||
|
|
ee6d7033f2 | ||
|
|
76e50b9ad7 | ||
|
|
ef61af71e2 | ||
|
|
569a4ddc11 | ||
|
|
8e6d614869 | ||
|
|
befe1f6a69 | ||
|
|
ea5db0b4a8 | ||
|
|
9d2b54f896 | ||
|
|
c9814b3833 | ||
|
|
97a48b2aed | ||
|
|
6e121f315b | ||
|
|
19bce65d7f | ||
|
|
cbe4b20013 | ||
|
|
bb0eaa7b22 | ||
|
|
11dea35f22 | ||
|
|
3919141179 | ||
|
|
aa35f44d05 | ||
|
|
794ddb89d6 | ||
|
|
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 |
99
.gitignore
vendored
99
.gitignore
vendored
@@ -9,3 +9,102 @@ 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.11.0.tar.gz
|
||||
/matplotlib-3.5.0b1.tar.gz
|
||||
/matplotlib-3.5.0b1-with-freetype-2.11.0.tar.gz
|
||||
/matplotlib-3.5.0rc1.tar.gz
|
||||
/matplotlib-3.5.0rc1-with-freetype-2.11.0.tar.gz
|
||||
/matplotlib-3.5.0.tar.gz
|
||||
/matplotlib-3.5.0-with-freetype-2.11.0.tar.gz
|
||||
/matplotlib-3.5.1.tar.gz
|
||||
/matplotlib-3.5.1-with-freetype-2.11.0.tar.gz
|
||||
/matplotlib-3.5.2.tar.gz
|
||||
/matplotlib-3.5.2-with-freetype-2.11.0.tar.gz
|
||||
/matplotlib-3.5.3.tar.gz
|
||||
/matplotlib-3.5.3-with-freetype-2.11.0.tar.gz
|
||||
/matplotlib-3.5.3-with-freetype-2.12.1.tar.gz
|
||||
/matplotlib-3.6.0rc1.tar.gz
|
||||
/matplotlib-3.6.0rc1-with-freetype-2.12.1.tar.gz
|
||||
/matplotlib-3.6.0rc2.tar.gz
|
||||
/matplotlib-3.6.0rc2-with-freetype-2.12.1.tar.gz
|
||||
/matplotlib-3.6.0.tar.gz
|
||||
/matplotlib-3.6.0-with-freetype-2.12.1.tar.gz
|
||||
/matplotlib-3.6.1.tar.gz
|
||||
/matplotlib-3.6.1-with-freetype-2.12.1.tar.gz
|
||||
/matplotlib-3.6.2.tar.gz
|
||||
/matplotlib-3.6.3.tar.gz
|
||||
/matplotlib-3.7.0rc1.tar.gz
|
||||
/matplotlib-3.7.0rc1-with-freetype-2.12.1.tar.gz
|
||||
/matplotlib-3.7.0.tar.gz
|
||||
/matplotlib-3.7.0-with-freetype-2.12.1.tar.gz
|
||||
/matplotlib-3.7.1.tar.gz
|
||||
/matplotlib-3.7.1-with-freetype-2.12.1.tar.gz
|
||||
/matplotlib-3.7.2.tar.gz
|
||||
/matplotlib-3.7.2-with-freetype-2.13.1.tar.gz
|
||||
/matplotlib-3.8.0rc1.tar.gz
|
||||
/matplotlib-3.8.0rc1-with-freetype-2.13.1.tar.gz
|
||||
/matplotlib-3.8.0.tar.gz
|
||||
/matplotlib-3.8.0-with-freetype-2.13.1.tar.gz
|
||||
/matplotlib-3.8.1.tar.gz
|
||||
/matplotlib-3.8.1-with-freetype-2.13.1.tar.gz
|
||||
/matplotlib-3.8.2.tar.gz
|
||||
/matplotlib-3.8.3.tar.gz
|
||||
/matplotlib-3.8.3-with-freetype-2.13.1.tar.gz
|
||||
/matplotlib-3.8.4.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 ce0e47a95ec43750080afa889b35ec26106a6a47 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/5] 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 353406832c..26dd9372e1 100644
|
||||
--- a/lib/matplotlib/__init__.py
|
||||
+++ b/lib/matplotlib/__init__.py
|
||||
@@ -582,7 +582,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():
|
||||
@@ -602,6 +603,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.
|
||||
"""
|
||||
@@ -620,6 +622,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.43.0
|
||||
|
||||
41
0002-Unpin-NumPy-build-requirement.patch
Normal file
41
0002-Unpin-NumPy-build-requirement.patch
Normal file
@@ -0,0 +1,41 @@
|
||||
From 05484ecf85b7f9ca67da454a4147098023626a81 Mon Sep 17 00:00:00 2001
|
||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
Date: Fri, 11 Aug 2023 02:36:06 -0400
|
||||
Subject: [PATCH 2/5] Unpin NumPy build requirement
|
||||
|
||||
This is so high simply to take advantage of the new
|
||||
backwards-compatibility guarantee in NumPy 1.25, but Fedora will never
|
||||
run against a version different from the one it was built against.
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
pyproject.toml | 13 +------------
|
||||
1 file changed, 1 insertion(+), 12 deletions(-)
|
||||
|
||||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index 44f56d8cc1..33ce124527 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -5,18 +5,7 @@ requires = [
|
||||
"pybind11>=2.6",
|
||||
"setuptools>=64",
|
||||
"setuptools_scm>=7",
|
||||
-
|
||||
- # Comments on numpy build requirement range:
|
||||
- #
|
||||
- # 1. >=2.0.x is the numpy requirement for wheel builds for distribution
|
||||
- # on PyPI - building against 2.x yields wheels that are also
|
||||
- # ABI-compatible with numpy 1.x at runtime.
|
||||
- # 2. Note that building against numpy 1.x works fine too - users and
|
||||
- # redistributors can do this by installing the numpy version they like
|
||||
- # and disabling build isolation.
|
||||
- # 3. The <2.3 upper bound is for matching the numpy deprecation policy,
|
||||
- # it should not be loosened.
|
||||
- "numpy>=2.0.0rc1,<2.3",
|
||||
+ "numpy",
|
||||
]
|
||||
|
||||
[tool.setuptools_scm]
|
||||
--
|
||||
2.43.0
|
||||
|
||||
202
0003-Set-FreeType-version-to-2.13.1-and-update-tolerances.patch
Normal file
202
0003-Set-FreeType-version-to-2.13.1-and-update-tolerances.patch
Normal file
@@ -0,0 +1,202 @@
|
||||
From 1bbba2045f0722ccd97513037d49f2f656e349df 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 3/5] Set FreeType version to 2.13.1 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_backend_pgf.py | 2 +-
|
||||
.../tests/test_constrainedlayout.py | 10 ++++-----
|
||||
lib/matplotlib/tests/test_legend.py | 4 ++--
|
||||
lib/matplotlib/tests/test_polar.py | 2 +-
|
||||
lib/matplotlib/tests/test_tightlayout.py | 10 ++++-----
|
||||
setupext.py | 21 +++++++++++++++++--
|
||||
8 files changed, 36 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
|
||||
index 26dd9372e1..81b77d455f 100644
|
||||
--- a/lib/matplotlib/__init__.py
|
||||
+++ b/lib/matplotlib/__init__.py
|
||||
@@ -1307,7 +1307,7 @@ def _val_or_rc(val, rc_name):
|
||||
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.13.1'
|
||||
|
||||
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 0372747009..9cee2dbd41 100644
|
||||
--- a/lib/matplotlib/tests/test_axes.py
|
||||
+++ b/lib/matplotlib/tests/test_axes.py
|
||||
@@ -7642,7 +7642,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],
|
||||
@@ -7660,7 +7660,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_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py
|
||||
index 8a83515f16..26bc9d6c48 100644
|
||||
--- a/lib/matplotlib/tests/test_backend_pgf.py
|
||||
+++ b/lib/matplotlib/tests/test_backend_pgf.py
|
||||
@@ -165,7 +165,7 @@ def test_pathclip():
|
||||
# test mixed mode rendering
|
||||
@needs_pgf_xelatex
|
||||
@pytest.mark.backend('pgf')
|
||||
-@image_comparison(['pgf_mixedmode.pdf'], style='default')
|
||||
+@image_comparison(['pgf_mixedmode.pdf'], style='default', tol=0.87)
|
||||
def test_mixedmode():
|
||||
mpl.rcParams.update({'font.family': 'serif', 'pgf.rcfonts': False})
|
||||
Y, X = np.ogrid[-1:1:40j, -1:1:40j]
|
||||
diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
|
||||
index 6703dfe315..ea6a8d9630 100644
|
||||
--- a/lib/matplotlib/tests/test_constrainedlayout.py
|
||||
+++ b/lib/matplotlib/tests/test_constrainedlayout.py
|
||||
@@ -432,7 +432,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():
|
||||
@@ -638,9 +638,9 @@ def test_compressed1():
|
||||
fig.draw_without_rendering()
|
||||
|
||||
pos = axs[0, 0].get_position()
|
||||
- np.testing.assert_allclose(pos.x0, 0.2344, atol=1e-3)
|
||||
+ np.testing.assert_allclose(pos.x0, 0.2344, atol=1e-2)
|
||||
pos = axs[0, 1].get_position()
|
||||
- np.testing.assert_allclose(pos.x1, 0.7024, atol=1e-3)
|
||||
+ np.testing.assert_allclose(pos.x1, 0.7024, atol=1e-2)
|
||||
|
||||
# wider than tall
|
||||
fig, axs = plt.subplots(2, 3, layout='compressed',
|
||||
@@ -653,10 +653,10 @@ def test_compressed1():
|
||||
|
||||
pos = axs[0, 0].get_position()
|
||||
np.testing.assert_allclose(pos.x0, 0.06195, atol=1e-3)
|
||||
- np.testing.assert_allclose(pos.y1, 0.8537, atol=1e-3)
|
||||
+ np.testing.assert_allclose(pos.y1, 0.8537, atol=1e-2)
|
||||
pos = axs[1, 2].get_position()
|
||||
np.testing.assert_allclose(pos.x1, 0.8618, atol=1e-3)
|
||||
- np.testing.assert_allclose(pos.y0, 0.1934, atol=1e-3)
|
||||
+ np.testing.assert_allclose(pos.y0, 0.1934, atol=1e-2)
|
||||
|
||||
|
||||
@pytest.mark.parametrize('arg, state', [
|
||||
diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
|
||||
index 759ac6aada..8140d4d69f 100644
|
||||
--- a/lib/matplotlib/tests/test_legend.py
|
||||
+++ b/lib/matplotlib/tests/test_legend.py
|
||||
@@ -516,9 +516,9 @@ def test_figure_legend_outside():
|
||||
fig.draw_without_rendering()
|
||||
|
||||
assert_allclose(axs.get_window_extent().extents,
|
||||
- axbb[nn])
|
||||
+ axbb[nn], rtol=1)
|
||||
assert_allclose(leg.get_window_extent().extents,
|
||||
- legbb[nn])
|
||||
+ legbb[nn], rtol=1)
|
||||
|
||||
|
||||
@image_comparison(['legend_stackplot.png'])
|
||||
diff --git a/lib/matplotlib/tests/test_polar.py b/lib/matplotlib/tests/test_polar.py
|
||||
index 9a1c6be6fc..7df88e96b4 100644
|
||||
--- a/lib/matplotlib/tests/test_polar.py
|
||||
+++ b/lib/matplotlib/tests/test_polar.py
|
||||
@@ -321,7 +321,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 968f0da7b5..89caa81b98 100644
|
||||
--- a/lib/matplotlib/tests/test_tightlayout.py
|
||||
+++ b/lib/matplotlib/tests/test_tightlayout.py
|
||||
@@ -173,12 +173,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 9f78d88c87..6dc740e8f7 100644
|
||||
--- a/setupext.py
|
||||
+++ b/setupext.py
|
||||
@@ -176,14 +176,30 @@ _freetype_hashes = {
|
||||
'955e17244e9b38adb0c98df66abb50467312e6bb70eac07e49ce6bd1a20e809a',
|
||||
'2.10.1':
|
||||
'3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110',
|
||||
+ '2.10.2':
|
||||
+ 'e09aa914e4f7a5d723ac381420949c55c0b90b15744adce5d1406046022186ab',
|
||||
+ '2.10.3':
|
||||
+ '9dfb4e11efd6e460a87b1991a64bc69344ee7dc219d9b29e7faabc1c168ce8b0',
|
||||
+ '2.10.4':
|
||||
+ '5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac',
|
||||
+ '2.11.0':
|
||||
+ 'a45c6b403413abd5706f3582f04c8339d26397c4304b78fa552f2215df64101f',
|
||||
'2.11.1':
|
||||
- 'f8db94d307e9c54961b39a1cc799a67d46681480696ed72ecf78d4473770f09b'
|
||||
+ 'f8db94d307e9c54961b39a1cc799a67d46681480696ed72ecf78d4473770f09b',
|
||||
+ '2.12.0':
|
||||
+ '7940a46eeb0255baaa87c553d72778c4f8daa2b8888c8e2a05766a2a8686740c',
|
||||
+ '2.12.1':
|
||||
+ 'efe71fd4b8246f1b0b1b9bfca13cfff1c9ad85930340c27df469733bbb620938',
|
||||
+ '2.13.0':
|
||||
+ 'a7aca0e532a276ea8d85bd31149f0a74c33d19c8d287116ef8f5f8357b4f1f80',
|
||||
+ '2.13.1':
|
||||
+ '0b109c59914f25b4411a8de2a506fdd18fa8457eb86eca6c7b15c19110a92fa5',
|
||||
}
|
||||
# This is the version of FreeType to use when building a local version. It
|
||||
# must match the value in lib/matplotlib.__init__.py, and the cache path in
|
||||
# `.circleci/config.yml`. Also update the docs in
|
||||
# `docs/devel/dependencies.rst`.
|
||||
-TESTING_VERSION_OF_FREETYPE = '2.6.1'
|
||||
+TESTING_VERSION_OF_FREETYPE = '2.13.1'
|
||||
if sys.platform.startswith('win') and platform.machine() == 'ARM64':
|
||||
# older versions of freetype are not supported for win/arm64
|
||||
# Matplotlib tests will not pass
|
||||
@@ -599,6 +615,7 @@ class FreeType(SetupPackage):
|
||||
name = ext.name.split('.')[-1]
|
||||
ext.extra_link_args.append(
|
||||
f'-Wl,-exported_symbol,_PyInit_{name}')
|
||||
+ ext.libraries.append('brotlidec')
|
||||
|
||||
def do_custom_build(self, env):
|
||||
# We're using a system freetype
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@@ -0,0 +1,84 @@
|
||||
From 59c900f49d605c1300c4bdaef23c94ad32a07e29 Mon Sep 17 00:00:00 2001
|
||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
Date: Mon, 22 Aug 2022 18:43:28 -0400
|
||||
Subject: [PATCH 4/5] Use old stride_windows implementation on 32-bit x86
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
lib/matplotlib/mlab.py | 39 +++++++++++++++++++++++++++++++++++----
|
||||
1 file changed, 35 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
|
||||
index 1948e6333e..158417a1c0 100644
|
||||
--- a/lib/matplotlib/mlab.py
|
||||
+++ b/lib/matplotlib/mlab.py
|
||||
@@ -49,6 +49,7 @@ Spectral functions
|
||||
|
||||
import functools
|
||||
from numbers import Number
|
||||
+import sys
|
||||
|
||||
import numpy as np
|
||||
|
||||
@@ -210,6 +211,30 @@ def detrend_linear(y):
|
||||
return y - (b*x + a)
|
||||
|
||||
|
||||
+def _stride_windows(x, n, noverlap=0):
|
||||
+ if noverlap >= n:
|
||||
+ raise ValueError('noverlap must be less than n')
|
||||
+ if n < 1:
|
||||
+ raise ValueError('n cannot be less than 1')
|
||||
+
|
||||
+ x = np.asarray(x)
|
||||
+
|
||||
+ if n == 1 and noverlap == 0:
|
||||
+ return x[np.newaxis]
|
||||
+ if n > x.size:
|
||||
+ raise ValueError('n cannot be greater than the length of x')
|
||||
+
|
||||
+ # np.lib.stride_tricks.as_strided easily leads to memory corruption for
|
||||
+ # non integer shape and strides, i.e. noverlap or n. See #3845.
|
||||
+ noverlap = int(noverlap)
|
||||
+ n = int(n)
|
||||
+
|
||||
+ step = n - noverlap
|
||||
+ shape = (n, (x.shape[-1]-noverlap)//step)
|
||||
+ strides = (x.strides[0], step*x.strides[0])
|
||||
+ return np.lib.stride_tricks.as_strided(x, shape=shape, strides=strides)
|
||||
+
|
||||
+
|
||||
def _spectral_helper(x, y=None, NFFT=None, Fs=None, detrend_func=None,
|
||||
window=None, noverlap=None, pad_to=None,
|
||||
sides=None, scale_by_freq=None, mode=None):
|
||||
@@ -304,8 +329,11 @@ def _spectral_helper(x, y=None, NFFT=None, Fs=None, detrend_func=None,
|
||||
raise ValueError(
|
||||
"The window length must match the data's first dimension")
|
||||
|
||||
- result = np.lib.stride_tricks.sliding_window_view(
|
||||
- x, NFFT, axis=0)[::NFFT - noverlap].T
|
||||
+ if sys.maxsize > 2**32: # NumPy version on 32-bit OOMs.
|
||||
+ result = np.lib.stride_tricks.sliding_window_view(
|
||||
+ x, NFFT, axis=0)[::NFFT - noverlap].T
|
||||
+ else:
|
||||
+ result = _stride_windows(x, NFFT, noverlap=noverlap)
|
||||
result = detrend(result, detrend_func, axis=0)
|
||||
result = result * window.reshape((-1, 1))
|
||||
result = np.fft.fft(result, n=pad_to, axis=0)[:numFreqs, :]
|
||||
@@ -313,8 +341,11 @@ def _spectral_helper(x, y=None, NFFT=None, Fs=None, detrend_func=None,
|
||||
|
||||
if not same_data:
|
||||
# if same_data is False, mode must be 'psd'
|
||||
- resultY = np.lib.stride_tricks.sliding_window_view(
|
||||
- y, NFFT, axis=0)[::NFFT - noverlap].T
|
||||
+ if sys.maxsize > 2**32: # NumPy version on 32-bit OOMs.
|
||||
+ resultY = np.lib.stride_tricks.sliding_window_view(
|
||||
+ y, NFFT, axis=0)[::NFFT - noverlap].T
|
||||
+ else:
|
||||
+ resultY = _stride_windows(y, NFFT, noverlap=noverlap)
|
||||
resultY = detrend(resultY, detrend_func, axis=0)
|
||||
resultY = resultY * window.reshape((-1, 1))
|
||||
resultY = np.fft.fft(resultY, n=pad_to, axis=0)[:numFreqs, :]
|
||||
--
|
||||
2.43.0
|
||||
|
||||
26
0005-TST-Increase-some-tolerances-for-non-x86-arches.patch
Normal file
26
0005-TST-Increase-some-tolerances-for-non-x86-arches.patch
Normal file
@@ -0,0 +1,26 @@
|
||||
From f6edb2b275f8fb4daa047df0b12008eac53306f0 Mon Sep 17 00:00:00 2001
|
||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
Date: Fri, 11 Aug 2023 05:13:38 -0400
|
||||
Subject: [PATCH 5/5] TST: Increase some tolerances for non-x86 arches
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
lib/mpl_toolkits/mplot3d/tests/test_axes3d.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py b/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py
|
||||
index b3fcffcc6e..f400312859 100644
|
||||
--- a/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py
|
||||
+++ b/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py
|
||||
@@ -2264,7 +2264,7 @@ def test_scatter_masked_color():
|
||||
len(super(type(path3d), path3d).get_facecolors())
|
||||
|
||||
|
||||
-@mpl3d_image_comparison(['surface3d_zsort_inf.png'], style='mpl20')
|
||||
+@mpl3d_image_comparison(['surface3d_zsort_inf.png'], style='mpl20', tol=0.055)
|
||||
def test_surface3d_zsort_inf():
|
||||
fig = plt.figure()
|
||||
ax = fig.add_subplot(projection='3d')
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@@ -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'] = [
|
||||
677
changelog
Normal file
677
changelog
Normal file
@@ -0,0 +1,677 @@
|
||||
* Fri Aug 11 2023 Tom Callaway <spot@fedoraproject.org> - 3.7.2-2
|
||||
- rebuild for new qhull
|
||||
|
||||
* Mon Aug 09 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.4.2-5
|
||||
- Update test images for FreeType 2.11.0
|
||||
- Backport patch for NumPy 1.21
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 3.4.2-3
|
||||
- Rebuilt for Python 3.10
|
||||
|
||||
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 3.4.2-2
|
||||
- Bootstrap for Python 3.10
|
||||
|
||||
* Fri Jun 04 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.4.2-2
|
||||
- Workaround failures with texlive 2021
|
||||
|
||||
* Sat May 08 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.4.2-1
|
||||
- Update to latest version (#1958461)
|
||||
|
||||
* Wed Mar 31 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.4.1-1
|
||||
- Update to latest version (#1943482)
|
||||
|
||||
* Thu Mar 11 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.4.0~rc3-1
|
||||
- Update to latest release candidate
|
||||
|
||||
* Fri Feb 19 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.4.0~rc1-1
|
||||
- Update to latest release candidate
|
||||
- Deprecated python3-matplotlib-qt4 subpackage
|
||||
|
||||
* Tue Feb 16 2021 Troy Dawson <tdawson@redhat.com> - 3.3.4-3
|
||||
- Add build deps that were only getting pulled in by other dependencies
|
||||
|
||||
* Mon Feb 01 2021 Tomas Popela <tpopela@redhat.com> - 3.3.4-2
|
||||
- Conditionalize the WX backend and disable it on RHEL 8+ as WX is not
|
||||
available there.
|
||||
|
||||
* Thu Jan 28 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.3.4-1
|
||||
- Update to latest version (#1921574)
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Dec 02 2020 Tomas Popela <tpopela@redhat.com> - 3.3.3-2
|
||||
- Don't build the Qt 4 backend in ELN/RHEL 9 as Qt 4 won't be available there
|
||||
(reuse
|
||||
https://src.fedoraproject.org/rpms/python-matplotlib/c/588e490738b06d525910f05bc1ba3f3f05ec7d50?branch=epel8)
|
||||
|
||||
* Thu Nov 12 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.3.3-1
|
||||
- Update to latest version (#1897021)
|
||||
|
||||
* Tue Sep 15 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.3.2-1
|
||||
- Update to latest version (#1878999)
|
||||
|
||||
* Thu Aug 13 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.3.1-1
|
||||
- Update to latest version
|
||||
- Fixes RHBZ#1868838
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Sat Jul 18 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.3.0-1
|
||||
- Update to latest version
|
||||
- Fixes RHBZ#1858120
|
||||
|
||||
* Tue Jun 30 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.3.0-0.2.rc1
|
||||
- Add more test dependencies
|
||||
|
||||
* Mon Jun 29 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.3.0-0.1.rc1
|
||||
- Update to latest version
|
||||
|
||||
* Sat Jun 20 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.2.2-1
|
||||
- Update to latest version
|
||||
|
||||
* Mon Jun 01 2020 Miro Hrončok <mhroncok@redhat.com> - 3.2.1-2
|
||||
- Only recommend texlive-dvipng (but require it if texlive is installed) (#1509657)
|
||||
|
||||
* Mon May 25 2020 Miro Hrončok <mhroncok@redhat.com> - 3.2.1-1.1
|
||||
- Rebuilt for Python 3.9
|
||||
|
||||
* Wed Mar 18 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.2.1-1
|
||||
- Update to latest version
|
||||
|
||||
* Tue Mar 03 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.2.0-1
|
||||
- Update to latest version
|
||||
|
||||
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.2-1.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Fri Nov 22 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.1.2-1
|
||||
- Update to latest version
|
||||
|
||||
* Fri Sep 06 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.1.1-2
|
||||
- Backport bool deprecation fix for Python 3.8
|
||||
|
||||
* Sun Aug 18 2019 Miro Hrončok <mhroncok@redhat.com> - 3.1.1-1.1
|
||||
- Rebuilt for Python 3.8
|
||||
|
||||
* Thu Aug 08 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.1.1-1
|
||||
- Update to latest version
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-2.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Wed Jul 3 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.0.3-2
|
||||
- Update Obsoletes to be later than the last python2 builds (#1726490)
|
||||
|
||||
* Sat Mar 02 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.0.3-1
|
||||
- Update to latest version
|
||||
|
||||
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-1.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Tue Nov 13 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.0.2-1
|
||||
- Update to latest version
|
||||
|
||||
* Wed Oct 31 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.0.1-1
|
||||
- Update to latest version
|
||||
|
||||
* Fri Sep 21 2018 Miro Hrončok <mhroncok@redhat.com> - 3.0.0-2
|
||||
- Obsolete old python-matplotlib-data* to prevent conflicts and provide an upgrade path
|
||||
|
||||
* Wed Sep 19 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.0.0-1
|
||||
- Update to latest version
|
||||
- Drop Python 2 subpackages
|
||||
- Stop setting a default backend (allow Matplotlib to choose automatically)
|
||||
|
||||
* Mon Aug 13 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.2.3-1
|
||||
- Update to latest version
|
||||
|
||||
* Fri Jul 20 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.2.2-4
|
||||
- Don't use unversioned Python in build (#1605766)
|
||||
- Add missing texlive-cm BR
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.2-3.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 2.2.2-3
|
||||
- Rebuilt for Python 3.7
|
||||
|
||||
* Tue Apr 17 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.2.2-2
|
||||
- Remove bytecode produced by pytest
|
||||
- Add python?-matplotlib-test-data subpackages
|
||||
|
||||
* Sat Mar 31 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.2.2-1
|
||||
- Update to latest release
|
||||
- Run tests in parallel
|
||||
|
||||
* Tue Mar 13 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.1.2-3
|
||||
- Cleanup spec file of old conditionals
|
||||
- Use more python2- dependencies
|
||||
|
||||
* Mon Feb 05 2018 Karsten Hopp <karsten@redhat.com> - 2.1.2-2
|
||||
- update and fix spec file conditionals
|
||||
|
||||
* Sun Jan 21 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.1.2-1
|
||||
- Update to latest release
|
||||
|
||||
* Sun Dec 10 2017 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.1.1-1
|
||||
- Update to latest release
|
||||
|
||||
* Mon Oct 16 2017 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.1.0-1
|
||||
- Update to latest release
|
||||
|
||||
* Thu Sep 28 2017 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.0.2-1
|
||||
- Update to latest release
|
||||
|
||||
* Thu Sep 28 2017 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.0.1-1
|
||||
- Update to latest release
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-3.2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-3.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sun Mar 12 2017 Peter Robinson <pbrobinson@fedoraproject.org> 2.0.0-3
|
||||
- Fix NVR
|
||||
|
||||
* Mon Mar 06 2017 Thomas Spura <tomspur@fedoraproject.org> - 2.0.0-2.2
|
||||
- Remove copyrighted file from tarball (gh-8034)
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Wed Jan 25 2017 Dan Horák <dan[at]danny.cz> - 2.0.0-2
|
||||
- Apply the 'aarch64' test tolerance patch on s390(x) also
|
||||
|
||||
* Fri Jan 20 2017 Orion Poplawski <orion@cora.nwra.com> - 2.0.0-1
|
||||
- Update to 2.0.0 final
|
||||
|
||||
* Tue Jan 10 2017 Adam Williamson <awilliam@redhat.com> - 2.0.0-0.7.rc2
|
||||
- Update to 2.0.0rc2
|
||||
- Fix more big-endian integer issues
|
||||
- Apply the 'aarch64' test tolerance patch on ppc64 also (it's affected by same issues)
|
||||
- Tweak the 'i686' test tolerance patch a bit (some errors are gone, some new ones)
|
||||
- Re-enable test suite for all arches
|
||||
- Note a remaining quasi-random test issue that causes build to fail sometimes
|
||||
|
||||
* Mon Jan 09 2017 Adam Williamson <awilliam@redhat.com> - 2.0.0-0.6.b4
|
||||
- Fix another integer type issue which caused more issues on ppc64
|
||||
|
||||
* Sun Jan 08 2017 Adam Williamson <awilliam@redhat.com> - 2.0.0-0.5.b4
|
||||
- Fix int type conversion error that broke text rendering on ppc64 (#1411070)
|
||||
|
||||
* Tue Dec 13 2016 Charalampos Stratakis <cstratak@redhat.com> - 2.0.0-0.4.b4
|
||||
- Rebuild for Python 3.6
|
||||
|
||||
* Mon Oct 24 2016 Dan Horák <dan[at]danny.cz> - 2.0.0-0.3.b4
|
||||
- disable tests on some alt-arches to unblock depending builds
|
||||
|
||||
* Mon Sep 26 2016 Dominik Mierzejewski <rpm@greysector.net> - 2.0.0-0.2.b4
|
||||
- add missing runtime dependencies for python2 package
|
||||
|
||||
* Sat Sep 10 2016 Dominik Mierzejewski <rpm@greysector.net> - 2.0.0-0.1.b4
|
||||
- Update to 2.0.0b4
|
||||
- Drop upstreamed or obsolete patches
|
||||
- python-cycler >= 0.10.0 is required
|
||||
- move around Requires and BRs and sort more or less alphabetically
|
||||
- don't ship baseline images for tests (like Debian)
|
||||
- Require stix fonts only when they're not bundled
|
||||
- disable HTML doc building for bootstrapping 2.0.x series
|
||||
- relax image rendering tests tolerance due to freetype version differences
|
||||
- disable some failing tests on aarch64 for now
|
||||
|
||||
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-0.2.rc2
|
||||
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
|
||||
|
||||
* 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.
|
||||
|
||||
* Wed May 18 2016 Dominik Mierzejewski <rpm@greysector.net> - 1.5.1-5
|
||||
- Unbundle python-six (#1336740).
|
||||
- Run tests (and temporarily disable failing ones).
|
||||
- Use upstream-recommended way of running tests in parallel.
|
||||
- python2-cycler and -mock are required for running tests.
|
||||
|
||||
* Sat Apr 30 2016 Ralf Corsépius <corsepiu@fedoraproject.org> - 1.5.1-4
|
||||
- Rebuild for qhull-2015.2-1.
|
||||
- Reflect qhull_a.h's location having changed.
|
||||
|
||||
* Wed Apr 6 2016 Orion Poplawski <orion@cora.nwra.com> - 1.5.1-3
|
||||
- Add requires python-cycler
|
||||
|
||||
* Tue Apr 05 2016 Jon Ciesla <limburgher@gmail.com> - 1.5.1-2
|
||||
- Drop agg-devel BR, fix sphinx build with python*cycler BR
|
||||
|
||||
* Mon Apr 04 2016 Thomas Spura <tomspur@fedoraproject.org> - 1.5.1-1
|
||||
- update to 1.5.1 (#1276806)
|
||||
- Add missing requires of dvipng to python3-matplotlib (#1270202)
|
||||
- use bundled agg (#1276806)
|
||||
- Drop cxx patch (was dropped upstream)
|
||||
- Regenerate search path patch2
|
||||
|
||||
* Mon Apr 04 2016 Thomas Spura <tomspur@fedoraproject.org> - 1.4.3-13
|
||||
- Require the qt5 subpackage from the qt4 subpackage (#1219556)
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Tue Jan 12 2016 Thomas Spura <tomspur@fedoraproject.org> - 1.4.3-11
|
||||
- Fix another requires of the main package
|
||||
|
||||
* Thu Jan 07 2016 Thomas Spura <tomspur@fedoraproject.org> - 1.4.3-10
|
||||
- Fix requiring the correct backend from the main package
|
||||
|
||||
* Thu Jan 07 2016 Thomas Spura <tomspur@fedoraproject.org> - 1.4.3-9
|
||||
- regenerate tarball to exclude lena image (#1295174)
|
||||
|
||||
* Sun Nov 15 2015 Thomas Spura <tomspur@fedoraproject.org> - 1.4.3-8
|
||||
- Pick upstream patch for fixing the gdk backend #1231748
|
||||
- Add python2 subpackages and use python_provide
|
||||
|
||||
* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.3-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
|
||||
|
||||
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.3-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 1.4.3-5
|
||||
- Rebuilt for GCC 5 C++11 ABI change
|
||||
|
||||
* Wed Feb 25 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.4.3-4
|
||||
- Split out python-matplotlib-gtk, python-matplotlib-gtk3,
|
||||
python3-matplotlib-gtk3 subpackages (#1067373)
|
||||
- Add missing requirements on gtk
|
||||
|
||||
* Tue Feb 24 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.4.3-3
|
||||
- Use %%license, add skimage to build requirements
|
||||
|
||||
* Tue Feb 17 2015 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.4.3-2
|
||||
- Disable Qt5 backend on Fedora <21 and RHEL
|
||||
|
||||
* Tue Feb 17 2015 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.4.3-1
|
||||
- New upstream release (#1134007)
|
||||
- Add Qt5 backend
|
||||
|
||||
* Tue Jan 13 2015 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.4.2-1
|
||||
- Bump to new upstream release
|
||||
- Add qhull-devel to BR
|
||||
- Add six to Requires
|
||||
|
||||
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Wed May 21 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 1.3.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86
|
||||
|
||||
* Wed May 14 2014 Bohuslav Kabrda <bkabrda@redhat.com> - 1.3.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4
|
||||
|
||||
* Tue Feb 11 2014 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.3.1-3
|
||||
- Make TkAgg the default backend
|
||||
- Remove python2 dependency from -data subpackage
|
||||
|
||||
* Mon Jan 27 2014 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.3.1-2
|
||||
- Correct environment for and enable %%check
|
||||
- Install system wide matplotlibrc under /etc
|
||||
- Do not duplicate mpl-data for python2 and python3 packages
|
||||
- Conditionally bundle data fonts (https://fedorahosted.org/fpc/ticket/381)
|
||||
|
||||
* Sat Jan 25 2014 Thomas Spura <tomspur@fedoraproject.org> - 1.3.1-1
|
||||
- update to 1.3.1
|
||||
- use GTKAgg as backend (#1030396, #982793, #1049624)
|
||||
- use fontconfig
|
||||
- add %%check for local testing (testing requires a display)
|
||||
|
||||
* Wed Aug 7 2013 Thomas Spura <tomspur@fedoraproject.org> - 1.3.0-1
|
||||
- update to new version
|
||||
- use xz to compress sources
|
||||
- drop fontconfig patch (upstream)
|
||||
- drop tk patch (upstream solved build issue differently)
|
||||
- redo use system agg patch
|
||||
- delete bundled python-pycxx headers
|
||||
- fix requires of python3-matplotlib-qt (fixes #988412)
|
||||
|
||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.0-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Mon Jun 10 2013 Jon Ciesla <limburgher@gmail.com> - 1.2.0-14
|
||||
- agg rebuild.
|
||||
|
||||
* Wed Apr 10 2013 Thomas Spura <tomspur@fedoraproject.org> - 1.2.0-13
|
||||
- use python3 version in python3-matplotlib-qt4 (#915727)
|
||||
- include __pycache__ files in correct subpackages on python3
|
||||
|
||||
* Wed Apr 3 2013 Thomas Spura <tomspur@fedoraproject.org> - 1.2.0-12
|
||||
- Decode output of subprocess to utf-8 or regex will fail (#928326)
|
||||
|
||||
* Tue Apr 2 2013 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.2.0-11
|
||||
- Make stix-fonts a requires of matplotlib (#928326)
|
||||
|
||||
* Thu Mar 28 2013 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.2.0-10
|
||||
- Use stix fonts avoid problems with missing cm fonts (#908717)
|
||||
- Correct type mismatch in python3 font_manager (#912843, #928326)
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.0-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Wed Jan 16 2013 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.2.0-8
|
||||
- Update fontconfig patch to apply issue found by upstream
|
||||
- Update fontconfig patch to apply issue with missing afm fonts (#896182)
|
||||
|
||||
* Wed Jan 16 2013 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.2.0-7
|
||||
- Use fontconfig by default (#885307)
|
||||
|
||||
* Thu Jan 3 2013 David Malcolm <dmalcolm@redhat.com> - 1.2.0-6
|
||||
- remove wx support for rhel >= 7
|
||||
|
||||
* Tue Dec 04 2012 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.2.0-5
|
||||
- Reinstantiate wx backend for python2.x.
|
||||
- Run setup.py under xvfb-run to detect and default to gtk backend (#883502)
|
||||
- Split qt4 backend subpackage and add proper requires for it.
|
||||
- Correct wrong regex in tcl libdir patch.
|
||||
|
||||
* Tue Nov 27 2012 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.2.0-4
|
||||
- Obsolete python-matplotlib-wx for clean updates.
|
||||
|
||||
* Tue Nov 27 2012 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.2.0-3
|
||||
- Enable python 3 in fc18 as build requires are now available (#879731)
|
||||
|
||||
* Thu Nov 22 2012 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.2.0-2
|
||||
- Build python3 only on f19 or newer (#837156)
|
||||
- Build requires python3-six if building python3 support (#837156)
|
||||
|
||||
* Thu Nov 22 2012 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.2.0-1
|
||||
- Update to version 1.2.0
|
||||
- Revert to regenerate tarball with generate-tarball.sh (#837156)
|
||||
- Assume update to 1.2.0 is for recent releases
|
||||
- Remove %%defattr
|
||||
- Remove %%clean
|
||||
- Use simpler approach to build html documentation
|
||||
- Do not use custom/outdated setup.cfg
|
||||
- Put one BuildRequires per line
|
||||
- Enable python3 support
|
||||
- Cleanup spec as wx backend is no longer supported
|
||||
- Use default agg backend
|
||||
- Fix bogus dates in changelog by assuming only week day was wrong
|
||||
|
||||
* Fri Aug 17 2012 Jerry James <loganjerry@gmail.com> - 1.1.1-1
|
||||
- Update to version 1.1.1.
|
||||
- Remove obsolete spec file elements
|
||||
- Fix sourceforge URLs
|
||||
- Allow sample data to have a different version number than the sources
|
||||
- Don't bother removing problematic file since we remove entire agg24 directory
|
||||
- Fix building with pygtk in the absence of an X server
|
||||
- Don't install license text for bundled software that we don't bundle
|
||||
|
||||
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Tue Jul 3 2012 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.1.0-1
|
||||
- Update to version 1.1.0.
|
||||
- Do not regenerate upstream tarball but remove problematic file in %%prep.
|
||||
- Remove non longer applicable/required patch0.
|
||||
- Rediff/rename -noagg patch.
|
||||
- Remove propagate-timezone-info-in-plot_date-xaxis_da patch already applied.
|
||||
- Remove tkinter patch now with critical code in a try block.
|
||||
- Remove png 1.5 patch as upstream is now png 1.5 aware.
|
||||
- Update file list.
|
||||
|
||||
* Wed Apr 18 2012 David Malcolm <dmalcolm@redhat.com> - 1.0.1-20
|
||||
- remove wx support for rhel >= 7
|
||||
|
||||
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-19
|
||||
- Rebuilt for c++ ABI breakage
|
||||
|
||||
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Tue Dec 6 2011 David Malcolm <dmalcolm@redhat.com> - 1.0.1-17
|
||||
- fix the build against libpng 1.5
|
||||
|
||||
* Tue Dec 6 2011 David Malcolm <dmalcolm@redhat.com> - 1.0.1-16
|
||||
- fix egg-info conditional for RHEL
|
||||
|
||||
* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 1.0.1-15
|
||||
- Rebuild for new libpng
|
||||
|
||||
* Mon Oct 31 2011 Dan Horák <dan[at]danny.cz> - 1.0.1-14
|
||||
- fix build with new Tkinter which doesn't return an expected value in __version__
|
||||
|
||||
* Thu Sep 15 2011 Jef Spaleta <jspaleta@fedoraproject.org> - 1.0.1-13
|
||||
- apply upstream bugfix for timezone formatting (Bug 735677)
|
||||
|
||||
* Fri May 20 2011 Orion Poplawski <orion@cora.nwra.com> - 1.0.1-12
|
||||
- Add Requires dvipng (Bug 684836)
|
||||
- Build against system agg (Bug 612807)
|
||||
- Use system pyparsing (Bug 702160)
|
||||
|
||||
* Sat Feb 26 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-11
|
||||
- Set PYTHONPATH during html doc building using find to prevent broken builds
|
||||
|
||||
* Sat Feb 26 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-10
|
||||
- Spec file cleanups for readability
|
||||
|
||||
* Sat Feb 26 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-9
|
||||
- Bump and rebuild
|
||||
|
||||
* Sat Feb 26 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-8
|
||||
- Fix spec file typos so package builds
|
||||
|
||||
* Fri Feb 25 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-7
|
||||
- Remove a debugging echo statement from the spec file
|
||||
- Fix some line endings and permissions in -doc sub-package
|
||||
|
||||
* Fri Feb 25 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-6
|
||||
- Spec file cleanups to silence some rpmlint warnings
|
||||
|
||||
* Mon Feb 21 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-5
|
||||
- Add default attr to doc sub-package file list
|
||||
- No longer designate -doc subpackage as noarch
|
||||
- Add arch specific Requires for tk, wx and doc sub-packages
|
||||
|
||||
* Mon Feb 21 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-4
|
||||
- Enable wxPython backend
|
||||
- Make -doc sub-package noarch
|
||||
|
||||
* Mon Feb 21 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-3
|
||||
- Add conditional for optionally building doc sub-package
|
||||
- Add flag to build low res images for documentation
|
||||
- Add matplotlib-1.0.1-plot_directive.patch to fix build of low res images
|
||||
- Remove unused patches
|
||||
|
||||
* Sat Feb 19 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-2
|
||||
- Build and package HTML documentation in -doc sub-package
|
||||
- Move examples to -doc sub-package
|
||||
- Make examples non-executable
|
||||
|
||||
* Fri Feb 18 2011 Thomas Spura <tomspur@fedoraproject.org> - 1.0.1-1
|
||||
- update to new bugfix version (#678489)
|
||||
- set file attributes in tk subpackage
|
||||
- filter private *.so
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 1.0.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
|
||||
|
||||
* Thu Jul 8 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 1.0.0-1
|
||||
- New upstream release
|
||||
- Remove undistributable file from bundled agg library
|
||||
|
||||
* Thu Jul 1 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.3-1
|
||||
- New upstream release
|
||||
|
||||
* Thu May 27 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.1.2-4
|
||||
- Upstream patch to fix deprecated gtk tooltip warning.
|
||||
|
||||
* Mon Apr 12 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.1.2-2
|
||||
- Bump to rebuild against numpy 1.3
|
||||
|
||||
* Thu Apr 1 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.1.2-1
|
||||
- Bump to rebuild against numpy 1.4.0
|
||||
|
||||
* Fri Dec 11 2009 Jon Ciesla <limb@jcomserv.net> - 0.99.1.2
|
||||
- Update to 0.99.1.2
|
||||
|
||||
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.98.5.2-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Fri Mar 06 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.98.5-4
|
||||
- Fixed font dep after font guideline change
|
||||
|
||||
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.98.5.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Tue Dec 23 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.98.5-2
|
||||
- Add dep on DejaVu Sans font for default font support
|
||||
|
||||
* Mon Dec 22 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.98.5-1
|
||||
- Latest upstream release
|
||||
- Strip out included fonts
|
||||
|
||||
* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.98.3-2
|
||||
- Rebuild for Python 2.6
|
||||
|
||||
* Wed Aug 6 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.98.3-1
|
||||
- Latest upstream release
|
||||
|
||||
* Tue Jul 1 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.98.1-1
|
||||
- Latest upstream release
|
||||
|
||||
* Fri Mar 21 2008 Jef Spaleta <jspaleta[AT]fedoraproject org> - 0.91.2-2
|
||||
- gcc43 cleanups
|
||||
|
||||
* Fri Mar 21 2008 Jef Spaleta <jspaleta[AT]fedoraproject org> - 0.91.2-1
|
||||
- New upstream version
|
||||
- Adding Fedora specific setup.cfg from included template
|
||||
- removed numarry and numerics build requirements
|
||||
|
||||
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.90.1-6
|
||||
- Autorebuild for GCC 4.3
|
||||
|
||||
* Fri Jan 4 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.90.1-5
|
||||
- Fixed typo in spec.
|
||||
|
||||
* Fri Jan 4 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.90.1-4
|
||||
- Support for Python Eggs for F9+
|
||||
|
||||
* Thu Jan 3 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.90.1-3
|
||||
- Rebuild for new Tcl 8.5
|
||||
|
||||
* Thu Aug 23 2007 Orion Poplawski <orion@cora.nwra.com> 0.90.1-2
|
||||
- Update license tag to Python
|
||||
- Rebuild for BuildID
|
||||
|
||||
* Mon Jun 04 2007 Orion Poplawski <orion@cora.nwra.com> 0.90.1-1
|
||||
- Update to 0.90.1
|
||||
|
||||
* Wed Feb 14 2007 Orion Poplawski <orion@cora.nwra.com> 0.90.0-2
|
||||
- Rebuild for Tcl/Tk downgrade
|
||||
|
||||
* Sat Feb 10 2007 Jef Spaleta <jspaleta@gmail.com> 0.90.0-2
|
||||
- Release bump for rebuild against new tk
|
||||
|
||||
* Fri Feb 09 2007 Orion Poplawski <orion@cora.nwra.com> 0.90.0-1
|
||||
- Update to 0.90.0
|
||||
|
||||
* Fri Jan 5 2007 Orion Poplawski <orion@cora.nwra.com> 0.87.7-4
|
||||
- Add examples to %%docs
|
||||
|
||||
* Mon Dec 11 2006 Jef Spaleta <jspaleta@gmail.com> 0.87.7-3
|
||||
- Release bump for rebuild against python 2.5 in devel tree
|
||||
|
||||
* Tue Dec 5 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.7-2
|
||||
- Force build of gtk/gtkagg backends in mock (bug #218153)
|
||||
- Change Requires from python-numeric to numpy (bug #218154)
|
||||
|
||||
* Tue Nov 21 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.7-1
|
||||
- Update to 0.87.7 and fix up the defaults to use numpy
|
||||
- Force build of tkagg backend without X server
|
||||
- Use src.rpm from Jef Spaleta, closes bug 216578
|
||||
|
||||
* Fri Oct 6 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.6-1
|
||||
- Update to 0.87.6
|
||||
|
||||
* Thu Sep 7 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.5-1
|
||||
- Update to 0.87.5
|
||||
|
||||
* Thu Jul 27 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.4-1
|
||||
- Update to 0.87.4
|
||||
|
||||
* Wed Jun 7 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.3-1
|
||||
- Update to 0.87.3
|
||||
|
||||
* Mon May 15 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.2-2
|
||||
- Rebuild for new numpy
|
||||
|
||||
* Tue Mar 7 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.2-1
|
||||
- Update to 0.87.2
|
||||
|
||||
* Tue Mar 7 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.1-1
|
||||
- Update to 0.87.1
|
||||
- Add pycairo >= 1.0.2 requires (FC5+ only)
|
||||
|
||||
* Fri Feb 24 2006 Orion Poplawski <orion@cora.nwra.com> 0.87-1
|
||||
- Update to 0.87
|
||||
- Add BR numpy and python-numarray
|
||||
- Add patch to keep Numeric as the default numerix package
|
||||
- Add BR tkinter and tk-devel for TkInter backend
|
||||
- Make separate package for Tk backend
|
||||
|
||||
* Tue Jan 10 2006 Orion Poplawski <orion@cora.nwra.com> 0.86-1
|
||||
- Update to 0.86
|
||||
|
||||
* Thu Dec 22 2005 Orion Poplawski <orion@cora.nwra.com> 0.85-2
|
||||
- Rebuild
|
||||
|
||||
* Sun Nov 20 2005 Orion Poplawski <orion@cora.nwra.com> 0.85-1
|
||||
- New upstream version 0.85
|
||||
|
||||
* Mon Sep 19 2005 Orion Poplawski <orion@cora.nwra.com> 0.84-1
|
||||
- New upstream version 0.84
|
||||
|
||||
* Tue Aug 02 2005 Orion Poplawski <orion@cora.nwra.com> 0.83.2-3
|
||||
- bump release
|
||||
|
||||
* Tue Aug 02 2005 Orion Poplawski <orion@cora.nwra.com> 0.83.2-2
|
||||
- Add Requires: python-numeric, pytz, python-dateutil
|
||||
|
||||
* Fri Jul 29 2005 Orion Poplawski <orion@cora.nwra.com> 0.83.2-1
|
||||
- New upstream version matplotlib 0.83.2
|
||||
|
||||
* Thu Jul 28 2005 Orion Poplawski <orion@cora.nwra.com> 0.83.1-2
|
||||
- Bump rel to fix botched tag
|
||||
|
||||
* Thu Jul 28 2005 Orion Poplawski <orion@cora.nwra.com> 0.83.1-1
|
||||
- New upstream version matplotlib 0.83.1
|
||||
|
||||
* Tue Jul 05 2005 Orion Poplawski <orion@cora.nwra.com> 0.82-4
|
||||
- BuildRequires: pytz, python-dateutil - use upstream
|
||||
- Don't use INSTALLED_FILES, list dirs
|
||||
- Fix execute permissions
|
||||
|
||||
* Fri Jul 01 2005 Orion Poplawski <orion@cora.nwra.com> 0.82-3
|
||||
- Use %%{python_sitearch}
|
||||
|
||||
* Thu Jun 30 2005 Orion Poplawski <orion@cora.nwra.com> 0.82-2
|
||||
- Rename to python-matplotlib
|
||||
- Remove unneeded Requires: python
|
||||
- Add private directories to %%files
|
||||
|
||||
* Tue Jun 28 2005 Orion Poplawski <orion@cora.nwra.com> 0.82-1
|
||||
- Initial package for Fedora Extras
|
||||
8
mplsetup.cfg
Normal file
8
mplsetup.cfg
Normal file
@@ -0,0 +1,8 @@
|
||||
[libs]
|
||||
system_freetype = True
|
||||
system_qhull = True
|
||||
|
||||
[packages]
|
||||
tests = True
|
||||
toolkits = True
|
||||
toolkits_tests = True
|
||||
@@ -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
3
sources
3
sources
@@ -1 +1,2 @@
|
||||
495f6bdf126b40f63c316c9404349e40 matplotlib-1.5.2rc2.tar.gz
|
||||
SHA512 (matplotlib-3.8.4.tar.gz) = d4c6a5b3484927dbae1b1203e9984b67d08c958c4a5136abaa805f1eb221146fb1211e5f20456e281d41fc09c94917a796ffacfdb185c58eeeb6d19e60c78b1a
|
||||
SHA512 (matplotlib-3.8.3-with-freetype-2.13.1.tar.gz) = 72b207fac6539cf9e64706cbd61be4bf2349be8d5f66083db1f014cdbdf049c48f2ce17a67ac0e646f668818cff6ffa9053fc31f2c2f4bc3f8e9f70272146d8f
|
||||
|
||||
Reference in New Issue
Block a user