Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
9f31e58569 | ||
|
|
109cf25bcd |
121
.gitignore
vendored
121
.gitignore
vendored
@@ -2,124 +2,3 @@ matplotlib-1.0.0-without-gpc.tar.gz
|
||||
/matplotlib-1.0.1-without-gpc.tar.gz
|
||||
/mpl_sampledata-1.0.1.tar.gz
|
||||
/matplotlib-1.2.0-without-gpc.tar.gz
|
||||
/matplotlib-1.3.0-without-gpc.tar.xz
|
||||
/matplotlib-1.3.1-without-gpc.tar.xz
|
||||
/matplotlib-1.4.3-without-gpc.tar.xz
|
||||
/matplotlib-1.4.3-without-extern.tar.xz
|
||||
/matplotlib-1.5.1-without-extern.tar.xz
|
||||
/matplotlib-1.5.1.tar.gz
|
||||
/matplotlib-1.5.2rc2.tar.gz
|
||||
/matplotlib-2.0.0b4.tar.gz
|
||||
/matplotlib-2.0.0rc2.tar.gz
|
||||
/matplotlib-2.0.0.tar.gz
|
||||
/matplotlib-2.0.0-without-copyrighted.tar.xz
|
||||
/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
|
||||
/matplotlib-3.9.0.tar.gz
|
||||
/matplotlib-3.9.0-with-freetype-2.13.1.tar.gz
|
||||
/matplotlib-3.9.1.tar.gz
|
||||
/matplotlib-3.9.1-with-freetype-2.13.1.tar.gz
|
||||
/matplotlib-3.9.3.tar.gz
|
||||
/matplotlib-3.9.3-with-freetype-2.13.1.tar.gz
|
||||
/matplotlib-3.9.4.tar.gz
|
||||
/matplotlib-3.10.0.tar.gz
|
||||
/matplotlib-3.10.0-with-freetype-2.13.1.tar.gz
|
||||
/matplotlib-3.10.3.tar.gz
|
||||
/matplotlib-3.10.3-with-freetype-2.13.1.tar.gz
|
||||
/matplotlib-3.10.5.tar.gz
|
||||
/matplotlib-3.10.6.tar.gz
|
||||
/matplotlib-3.10.8.tar.gz
|
||||
/matplotlib-3.10.8-with-freetype-2.14.1.tar.gz
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
From 50c46d80a99b6bdbb61733b0eef69649f22701ab Mon Sep 17 00:00:00 2001
|
||||
From: Sandro Tosi <morph@debian.org>
|
||||
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 | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
|
||||
index 2786f9b7b9..79cccf0892 100644
|
||||
--- a/lib/matplotlib/__init__.py
|
||||
+++ b/lib/matplotlib/__init__.py
|
||||
@@ -613,6 +613,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.
|
||||
"""
|
||||
@@ -631,6 +632,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.52.0
|
||||
|
||||
@@ -1,127 +0,0 @@
|
||||
From 4550b06f9de6c23d7b87a34d2bca1c9aaa594a3e 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/5] Set FreeType version to 2.14.1 and update tolerances
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
extern/meson.build | 2 +-
|
||||
lib/matplotlib/__init__.py | 2 +-
|
||||
lib/matplotlib/tests/test_axes.py | 4 ++--
|
||||
lib/matplotlib/tests/test_backend_pgf.py | 2 +-
|
||||
lib/matplotlib/tests/test_ft2font.py | 6 +++---
|
||||
lib/matplotlib/tests/test_legend.py | 4 ++--
|
||||
lib/matplotlib/tests/test_polar.py | 2 +-
|
||||
7 files changed, 11 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/extern/meson.build b/extern/meson.build
|
||||
index 5463183a90..928eb6bd56 100644
|
||||
--- a/extern/meson.build
|
||||
+++ b/extern/meson.build
|
||||
@@ -13,7 +13,7 @@ else
|
||||
# must match the value in `lib/matplotlib.__init__.py`. Also update the docs
|
||||
# in `docs/devel/dependencies.rst`. Bump the cache key in
|
||||
# `.circleci/config.yml` when changing requirements.
|
||||
- LOCAL_FREETYPE_VERSION = '2.6.1'
|
||||
+ LOCAL_FREETYPE_VERSION = '2.14.1'
|
||||
|
||||
freetype_proj = subproject(
|
||||
f'freetype-@LOCAL_FREETYPE_VERSION@',
|
||||
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
|
||||
index 79cccf0892..04d716b54c 100644
|
||||
--- a/lib/matplotlib/__init__.py
|
||||
+++ b/lib/matplotlib/__init__.py
|
||||
@@ -1363,7 +1363,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 `meson.build`.
|
||||
- LOCAL_FREETYPE_VERSION = '2.6.1'
|
||||
+ LOCAL_FREETYPE_VERSION = '2.14.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 159fc70282..b304186fc9 100644
|
||||
--- a/lib/matplotlib/tests/test_axes.py
|
||||
+++ b/lib/matplotlib/tests/test_axes.py
|
||||
@@ -8084,7 +8084,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],
|
||||
@@ -8102,7 +8102,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 e218a81cdc..839ad724e1 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_ft2font.py b/lib/matplotlib/tests/test_ft2font.py
|
||||
index 6ba23bab34..0aee3222f1 100644
|
||||
--- a/lib/matplotlib/tests/test_ft2font.py
|
||||
+++ b/lib/matplotlib/tests/test_ft2font.py
|
||||
@@ -706,10 +706,10 @@ def test_ft2font_get_sfnt_table(font_name, header):
|
||||
|
||||
@pytest.mark.parametrize('left, right, unscaled, unfitted, default', [
|
||||
# These are all the same class.
|
||||
- ('A', 'A', 57, 248, 256), ('A', 'À', 57, 248, 256), ('A', 'Á', 57, 248, 256),
|
||||
- ('A', 'Â', 57, 248, 256), ('A', 'Ã', 57, 248, 256), ('A', 'Ä', 57, 248, 256),
|
||||
+ ('A', 'A', 57, 247, 256), ('A', 'À', 57, 247, 256), ('A', 'Á', 57, 247, 256),
|
||||
+ ('A', 'Â', 57, 247, 256), ('A', 'Ã', 57, 247, 256), ('A', 'Ä', 57, 247, 256),
|
||||
# And a few other random ones.
|
||||
- ('D', 'A', -36, -156, -128), ('T', '.', -243, -1056, -1024),
|
||||
+ ('D', 'A', -36, -156, -128), ('T', '.', -243, -1055, -1024),
|
||||
('X', 'C', -149, -647, -640), ('-', 'J', 114, 495, 512),
|
||||
])
|
||||
def test_ft2font_get_kerning(left, right, unscaled, unfitted, default):
|
||||
diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
|
||||
index eb3bfca7c2..c01be3aec0 100644
|
||||
--- a/lib/matplotlib/tests/test_legend.py
|
||||
+++ b/lib/matplotlib/tests/test_legend.py
|
||||
@@ -520,9 +520,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 844ab8cf3a..826a8a0c3a 100644
|
||||
--- a/lib/matplotlib/tests/test_polar.py
|
||||
+++ b/lib/matplotlib/tests/test_polar.py
|
||||
@@ -328,7 +328,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"])
|
||||
--
|
||||
2.52.0
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
From ff0a79b707eb6603c0cb0bd3778c3c88fbacfac8 Mon Sep 17 00:00:00 2001
|
||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
Date: Fri, 13 Dec 2024 02:03:33 -0500
|
||||
Subject: [PATCH 3/5] Unpin meson-python build requirement
|
||||
|
||||
This is pinned to fix sdists, but we already have one and are building a
|
||||
wheel, which should be fine.
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
pyproject.toml | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index 23c441b52c..f762c85d98 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -48,7 +48,7 @@ requires-python = ">=3.10"
|
||||
[project.optional-dependencies]
|
||||
# Should be a copy of the build dependencies below.
|
||||
dev = [
|
||||
- "meson-python>=0.13.1,<0.17.0",
|
||||
+ "meson-python>=0.13.1",
|
||||
"pybind11>=2.13.2,!=2.13.3",
|
||||
"setuptools_scm>=7",
|
||||
# Not required by us but setuptools_scm without a version, cso _if_
|
||||
@@ -72,7 +72,7 @@ dev = [
|
||||
build-backend = "mesonpy"
|
||||
# Also keep in sync with optional dependencies above.
|
||||
requires = [
|
||||
- "meson-python>=0.13.1,<0.17.0",
|
||||
+ "meson-python>=0.13.1",
|
||||
"pybind11>=2.13.2,!=2.13.3",
|
||||
"setuptools_scm>=7",
|
||||
]
|
||||
--
|
||||
2.52.0
|
||||
|
||||
@@ -1,84 +0,0 @@
|
||||
From abf5f01b8fa262c71f7ccdf189c608f189028a44 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 8326ac186e..bdaa34b734 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.52.0
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
From 7a5bbfe3bd5905a7daefac690ebdfd7403c8ef7a Mon Sep 17 00:00:00 2001
|
||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
Date: Tue, 12 Nov 2024 01:05:25 -0500
|
||||
Subject: [PATCH 5/5] Partially revert "TST: Fix minor issues in interactive
|
||||
backend test (#28838)"
|
||||
|
||||
This reverts commit 7c7f94c5f71e99f148255e3bb570fec25c8fe754.
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
lib/matplotlib/tests/test_backends_interactive.py | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/matplotlib/tests/test_backends_interactive.py b/lib/matplotlib/tests/test_backends_interactive.py
|
||||
index 4e3c1bbc2b..903ae87cbb 100644
|
||||
--- a/lib/matplotlib/tests/test_backends_interactive.py
|
||||
+++ b/lib/matplotlib/tests/test_backends_interactive.py
|
||||
@@ -232,7 +232,10 @@ def _test_interactive_impl():
|
||||
result_after = io.BytesIO()
|
||||
fig.savefig(result_after, format='png')
|
||||
|
||||
- assert result.getvalue() == result_after.getvalue()
|
||||
+ if 'qt' not in backend and 'wx' not in backend:
|
||||
+ # FIXME: This should be enabled everywhere once Qt5 is fixed on macOS
|
||||
+ # to not resize incorrectly.
|
||||
+ assert result.getvalue() == result_after.getvalue()
|
||||
|
||||
|
||||
@pytest.mark.parametrize("env", _get_testable_interactive_backends())
|
||||
--
|
||||
2.52.0
|
||||
|
||||
677
changelog
677
changelog
@@ -1,677 +0,0 @@
|
||||
* 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
|
||||
19
generate-tarball.sh
Executable file
19
generate-tarball.sh
Executable file
@@ -0,0 +1,19 @@
|
||||
#! /bin/sh
|
||||
|
||||
version=$1
|
||||
|
||||
[ -z $version ] && exit 1
|
||||
|
||||
dir=matplotlib-${version}
|
||||
file=matplotlib-${version}.tar.gz
|
||||
result=matplotlib-${version}-without-gpc.tar.gz
|
||||
|
||||
wget -vc http://downloads.sourceforge.net/matplotlib/$file
|
||||
|
||||
rm -rf matplotlib-${version}
|
||||
tar xzf $file
|
||||
|
||||
rm matplotlib-${version}/agg24/include/agg_conv_gpc.h
|
||||
|
||||
rm -f $result
|
||||
tar czf $result $dir
|
||||
64
python-matplotlib-fontconfig.patch
Normal file
64
python-matplotlib-fontconfig.patch
Normal file
@@ -0,0 +1,64 @@
|
||||
diff -ur matplotlib-1.2.0.orig/lib/matplotlib/font_manager.py matplotlib-1.2.0/lib/matplotlib/font_manager.py
|
||||
--- matplotlib-1.2.0.orig/lib/matplotlib/font_manager.py 2012-10-31 01:11:14.000000000 +0100
|
||||
+++ matplotlib-1.2.0/lib/matplotlib/font_manager.py 2013-04-03 01:50:34.433802284 +0200
|
||||
@@ -62,7 +62,7 @@
|
||||
except ImportError:
|
||||
import pickle
|
||||
|
||||
-USE_FONTCONFIG = False
|
||||
+USE_FONTCONFIG = True
|
||||
|
||||
verbose = matplotlib.verbose
|
||||
|
||||
@@ -771,7 +771,7 @@
|
||||
return float(self._size)
|
||||
except ValueError:
|
||||
pass
|
||||
- default_size = fontManager.get_default_size()
|
||||
+ default_size = FontManager.get_default_size()
|
||||
return default_size * font_scalings.get(self._size)
|
||||
|
||||
def get_file(self):
|
||||
@@ -991,7 +991,10 @@
|
||||
self.afmfiles = findSystemFonts(paths, fontext='afm') + \
|
||||
findSystemFonts(fontext='afm')
|
||||
self.afmlist = createFontList(self.afmfiles, fontext='afm')
|
||||
- self.defaultFont['afm'] = self.afmfiles[0]
|
||||
+ try:
|
||||
+ self.defaultFont['afm'] = self.afmfiles[0]
|
||||
+ except IndexError:
|
||||
+ self.defaultFont['afm'] = None
|
||||
|
||||
self.ttf_lookup_cache = {}
|
||||
self.afm_lookup_cache = {}
|
||||
@@ -1002,7 +1005,8 @@
|
||||
"""
|
||||
return self.__default_weight
|
||||
|
||||
- def get_default_size(self):
|
||||
+ @staticmethod
|
||||
+ def get_default_size():
|
||||
"""
|
||||
Return the default font size.
|
||||
"""
|
||||
@@ -1276,7 +1280,7 @@
|
||||
except OSError:
|
||||
return None
|
||||
if pipe.returncode == 0:
|
||||
- for match in _fc_match_regex.finditer(output):
|
||||
+ for match in _fc_match_regex.finditer(output.decode("utf-8")):
|
||||
file = match.group(1)
|
||||
if os.path.splitext(file)[1][1:] in fontexts:
|
||||
return file
|
||||
diff -ur matplotlib-1.2.0.orig/lib/matplotlib/mpl-data/matplotlibrc matplotlib-1.2.0/lib/matplotlib/mpl-data/matplotlibrc
|
||||
--- matplotlib-1.2.0.orig/lib/matplotlib/mpl-data/matplotlibrc 2012-11-08 17:39:20.000000000 +0100
|
||||
+++ matplotlib-1.2.0/lib/matplotlib/mpl-data/matplotlibrc 2013-04-03 01:50:03.693755542 +0200
|
||||
@@ -198,7 +198,7 @@
|
||||
#mathtext.it : serif:italic
|
||||
#mathtext.bf : serif:bold
|
||||
#mathtext.sf : sans
|
||||
-#mathtext.fontset : cm # Should be 'cm' (Computer Modern), 'stix',
|
||||
+mathtext.fontset : stix # Should be 'cm' (Computer Modern), 'stix',
|
||||
# 'stixsans' or 'custom'
|
||||
#mathtext.fallback_to_cm : True # When True, use symbols from the Computer Modern
|
||||
# fonts when a symbol can not be found in one of
|
||||
73
python-matplotlib-noagg.patch
Normal file
73
python-matplotlib-noagg.patch
Normal file
@@ -0,0 +1,73 @@
|
||||
diff -up matplotlib-1.2.0/setupext.py.orig matplotlib-1.2.0/setupext.py
|
||||
--- matplotlib-1.2.0/setupext.py.orig 2012-11-23 14:49:21.295712608 -0200
|
||||
+++ matplotlib-1.2.0/setupext.py 2012-11-23 14:49:31.508712999 -0200
|
||||
@@ -96,7 +96,6 @@ BUILT_GDK = False
|
||||
BUILT_PATH = False
|
||||
BUILT_TRI = False
|
||||
|
||||
-AGG_VERSION = 'agg24'
|
||||
TCL_TK_CACHE = None
|
||||
|
||||
# for nonstandard installation/build with --prefix variable
|
||||
@@ -621,7 +620,8 @@ def add_agg_flags(module):
|
||||
# before adding the freetype flags since -z comes later
|
||||
add_base_flags(module)
|
||||
add_numpy_flags(module)
|
||||
- module.include_dirs.extend(['src', '%s/include'%AGG_VERSION, '.'])
|
||||
+ module.include_dirs.extend(['src', '/usr/include/agg2', '.'])
|
||||
+ module.libraries.append('agg')
|
||||
|
||||
# put these later for correct link order
|
||||
module.libraries.extend(std_libs)
|
||||
@@ -1220,17 +1220,7 @@ def build_agg(ext_modules, packages):
|
||||
global BUILT_AGG
|
||||
if BUILT_AGG: return # only build it if you you haven't already
|
||||
|
||||
- agg = (
|
||||
- 'agg_trans_affine.cpp',
|
||||
- 'agg_bezier_arc.cpp',
|
||||
- 'agg_curves.cpp',
|
||||
- 'agg_vcgen_dash.cpp',
|
||||
- 'agg_vcgen_stroke.cpp',
|
||||
- 'agg_image_filters.cpp',
|
||||
- )
|
||||
-
|
||||
- deps = ['%s/src/%s'%(AGG_VERSION, name) for name in agg]
|
||||
- deps.extend(['src/mplutils.cpp', 'src/agg_py_transforms.cpp'])
|
||||
+ deps = ['src/mplutils.cpp', 'src/agg_py_transforms.cpp']
|
||||
deps.extend(glob.glob('CXX/*.cxx'))
|
||||
deps.extend(glob.glob('CXX/*.c'))
|
||||
temp_copy('src/_backend_agg.cpp', 'src/backend_agg.cpp')
|
||||
@@ -1253,16 +1243,7 @@ def build_path(ext_modules, packages):
|
||||
global BUILT_PATH
|
||||
if BUILT_PATH: return # only build it if you you haven't already
|
||||
|
||||
- agg = (
|
||||
- 'agg_vcgen_contour.cpp',
|
||||
- 'agg_curves.cpp',
|
||||
- 'agg_bezier_arc.cpp',
|
||||
- 'agg_trans_affine.cpp',
|
||||
- 'agg_vcgen_stroke.cpp',
|
||||
- )
|
||||
-
|
||||
- deps = ['%s/src/%s'%(AGG_VERSION, name) for name in agg]
|
||||
- deps.extend(glob.glob('CXX/*.cxx'))
|
||||
+ deps = glob.glob('CXX/*.cxx')
|
||||
deps.extend(glob.glob('CXX/*.c'))
|
||||
|
||||
temp_copy('src/_path.cpp', 'src/path.cpp')
|
||||
@@ -1287,14 +1268,8 @@ def build_image(ext_modules, packages):
|
||||
global BUILT_IMAGE
|
||||
if BUILT_IMAGE: return # only build it if you you haven't already
|
||||
|
||||
- agg = ('agg_trans_affine.cpp',
|
||||
- 'agg_image_filters.cpp',
|
||||
- 'agg_bezier_arc.cpp',
|
||||
- )
|
||||
-
|
||||
temp_copy('src/_image.cpp', 'src/image.cpp')
|
||||
deps = ['src/image.cpp', 'src/mplutils.cpp']
|
||||
- deps.extend(['%s/src/%s'%(AGG_VERSION,name) for name in agg])
|
||||
deps.extend(glob.glob('CXX/*.cxx'))
|
||||
deps.extend(glob.glob('CXX/*.c'))
|
||||
|
||||
35
python-matplotlib-tk.patch
Normal file
35
python-matplotlib-tk.patch
Normal file
@@ -0,0 +1,35 @@
|
||||
diff -up matplotlib-1.2.0/setupext.py.orig matplotlib-1.2.0/setupext.py
|
||||
--- matplotlib-1.2.0/setupext.py.orig 2012-11-23 14:50:48.954715965 -0200
|
||||
+++ matplotlib-1.2.0/setupext.py 2012-11-23 14:55:53.731727636 -0200
|
||||
@@ -898,12 +898,12 @@ def parse_tcl_config(tcl_lib_dir, tk_lib
|
||||
|
||||
tcl_poss = [tcl_lib_dir,
|
||||
os.path.normpath(os.path.join(tcl_lib_dir, '..')),
|
||||
- "/usr/lib/tcl"+str(Tkinter.TclVersion),
|
||||
- "/usr/lib"]
|
||||
+ "@@libdir@@/tcl"+str(Tkinter.TclVersion),
|
||||
+ "@@libdir@@"]
|
||||
tk_poss = [tk_lib_dir,
|
||||
os.path.normpath(os.path.join(tk_lib_dir, '..')),
|
||||
- "/usr/lib/tk"+str(Tkinter.TkVersion),
|
||||
- "/usr/lib"]
|
||||
+ "@@libdir@@/tk"+str(Tkinter.TkVersion),
|
||||
+ "@@libdir@@"]
|
||||
for ptcl, ptk in zip(tcl_poss, tk_poss):
|
||||
tcl_config = os.path.join(ptcl, "tclConfig.sh")
|
||||
tk_config = os.path.join(ptk, "tkConfig.sh")
|
||||
@@ -974,10 +974,10 @@ def guess_tcl_config(tcl_lib_dir, tk_lib
|
||||
return tcl_lib, tcl_inc, 'tcl' + tk_ver, tk_lib, tk_inc, 'tk' + tk_ver
|
||||
|
||||
def hardcoded_tcl_config():
|
||||
- tcl_inc = "/usr/local/include"
|
||||
- tk_inc = "/usr/local/include"
|
||||
- tcl_lib = "/usr/local/lib"
|
||||
- tk_lib = "/usr/local/lib"
|
||||
+ tcl_inc = "/usr/include"
|
||||
+ tk_inc = "/usr/include"
|
||||
+ tcl_lib = "@@libdir@@"
|
||||
+ tk_lib = "@@libdir@@"
|
||||
return tcl_lib, tcl_inc, 'tcl', tk_lib, tk_inc, 'tk'
|
||||
|
||||
def add_tk_flags(module):
|
||||
File diff suppressed because it is too large
Load Diff
3
sources
3
sources
@@ -1,2 +1 @@
|
||||
SHA512 (matplotlib-3.10.8.tar.gz) = 66d07fb0b13821e88f6e6fe9f9882542340c074198dce7d5f8bf5d65d1c64326ae7517ad38d6357491c54aedd8cd1b03f555ad6d9337754db5dbd43c6305ab3f
|
||||
SHA512 (matplotlib-3.10.8-with-freetype-2.14.1.tar.gz) = 03f5b406caced1e2a59f914a64808b146954ce2285551cb2314664f883a05cbc93a92a28f5c259817a77e048012542d09a0180a230591e40ccef297f477a1e5b
|
||||
2add984c264ecdfc4a212f914736b78c matplotlib-1.2.0-without-gpc.tar.gz
|
||||
|
||||
Reference in New Issue
Block a user