forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
dev-python/matplotlib: Version bump to 2.0.2, #608062
Closes: gentoo#4249
- Loading branch information
1 parent
62308fd
commit 299f1dd
Showing
4 changed files
with
298 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
DIST matplotlib-1.4.3.tar.gz 49933525 SHA256 5b9544472d9d6ab3d47423bdb5a0e64fdf913e505c1c083f25283dd0362bc0b6 SHA512 51b0f58b2618b47b653e17e4f6b6a1215d3a3b0f1331ce3555cc7435e365d9c75693f289ce12fe3bf8f69fd57b663e545f0f1c2c94e81eaa661cac0689e125f5 WHIRLPOOL 160ca48ecb44db58f1c56bd6e89592c5d1badd8e434fc25d32aa6d4d7a346ae7c7444d1c8e0c2ca2bf5c3246fd56cd93856ec7b1e3e51f5e471b9b55a0f2c1ad | ||
DIST matplotlib-1.5.3.tar.gz 51606089 SHA256 a0a5dc39f785014f2088fed2c6d2d129f0444f71afbb9c44f7bdf1b14d86ebbc SHA512 553be9f661a1923d8ec7504a11dd3317e5ffb429c19339c58047715f4c28358d6d2ac38d46bd27ecd1dcf7159f157aab80d90713fbc4071e2e395bbf11ee6385 WHIRLPOOL 7e2b0472bb7d913e78260da95c93c3243562e76352790318286e5d194f88ac05a9f51fa029a7b0ad17bbbbd0dc9658769fe6301b544ec03f1ab5c205835ea894 | ||
DIST matplotlib-2.0.2.tar.gz 53879938 SHA256 0ffbc44faa34a8b1704bc108c451ecf87988f900ef7ce757b8e2e84383121ff1 SHA512 39d68aee87fac2c246cdee7941ffaae1b8d586fa75c351bc94f963def66df32c3aba13fa0be94e1f8d21f06e068565b1a79c6d4f65589d8dd23cd48b32ab474f WHIRLPOOL 5ab8f9edb4591205d61bd47c5125520c0d24b8ce44e0041b99a5a0c692ffd3ff581cd6e092d18a64ddf6fb4f43ace6ee8c2bce19f5acd01d022d8a46e472b2df |
27 changes: 27 additions & 0 deletions
27
dev-python/matplotlib/files/matplotlib-2.0.2-freetype-spurious-failure.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py | ||
index 5e738ad9b..78b3f8169 100644 | ||
--- a/lib/matplotlib/testing/decorators.py | ||
+++ b/lib/matplotlib/testing/decorators.py | ||
@@ -266,7 +266,7 @@ class ImageComparisonTest(CleanupTest): | ||
|
||
yield do_test, fignum, actual_fname, expected_fname | ||
|
||
-def image_comparison(baseline_images=None, extensions=None, tol=0, | ||
+def image_comparison(baseline_images=None, extensions=None, tol=20, | ||
freetype_version=None, remove_text=False, | ||
savefig_kwarg=None, style='_classic_test'): | ||
""" | ||
diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py | ||
index 39f5d7ef1..7681e5cb9 100644 | ||
--- a/lib/matplotlib/tests/test_mathtext.py | ||
+++ b/lib/matplotlib/tests/test_mathtext.py | ||
@@ -159,7 +159,8 @@ for fonts, chars in font_test_specs: | ||
|
||
def make_set(basename, fontset, tests, extensions=None): | ||
def make_test(filename, test): | ||
- @image_comparison(baseline_images=[filename], extensions=extensions) | ||
+ @image_comparison(baseline_images=[filename], extensions=extensions, | ||
+ tol=40) | ||
def single_test(): | ||
matplotlib.rcParams['mathtext.fontset'] = fontset | ||
fig = plt.figure(figsize=(5.25, 0.75)) |
13 changes: 13 additions & 0 deletions
13
dev-python/matplotlib/files/matplotlib-2.0.2-nose-fixes.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py | ||
index 530c889a9..8231c2bb8 100644 | ||
--- a/lib/matplotlib/__init__.py | ||
+++ b/lib/matplotlib/__init__.py | ||
@@ -1609,7 +1609,7 @@ def test(verbosity=1): | ||
|
||
# store the old values before overriding | ||
plugins = _get_extra_test_plugins() | ||
- plugins.extend([plugin() for plugin in nose.plugins.builtin.plugins]) | ||
+ plugins.extend(nose.plugins.builtin.plugins) | ||
|
||
manager = PluginManager(plugins=[x() for x in plugins]) | ||
config = nose.config.Config(verbosity=verbosity, plugins=manager) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,257 @@ | ||
# Copyright 1999-2017 Gentoo Foundation | ||
# Distributed under the terms of the GNU General Public License v2 | ||
|
||
EAPI=6 | ||
|
||
PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) | ||
PYTHON_REQ_USE='tk?,threads(+)' | ||
|
||
inherit distutils-r1 flag-o-matic virtualx toolchain-funcs | ||
|
||
DESCRIPTION="Pure python plotting library with matlab like syntax" | ||
HOMEPAGE="http://matplotlib.org/" | ||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" | ||
|
||
SLOT="0" | ||
# Main license: matplotlib | ||
# Some modules: BSD | ||
# matplotlib/backends/qt4_editor: MIT | ||
# Fonts: BitstreamVera, OFL-1.1 | ||
LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" | ||
KEYWORDS="~amd64 ~x86" | ||
IUSE="cairo doc excel examples gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets" | ||
|
||
PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )" | ||
REQUIRED_USE=" | ||
doc? ( ${PY2_FLAGS} ) | ||
excel? ( ${PY2_FLAGS} ) | ||
gtk2? ( ${PY2_FLAGS} ) | ||
wxwidgets? ( ${PY2_FLAGS} ) | ||
test? ( | ||
cairo latex qt5 tk wxwidgets | ||
|| ( gtk2 gtk3 ) | ||
)" | ||
|
||
# #456704 -- a lot of py2-only deps | ||
PY2_USEDEP=$(python_gen_usedep python2_7) | ||
COMMON_DEPEND=" | ||
dev-python/cycler[${PYTHON_USEDEP}] | ||
dev-python/functools32[${PY2_USEDEP}] | ||
>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}] | ||
dev-python/python-dateutil:0[${PYTHON_USEDEP}] | ||
dev-python/pytz[${PYTHON_USEDEP}] | ||
>=dev-python/six-1.10[${PYTHON_USEDEP}] | ||
dev-python/subprocess32[${PY2_USEDEP}] | ||
media-fonts/stix-fonts | ||
media-libs/freetype:2 | ||
media-libs/libpng:0 | ||
media-libs/qhull | ||
cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] ) | ||
gtk2? ( | ||
dev-libs/glib:2= | ||
x11-libs/gdk-pixbuf | ||
x11-libs/gtk+:2 | ||
dev-python/pygtk[${PY2_USEDEP}] ) | ||
wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )" | ||
|
||
# internal copy of pycxx highly patched | ||
# dev-python/pycxx | ||
|
||
DEPEND="${COMMON_DEPEND} | ||
dev-python/versioneer[${PYTHON_USEDEP}] | ||
dev-python/setuptools[${PYTHON_USEDEP}] | ||
virtual/pkgconfig | ||
doc? ( | ||
app-text/dvipng | ||
dev-python/pillow[${PYTHON_USEDEP}] | ||
dev-python/ipython[${PYTHON_USEDEP}] | ||
dev-python/mock[${PY2_USEDEP}] | ||
dev-python/numpydoc[${PYTHON_USEDEP}] | ||
dev-python/sphinx[${PYTHON_USEDEP}] | ||
dev-python/xlwt[${PYTHON_USEDEP}] | ||
dev-texlive/texlive-latexextra | ||
dev-texlive/texlive-fontsrecommended | ||
dev-texlive/texlive-latexrecommended | ||
media-gfx/graphviz[cairo] | ||
) | ||
test? ( | ||
dev-python/mock[${PYTHON_USEDEP}] | ||
>=dev-python/nose-0.11.1[${PYTHON_USEDEP}] | ||
)" | ||
|
||
RDEPEND="${COMMON_DEPEND} | ||
>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}] | ||
excel? ( dev-python/xlwt[${PYTHON_USEDEP}] ) | ||
gtk3? ( | ||
dev-python/pygobject:3[${PYTHON_USEDEP}] | ||
x11-libs/gtk+:3[introspection] ) | ||
latex? ( | ||
virtual/latex-base | ||
app-text/ghostscript-gpl | ||
app-text/dvipng | ||
app-text/poppler[utils] | ||
dev-texlive/texlive-fontsrecommended | ||
dev-texlive/texlive-latexextra | ||
dev-texlive/texlive-xetex | ||
) | ||
pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] ) | ||
qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] ) | ||
qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] ) | ||
" | ||
|
||
# A few C++ source files are written to srcdir. | ||
# Other than that, the ebuild shall be fit for out-of-source build. | ||
DISTUTILS_IN_SOURCE_BUILD=1 | ||
|
||
PATCHES=( | ||
"${FILESDIR}"/${P}-nose-fixes.patch | ||
"${FILESDIR}"/${P}-freetype-spurious-failure.patch | ||
) | ||
|
||
pkg_setup() { | ||
unset DISPLAY # bug #278524 | ||
use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) | ||
} | ||
|
||
use_setup() { | ||
local uword="${2:-${1}}" | ||
if use ${1}; then | ||
echo "${uword} = True" | ||
echo "${uword}agg = True" | ||
else | ||
echo "${uword} = False" | ||
echo "${uword}agg = False" | ||
fi | ||
} | ||
|
||
python_prepare_all() { | ||
# Generates test failures, but fedora does it | ||
# local PATCHES=( | ||
# "${FILESDIR}"/${P}-unbundle-pycxx.patch | ||
# "${FILESDIR}"/${P}-unbundle-agg.patch | ||
# ) | ||
# rm -r agg24 CXX || die | ||
# rm -r agg24 || die | ||
|
||
# cat > lib/${PN}/externals/six.py <<-EOF | ||
# from __future__ import absolute_import | ||
# from six import * | ||
# EOF | ||
|
||
sed \ | ||
-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \ | ||
-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \ | ||
|| die "sed pyparsing failed" | ||
|
||
sed \ | ||
-e "s:/usr/:${EPREFIX}/usr/:g" \ | ||
-i setupext.py || die | ||
|
||
export XDG_RUNTIME_DIR="${T}/runtime-dir" | ||
mkdir "${XDG_RUNTIME_DIR}" || die | ||
chmod 0700 "${XDG_RUNTIME_DIR}" || die | ||
|
||
distutils-r1_python_prepare_all | ||
} | ||
|
||
python_configure_all() { | ||
append-flags -fno-strict-aliasing | ||
append-cppflags -DNDEBUG # or get old trying to do triangulation | ||
tc-export PKG_CONFIG | ||
} | ||
|
||
python_configure() { | ||
mkdir -p "${BUILD_DIR}" || die | ||
|
||
# create setup.cfg (see setup.cfg.template for any changes). | ||
|
||
# common switches. | ||
cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die | ||
[directories] | ||
basedirlist = "${EPREFIX}/usr" | ||
[provide_packages] | ||
pytz = False | ||
dateutil = False | ||
[packages] | ||
tests = $(usex test True False) | ||
[gui_support] | ||
agg = True | ||
$(use_setup cairo) | ||
$(use_setup gtk3) | ||
$(use_setup pyside) | ||
$(use_setup qt4) | ||
$(use_setup qt5) | ||
$(use_setup tk) | ||
EOF | ||
|
||
if use gtk3 && use cairo; then | ||
echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die | ||
else | ||
echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die | ||
fi | ||
|
||
if python_is_python3; then | ||
cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die | ||
gtk = False | ||
gtkagg = False | ||
wx = False | ||
wxagg = False | ||
EOF | ||
else | ||
cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die | ||
$(use_setup gtk2 gtk) | ||
$(use_setup wxwidgets wx) | ||
EOF | ||
fi | ||
} | ||
|
||
wrap_setup() { | ||
local -x MPLSETUPCFG=${BUILD_DIR}/setup.cfg | ||
unset DISPLAY | ||
|
||
# Note: remove build... if switching to out-of-source build | ||
"${@}" build --build-lib="${BUILD_DIR}"/build/lib | ||
} | ||
|
||
python_compile() { | ||
wrap_setup distutils-r1_python_compile | ||
} | ||
|
||
python_compile_all() { | ||
if use doc; then | ||
cd doc || die | ||
|
||
# necessary for in-source build | ||
local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH} | ||
|
||
VARTEXFONTS="${T}"/fonts \ | ||
"${EPYTHON}" ./make.py --small html || die | ||
fi | ||
} | ||
|
||
python_test() { | ||
wrap_setup distutils_install_for_testing | ||
|
||
virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)" | ||
} | ||
|
||
python_install() { | ||
wrap_setup distutils-r1_python_install | ||
|
||
# mpl_toolkits namespace | ||
python_moduleinto mpl_toolkits | ||
python_domodule lib/mpl_toolkits/__init__.py | ||
} | ||
|
||
python_install_all() { | ||
use doc && local HTML_DOCS=( doc/build/html/. ) | ||
|
||
distutils-r1_python_install_all | ||
|
||
if use examples; then | ||
dodoc -r examples | ||
docompress -x /usr/share/doc/${PF}/examples | ||
fi | ||
|
||
find "${D}" -name '*.pth' -delete || die | ||
} |