Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
53aef6c52e |
62
.gitignore
vendored
62
.gitignore
vendored
@@ -6,65 +6,3 @@ matplotlib-1.0.0-without-gpc.tar.gz
|
||||
/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.10.4.tar.gz
|
||||
/matplotlib-3.4.3-with-freetype-2.11.0.tar.gz
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
From 60ab4094d885067c50694d2f11cd640dc5c0f0c6 Mon Sep 17 00:00:00 2001
|
||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
Date: Wed, 27 Sep 2017 19:35:59 -0400
|
||||
Subject: [PATCH 1/2] matplotlibrc path search fix
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
lib/matplotlib/__init__.py | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
|
||||
index 71c68a3d6b..88be8e97b0 100644
|
||||
--- a/lib/matplotlib/__init__.py
|
||||
+++ b/lib/matplotlib/__init__.py
|
||||
@@ -473,7 +473,8 @@ def get_cachedir():
|
||||
@_logged_cached('matplotlib data path: %s')
|
||||
def get_data_path():
|
||||
"""Return the path to Matplotlib data."""
|
||||
- return str(Path(__file__).with_name("mpl-data"))
|
||||
+ return str(Path(__file__).parent.parent.parent.parent.parent /
|
||||
+ 'share/matplotlib/mpl-data')
|
||||
|
||||
|
||||
def matplotlib_fname():
|
||||
@@ -493,6 +494,7 @@ def matplotlib_fname():
|
||||
is not defined)
|
||||
- On other platforms,
|
||||
- ``$HOME/.matplotlib/matplotlibrc`` if ``$HOME`` is defined
|
||||
+ - ``/etc/matplotlibrc``
|
||||
- Lastly, it looks in ``$MATPLOTLIBDATA/matplotlibrc``, which should always
|
||||
exist.
|
||||
"""
|
||||
@@ -511,6 +513,7 @@ def matplotlib_fname():
|
||||
yield matplotlibrc
|
||||
yield os.path.join(matplotlibrc, 'matplotlibrc')
|
||||
yield os.path.join(get_configdir(), 'matplotlibrc')
|
||||
+ yield '/etc/matplotlibrc'
|
||||
yield os.path.join(get_data_path(), 'matplotlibrc')
|
||||
|
||||
for fname in gen_candidates():
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@@ -1,165 +0,0 @@
|
||||
From 7ca8afa7fa3e141464c1ef2b2c58b23b586bf310 Mon Sep 17 00:00:00 2001
|
||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
Date: Fri, 14 Feb 2020 06:05:42 -0500
|
||||
Subject: [PATCH 2/2] Set FreeType version to 2.10.4 and update tolerances.
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
lib/matplotlib/__init__.py | 2 +-
|
||||
lib/matplotlib/tests/test_axes.py | 4 ++--
|
||||
lib/matplotlib/tests/test_constrainedlayout.py | 2 +-
|
||||
lib/matplotlib/tests/test_mathtext.py | 7 +++++--
|
||||
lib/matplotlib/tests/test_polar.py | 2 +-
|
||||
lib/matplotlib/tests/test_tightlayout.py | 10 +++++-----
|
||||
setupext.py | 9 ++++++++-
|
||||
7 files changed, 23 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
|
||||
index 88be8e97b0..22dc74181e 100644
|
||||
--- a/lib/matplotlib/__init__.py
|
||||
+++ b/lib/matplotlib/__init__.py
|
||||
@@ -1137,7 +1137,7 @@ default_test_modules = [
|
||||
def _init_tests():
|
||||
# The version of FreeType to install locally for running the
|
||||
# tests. This must match the value in `setupext.py`
|
||||
- LOCAL_FREETYPE_VERSION = '2.6.1'
|
||||
+ LOCAL_FREETYPE_VERSION = '2.10.4'
|
||||
|
||||
from matplotlib import ft2font
|
||||
if (ft2font.__freetype_version__ != LOCAL_FREETYPE_VERSION or
|
||||
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
|
||||
index 7950e5b830..046dbbe1b8 100644
|
||||
--- a/lib/matplotlib/tests/test_axes.py
|
||||
+++ b/lib/matplotlib/tests/test_axes.py
|
||||
@@ -6500,7 +6500,7 @@ def test_normal_axes():
|
||||
]
|
||||
for nn, b in enumerate(bbaxis):
|
||||
targetbb = mtransforms.Bbox.from_bounds(*target[nn])
|
||||
- assert_array_almost_equal(b.bounds, targetbb.bounds, decimal=2)
|
||||
+ assert_array_almost_equal(b.bounds, targetbb.bounds, decimal=0)
|
||||
|
||||
target = [
|
||||
[150.0, 119.999, 930.0, 11.111],
|
||||
@@ -6518,7 +6518,7 @@ def test_normal_axes():
|
||||
|
||||
target = [85.5138, 75.88888, 1021.11, 1017.11]
|
||||
targetbb = mtransforms.Bbox.from_bounds(*target)
|
||||
- assert_array_almost_equal(bbtb.bounds, targetbb.bounds, decimal=2)
|
||||
+ assert_array_almost_equal(bbtb.bounds, targetbb.bounds, decimal=0)
|
||||
|
||||
# test that get_position roundtrips to get_window_extent
|
||||
axbb = ax.get_position().transformed(fig.transFigure).bounds
|
||||
diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
|
||||
index 117b221cc2..d009912dfa 100644
|
||||
--- a/lib/matplotlib/tests/test_constrainedlayout.py
|
||||
+++ b/lib/matplotlib/tests/test_constrainedlayout.py
|
||||
@@ -429,7 +429,7 @@ def test_hidden_axes():
|
||||
extents1 = np.copy(axs[0, 0].get_position().extents)
|
||||
|
||||
np.testing.assert_allclose(
|
||||
- extents1, [0.045552, 0.543288, 0.47819, 0.982638], rtol=1e-5)
|
||||
+ extents1, [0.045552, 0.543288, 0.47819, 0.982638], rtol=1e-2)
|
||||
|
||||
|
||||
def test_colorbar_align():
|
||||
diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
|
||||
index b5fd906d2f..8e3801a231 100644
|
||||
--- a/lib/matplotlib/tests/test_mathtext.py
|
||||
+++ b/lib/matplotlib/tests/test_mathtext.py
|
||||
@@ -1,5 +1,6 @@
|
||||
import io
|
||||
import os
|
||||
+import platform
|
||||
import re
|
||||
|
||||
import numpy as np
|
||||
@@ -189,7 +190,8 @@ def baseline_images(request, fontset, index, text):
|
||||
@pytest.mark.parametrize(
|
||||
'fontset', ['cm', 'stix', 'stixsans', 'dejavusans', 'dejavuserif'])
|
||||
@pytest.mark.parametrize('baseline_images', ['mathtext'], indirect=True)
|
||||
-@image_comparison(baseline_images=None)
|
||||
+@image_comparison(baseline_images=None,
|
||||
+ tol=0.011 if platform.machine() in ('ppc64le', 's390x') else 0)
|
||||
def test_mathtext_rendering(baseline_images, fontset, index, text):
|
||||
mpl.rcParams['mathtext.fontset'] = fontset
|
||||
fig = plt.figure(figsize=(5.25, 0.75))
|
||||
@@ -213,7 +215,8 @@ def test_mathtext_rendering_lightweight(baseline_images, fontset, index, text):
|
||||
@pytest.mark.parametrize(
|
||||
'fontset', ['cm', 'stix', 'stixsans', 'dejavusans', 'dejavuserif'])
|
||||
@pytest.mark.parametrize('baseline_images', ['mathfont'], indirect=True)
|
||||
-@image_comparison(baseline_images=None, extensions=['png'])
|
||||
+@image_comparison(baseline_images=None, extensions=['png'],
|
||||
+ tol=0.011 if platform.machine() in ('ppc64le', 's390x') else 0)
|
||||
def test_mathfont_rendering(baseline_images, fontset, index, text):
|
||||
mpl.rcParams['mathtext.fontset'] = fontset
|
||||
fig = plt.figure(figsize=(5.25, 0.75))
|
||||
diff --git a/lib/matplotlib/tests/test_polar.py b/lib/matplotlib/tests/test_polar.py
|
||||
index c614eff027..daf4e26fb8 100644
|
||||
--- a/lib/matplotlib/tests/test_polar.py
|
||||
+++ b/lib/matplotlib/tests/test_polar.py
|
||||
@@ -312,7 +312,7 @@ def test_get_tightbbox_polar():
|
||||
fig.canvas.draw()
|
||||
bb = ax.get_tightbbox(fig.canvas.get_renderer())
|
||||
assert_allclose(
|
||||
- bb.extents, [107.7778, 29.2778, 539.7847, 450.7222], rtol=1e-03)
|
||||
+ bb.extents, [107.7778, 29.2778, 539.7847, 450.7222], rtol=1)
|
||||
|
||||
|
||||
@check_figures_equal(extensions=["png"])
|
||||
diff --git a/lib/matplotlib/tests/test_tightlayout.py b/lib/matplotlib/tests/test_tightlayout.py
|
||||
index 23d363b508..e94c863477 100644
|
||||
--- a/lib/matplotlib/tests/test_tightlayout.py
|
||||
+++ b/lib/matplotlib/tests/test_tightlayout.py
|
||||
@@ -172,12 +172,12 @@ def test_outward_ticks():
|
||||
plt.tight_layout()
|
||||
# These values were obtained after visual checking that they correspond
|
||||
# to a tight layouting that did take the ticks into account.
|
||||
- ans = [[[0.091, 0.607], [0.433, 0.933]],
|
||||
- [[0.579, 0.607], [0.922, 0.933]],
|
||||
- [[0.091, 0.140], [0.433, 0.466]],
|
||||
- [[0.579, 0.140], [0.922, 0.466]]]
|
||||
+ ans = [[[0.09, 0.61], [0.43, 0.93]],
|
||||
+ [[0.58, 0.61], [0.92, 0.93]],
|
||||
+ [[0.09, 0.14], [0.43, 0.47]],
|
||||
+ [[0.58, 0.14], [0.92, 0.47]]]
|
||||
for nn, ax in enumerate(fig.axes):
|
||||
- assert_array_equal(np.round(ax.get_position().get_points(), 3),
|
||||
+ assert_array_equal(np.round(ax.get_position().get_points(), 2),
|
||||
ans[nn])
|
||||
|
||||
|
||||
diff --git a/setupext.py b/setupext.py
|
||||
index d8d0b6b393..e44d3b046a 100644
|
||||
--- a/setupext.py
|
||||
+++ b/setupext.py
|
||||
@@ -167,12 +167,18 @@ _freetype_hashes = {
|
||||
'955e17244e9b38adb0c98df66abb50467312e6bb70eac07e49ce6bd1a20e809a',
|
||||
'2.10.1':
|
||||
'3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110',
|
||||
+ '2.10.2':
|
||||
+ 'e09aa914e4f7a5d723ac381420949c55c0b90b15744adce5d1406046022186ab',
|
||||
+ '2.10.4':
|
||||
+ '5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac',
|
||||
+ '2.11.0':
|
||||
+ 'a45c6b403413abd5706f3582f04c8339d26397c4304b78fa552f2215df64101f',
|
||||
}
|
||||
# This is the version of FreeType to use when building a local
|
||||
# version. It must match the value in
|
||||
# lib/matplotlib.__init__.py and also needs to be changed below in the
|
||||
# embedded windows build script (grep for "REMINDER" in this file)
|
||||
-LOCAL_FREETYPE_VERSION = '2.6.1'
|
||||
+LOCAL_FREETYPE_VERSION = '2.10.4'
|
||||
LOCAL_FREETYPE_HASH = _freetype_hashes.get(LOCAL_FREETYPE_VERSION, 'unknown')
|
||||
|
||||
LOCAL_QHULL_VERSION = '2020.2'
|
||||
@@ -565,6 +571,7 @@ class FreeType(SetupPackage):
|
||||
ext.extra_objects.insert(
|
||||
0, str(src_path / 'objs' / '.libs' / libfreetype))
|
||||
ext.define_macros.append(('FREETYPE_BUILD_TYPE', 'local'))
|
||||
+ ext.libraries.append('brotlidec')
|
||||
|
||||
def do_custom_build(self, env):
|
||||
# We're using a system freetype
|
||||
--
|
||||
2.31.1
|
||||
|
||||
29
20_matplotlibrc_path_search_fix.patch
Normal file
29
20_matplotlibrc_path_search_fix.patch
Normal file
@@ -0,0 +1,29 @@
|
||||
Description: Fixes the path to search for matplotlibrc file
|
||||
Forwarded: not-needed
|
||||
Author: Sandro Tosi <morph@debian.org>
|
||||
|
||||
--- a/lib/matplotlib/__init__.py
|
||||
+++ b/lib/matplotlib/__init__.py
|
||||
@@ -658,10 +658,12 @@ def _get_data_path():
|
||||
raise RuntimeError('Path in environment MATPLOTLIBDATA not a directory')
|
||||
return path
|
||||
|
||||
- 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
|
||||
@@ -786,7 +788,7 @@ def matplotlib_fname():
|
||||
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')
|
||||
14
40_bts608939_draw_markers_description.patch
Normal file
14
40_bts608939_draw_markers_description.patch
Normal file
@@ -0,0 +1,14 @@
|
||||
Description: minor glitch in draw_markers() description
|
||||
Author: Jakub Wilk <jwilk@debian.org>
|
||||
|
||||
--- a/doc/api/api_changes.rst
|
||||
+++ b/doc/api/api_changes.rst
|
||||
@@ -1143,7 +1143,7 @@ New methods:
|
||||
|
||||
* :meth:`draw_markers(self, gc, marker_path, marker_trans, path,
|
||||
trans, rgbFace)
|
||||
- <matplotlib.backend_bases.RendererBase.draw_markers`
|
||||
+ <matplotlib.backend_bases.RendererBase.draw_markers>`
|
||||
|
||||
* :meth:`draw_path_collection(self, master_transform, cliprect,
|
||||
clippath, clippath_trans, paths, all_transforms, offsets,
|
||||
50
50_bts608942_spaces_in_param_args.patch
Normal file
50
50_bts608942_spaces_in_param_args.patch
Normal file
@@ -0,0 +1,50 @@
|
||||
Description: don't separate param and its argument with a space
|
||||
|
||||
--- a/lib/mpl_toolkits/axes_grid1/axes_divider.py
|
||||
+++ b/lib/mpl_toolkits/axes_grid1/axes_divider.py
|
||||
@@ -201,12 +201,12 @@ class Divider(object):
|
||||
def locate(self, nx, ny, nx1=None, ny1=None, axes=None, renderer=None):
|
||||
"""
|
||||
|
||||
- :param nx, nx1: Integers specifying the column-position of the
|
||||
+ :param nx,nx1: Integers specifying the column-position of the
|
||||
cell. When nx1 is None, a single nx-th column is
|
||||
specified. Otherwise location of columns spanning between nx
|
||||
to nx1 (but excluding nx1-th column) is specified.
|
||||
|
||||
- :param ny, ny1: same as nx and nx1, but for row positions.
|
||||
+ :param ny,ny1: same as nx and nx1, but for row positions.
|
||||
"""
|
||||
|
||||
figW, figH = self._fig.get_size_inches()
|
||||
|
||||
@@ -250,12 +250,12 @@ class Divider(object):
|
||||
(:class:`mpl_toolkits.axes_grid.axes_divider.AxesLocator`) for
|
||||
specified cell.
|
||||
|
||||
- :param nx, nx1: Integers specifying the column-position of the
|
||||
+ :param nx,nx1: Integers specifying the column-position of the
|
||||
cell. When nx1 is None, a single nx-th column is
|
||||
specified. Otherwise location of columns spanning between nx
|
||||
to nx1 (but excluding nx1-th column) is specified.
|
||||
|
||||
- :param ny, ny1: same as nx and nx1, but for row positions.
|
||||
+ :param ny,ny1: same as nx and nx1, but for row positions.
|
||||
"""
|
||||
return AxesLocator(self, nx, ny, nx1, ny1)
|
||||
|
||||
@@ -298,12 +298,12 @@ class AxesLocator(object):
|
||||
"""
|
||||
:param axes_divider: An instance of AxesDivider class.
|
||||
|
||||
- :param nx, nx1: Integers specifying the column-position of the
|
||||
+ :param nx,nx1: Integers specifying the column-position of the
|
||||
cell. When nx1 is None, a single nx-th column is
|
||||
specified. Otherwise location of columns spanning between nx
|
||||
to nx1 (but excluding nx1-th column) is is specified.
|
||||
|
||||
- :param ny, ny1: same as nx and nx1, but for row positions.
|
||||
+ :param ny,ny1: same as nx and nx1, but for row positions.
|
||||
"""
|
||||
self._axes_divider = axes_divider
|
||||
|
||||
19
70_bts720549_try_StayPuft_for_xkcd.patch
Normal file
19
70_bts720549_try_StayPuft_for_xkcd.patch
Normal file
@@ -0,0 +1,19 @@
|
||||
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'] = [
|
||||
21
generate-tarball.sh
Executable file
21
generate-tarball.sh
Executable file
@@ -0,0 +1,21 @@
|
||||
#! /bin/sh
|
||||
|
||||
version=$1
|
||||
|
||||
[ -z $version ] && exit 1
|
||||
|
||||
dir=matplotlib-${version}
|
||||
file=matplotlib-${version}.tar.gz
|
||||
file=v${version}.tar.gz
|
||||
result=matplotlib-${version}-without-extern.tar.xz
|
||||
|
||||
test -f $file || wget -v https://github.com/matplotlib/matplotlib/archive/$file
|
||||
|
||||
rm -rf matplotlib-${version}
|
||||
tar xzf $file
|
||||
|
||||
rm -vr matplotlib-${version}/extern/qhull
|
||||
rm -vr matplotlib-${version}/lib/matplotlib/mpl-data/sample_data/lena.*
|
||||
|
||||
rm -f $result
|
||||
tar cJf $result $dir
|
||||
32
matplotlib-1.4.3-cbook.restrict_dict.patch
Normal file
32
matplotlib-1.4.3-cbook.restrict_dict.patch
Normal file
@@ -0,0 +1,32 @@
|
||||
From 2e445c2c4f66f1e0de9779a3fd966aaf8d8ed2c5 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas A Caswell <tcaswell@gmail.com>
|
||||
Date: Sun, 17 May 2015 23:45:44 -0400
|
||||
Subject: [PATCH] Merge pull request #4439 from tswsl1989/restrict_dict_gdk
|
||||
|
||||
FIX : Import cbook.restrict_dict into backend_gdk
|
||||
---
|
||||
lib/matplotlib/backends/backend_gdk.py | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/matplotlib/backends/backend_gdk.py b/lib/matplotlib/backends/backend_gdk.py
|
||||
index fc705fe..024c27e 100644
|
||||
--- a/lib/matplotlib/backends/backend_gdk.py
|
||||
+++ b/lib/matplotlib/backends/backend_gdk.py
|
||||
@@ -26,7 +26,7 @@ def fn_name(): return sys._getframe(1).f_code.co_name
|
||||
from matplotlib._pylab_helpers import Gcf
|
||||
from matplotlib.backend_bases import RendererBase, GraphicsContextBase, \
|
||||
FigureManagerBase, FigureCanvasBase
|
||||
-from matplotlib.cbook import is_string_like
|
||||
+from matplotlib.cbook import is_string_like, restrict_dict
|
||||
from matplotlib.figure import Figure
|
||||
from matplotlib.mathtext import MathTextParser
|
||||
from matplotlib.transforms import Affine2D
|
||||
@@ -477,7 +477,7 @@ def _print_image(self, filename, format, *args, **kwargs):
|
||||
|
||||
# set the default quality, if we are writing a JPEG.
|
||||
# http://www.pygtk.org/docs/pygtk/class-gdkpixbuf.html#method-gdkpixbuf--save
|
||||
- options = cbook.restrict_dict(kwargs, ['quality'])
|
||||
+ options = restrict_dict(kwargs, ['quality'])
|
||||
if format in ['jpg','jpeg']:
|
||||
if 'quality' not in options:
|
||||
options['quality'] = rcParams['savefig.jpeg_quality']
|
||||
33
python-matplotlib-noagg.patch
Normal file
33
python-matplotlib-noagg.patch
Normal file
@@ -0,0 +1,33 @@
|
||||
--- 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):
|
||||
18
python-matplotlib-system-cxx.patch
Normal file
18
python-matplotlib-system-cxx.patch
Normal file
@@ -0,0 +1,18 @@
|
||||
--- setupext.py.orig 2014-01-25 15:06:39.460916454 +0100
|
||||
+++ setupext.py 2014-01-25 15:06:53.080946205 +0100
|
||||
@@ -841,15 +841,6 @@
|
||||
name = 'pycxx'
|
||||
|
||||
def check(self):
|
||||
- if PY3:
|
||||
- # There is no version of PyCXX in the wild that will work
|
||||
- # with Python 3.x and matplotlib, since they lack support
|
||||
- # for the buffer object.
|
||||
- self.__class__.found_external = False
|
||||
- return ("Official versions of PyCXX are not compatible "
|
||||
- "with matplotlib on Python 3.x, since they lack "
|
||||
- "support for the buffer object. Using local "
|
||||
- "copy")
|
||||
|
||||
self.__class__.found_external = True
|
||||
old_stdout = sys.stdout
|
||||
File diff suppressed because it is too large
Load Diff
10
setup.cfg
10
setup.cfg
@@ -1,8 +1,2 @@
|
||||
[libs]
|
||||
system_freetype = True
|
||||
system_qhull = True
|
||||
|
||||
[packages]
|
||||
tests = True
|
||||
toolkits = True
|
||||
toolkits_tests = True
|
||||
[rc_options]
|
||||
backend = GTKAgg
|
||||
|
||||
3
sources
3
sources
@@ -1,2 +1 @@
|
||||
SHA512 (matplotlib-3.4.3.tar.gz) = e346c7d0f33b7d2fb5b48a4578ec99a40c2e5b959d109526ccbe7582a37f10abb91d53062711c37eb4ccaf462fd8684e1557405c50ccf43139bc371601a60e80
|
||||
SHA512 (matplotlib-3.4.3-with-freetype-2.10.4.tar.gz) = 665870e9c34fa562c69c28432b6d378e02c63ff2b14a34f982a16c89ecdb3b012cdf3306e84a052d689710f2ddff069c8a207b63971c73e5c867d6562e1f6241
|
||||
c16111ce7d6c799a2b557699f40eb709 matplotlib-1.4.3-without-extern.tar.xz
|
||||
|
||||
Reference in New Issue
Block a user