mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 18:58:08 -07:00
dev-python/matplotlib: Remove old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
@@ -1,4 +1,3 @@
|
||||
DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b
|
||||
DIST matplotlib-3.4.2.tar.gz 37308683 BLAKE2B b769244b3d7a7da9125f6b634e9340676d849322491390d1c9a0cec3dfce59a8b5b5c0b567575ae78212129f7303b6b1fbbf30ce7c8a23c43c1304e83c9c5f5e SHA512 d4798dd2d6c857db0fe6d4ec85ebabc028b78627311bab17f7b9b30f6aa61d5243114b1cfe9d83293ad66ae47df83add5272f032954990dfc04054a792049f2a
|
||||
DIST matplotlib-3.4.3.tar.gz 37850796 BLAKE2B 15b40da8f6973ece4a91fffb5caf249cb8642263bfc2a784ec482bfaad250b6d3beffb9d2ba8a03e5fa10abab02b0e35728a8499ccb870aca06df57c5c1f91f4 SHA512 c2fe54e7517a1417aa8e55596e83edd090534c07f22882634d6ba0a07196441b5bbdd15958473805d8e8871b1b73380487aff3224294d472cd6122490c783145
|
||||
DIST matplotlib-3.5.0.tar.gz 34963685 BLAKE2B 371c548f8d12e29c58349cc4738bafaeef2530f81a2779290393911c8056fd5c3cbdcbbbdbad20b7f51a534a9332e05842ad0024c39899fa34ff98ed702ea0b3 SHA512 546e626c88606e50775c6eed1e3070a3f00367e56765d66baf1af8f3e1c9b8b7aa29df0fd9c18fe32505a392a75a7dd6bad5351df1a2ae682ba93d50760618e0
|
||||
|
||||
@@ -1,74 +0,0 @@
|
||||
From d0f92f582800b6bd6b4bb2e59cd7e5b3cd6b5948 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
||||
Date: Sun, 20 Jun 2021 14:46:17 +0200
|
||||
Subject: [PATCH] _GSConverter: handle stray 'GS' in output gracefully
|
||||
|
||||
Search the GS output stream for either "GS<" or "GS>" explicitly rather
|
||||
than any "GS", in order to prevent the code from wrongly matching stray
|
||||
"GS". This fixes a recent test regression on Gentoo where the following
|
||||
output seems to have been wrongly matched:
|
||||
|
||||
**** Error 'gs' ignored -- ExtGState missing from Resources.
|
||||
^^
|
||||
|
||||
Fixes #20472
|
||||
---
|
||||
lib/matplotlib/testing/compare.py | 20 +++++++++++---------
|
||||
1 file changed, 11 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/lib/matplotlib/testing/compare.py b/lib/matplotlib/testing/compare.py
|
||||
index 3957188b3e2..27af3e186bd 100644
|
||||
--- a/lib/matplotlib/testing/compare.py
|
||||
+++ b/lib/matplotlib/testing/compare.py
|
||||
@@ -154,15 +154,17 @@ def encode_and_escape(name):
|
||||
+ b") run flush\n")
|
||||
self._proc.stdin.flush()
|
||||
# GS> if nothing left on the stack; GS<n> if n items left on the stack.
|
||||
- err = self._read_until(b"GS")
|
||||
- stack = self._read_until(b">")
|
||||
- if stack or not os.path.exists(dest):
|
||||
- stack_size = int(stack[1:]) if stack else 0
|
||||
- self._proc.stdin.write(b"pop\n" * stack_size)
|
||||
- # Using the systemencoding should at least get the filenames right.
|
||||
- raise ImageComparisonFailure(
|
||||
- (err + b"GS" + stack + b">")
|
||||
- .decode(sys.getfilesystemencoding(), "replace"))
|
||||
+ err = self._read_until((b"GS<", b"GS>"))
|
||||
+ if err.endswith(b"GS<"):
|
||||
+ stack = self._read_until(b">")
|
||||
+ if stack or not os.path.exists(dest):
|
||||
+ stack_size = int(stack[1:]) if stack else 0
|
||||
+ self._proc.stdin.write(b"pop\n" * stack_size)
|
||||
+ # Using the systemencoding should at least get the filenames
|
||||
+ # right.
|
||||
+ raise ImageComparisonFailure(
|
||||
+ (err + b"GS" + stack + b">")
|
||||
+ .decode(sys.getfilesystemencoding(), "replace"))
|
||||
|
||||
|
||||
class _SVGConverter(_Converter):
|
||||
From d73dd52edf7ec106cf2f6c0ffc79dcda31102ecd Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
||||
Date: Sun, 20 Jun 2021 15:07:56 +0200
|
||||
Subject: [PATCH] increase test_backend_pgf.py::test_xelatex[pdf] tol
|
||||
|
||||
---
|
||||
lib/matplotlib/tests/test_backend_pgf.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/matplotlib/tests/test_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py
|
||||
index 55e375311..684f38fb7 100644
|
||||
--- a/lib/matplotlib/tests/test_backend_pgf.py
|
||||
+++ b/lib/matplotlib/tests/test_backend_pgf.py
|
||||
@@ -80,7 +80,7 @@ def test_common_texification(plain_text, escaped_text):
|
||||
# test compiling a figure to pdf with xelatex
|
||||
@needs_xelatex
|
||||
@pytest.mark.backend('pgf')
|
||||
-@image_comparison(['pgf_xelatex.pdf'], style='default')
|
||||
+@image_comparison(['pgf_xelatex.pdf'], style='default', tol=0.8)
|
||||
def test_xelatex():
|
||||
rc_xelatex = {'font.family': 'serif',
|
||||
'pgf.rcfonts': False}
|
||||
--
|
||||
2.32.0
|
||||
|
||||
@@ -1,285 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{8..10} )
|
||||
PYTHON_REQ_USE='tk?,threads(+)'
|
||||
|
||||
inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
|
||||
|
||||
FT_PV=2.6.1
|
||||
DESCRIPTION="Pure python plotting library with matlab like syntax"
|
||||
HOMEPAGE="https://matplotlib.org/"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
|
||||
test? (
|
||||
https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
|
||||
)"
|
||||
|
||||
# Main license: matplotlib
|
||||
# Some modules: BSD
|
||||
# matplotlib/backends/qt4_editor: MIT
|
||||
# Fonts: BitstreamVera, OFL-1.1
|
||||
LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
|
||||
IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
|
||||
|
||||
# internal copy of pycxx highly patched
|
||||
# dev-python/pycxx
|
||||
RDEPEND="
|
||||
dev-python/certifi[${PYTHON_USEDEP}]
|
||||
>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
|
||||
>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
|
||||
>=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}]
|
||||
>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
|
||||
>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
|
||||
>=dev-python/six-1.14.0[${PYTHON_USEDEP}]
|
||||
dev-python/versioneer[${PYTHON_USEDEP}]
|
||||
media-fonts/dejavu
|
||||
media-fonts/stix-fonts
|
||||
media-libs/freetype:2
|
||||
media-libs/libpng:0
|
||||
>=media-libs/qhull-2013:=
|
||||
cairo? (
|
||||
dev-python/cairocffi[${PYTHON_USEDEP}]
|
||||
)
|
||||
excel? (
|
||||
dev-python/xlwt[${PYTHON_USEDEP}]
|
||||
)
|
||||
gtk3? (
|
||||
>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
|
||||
x11-libs/gtk+:3[introspection]
|
||||
)
|
||||
latex? (
|
||||
virtual/latex-base
|
||||
app-text/dvipng
|
||||
app-text/ghostscript-gpl
|
||||
app-text/poppler[utils]
|
||||
dev-texlive/texlive-fontsrecommended
|
||||
dev-texlive/texlive-latexextra
|
||||
dev-texlive/texlive-luatex
|
||||
dev-texlive/texlive-xetex
|
||||
)
|
||||
qt5? (
|
||||
dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
|
||||
)
|
||||
webagg? (
|
||||
>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
|
||||
)
|
||||
wxwidgets? (
|
||||
$(python_gen_cond_dep '
|
||||
dev-python/wxpython:*[${PYTHON_USEDEP}]
|
||||
' python3_{8,9})
|
||||
)
|
||||
"
|
||||
|
||||
BDEPEND="
|
||||
${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
doc? (
|
||||
>=app-text/dvipng-1.15-r1
|
||||
>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
|
||||
>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
|
||||
>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
|
||||
>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
|
||||
>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
|
||||
virtual/latex-base
|
||||
dev-texlive/texlive-latexextra
|
||||
dev-texlive/texlive-fontsrecommended
|
||||
dev-texlive/texlive-latexrecommended
|
||||
dev-texlive/texlive-luatex
|
||||
dev-texlive/texlive-xetex
|
||||
>=media-gfx/graphviz-2.42.3[cairo]
|
||||
)
|
||||
test? (
|
||||
dev-python/flaky[${PYTHON_USEDEP}]
|
||||
dev-python/mock[${PYTHON_USEDEP}]
|
||||
>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
|
||||
>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
|
||||
x11-libs/gtk+:3[introspection]
|
||||
)
|
||||
"
|
||||
|
||||
# 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
|
||||
|
||||
distutils_enable_tests pytest
|
||||
|
||||
pkg_setup() {
|
||||
unset DISPLAY # bug #278524
|
||||
}
|
||||
|
||||
use_supported() {
|
||||
case ${1} in
|
||||
wxwidgets)
|
||||
[[ ${EPYTHON} == python3.[678] ]]
|
||||
;;
|
||||
esac
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
use_setup() {
|
||||
local uword="${2:-${1}}"
|
||||
if use_supported "${1}" && 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
|
||||
|
||||
local PATCHES=(
|
||||
"${FILESDIR}"/matplotlib-3.4.0-test.patch
|
||||
"${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch
|
||||
"${FILESDIR}"/matplotlib-3.4.1-xelatex-test.patch
|
||||
)
|
||||
|
||||
# requires jupyter-nbconvert
|
||||
rm lib/matplotlib/tests/test_backend_nbagg.py || die
|
||||
|
||||
sed \
|
||||
-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
|
||||
-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
|
||||
|| die "sed pyparsing failed"
|
||||
|
||||
sed -e 's:\(@pytest.mark.flaky\)(reruns=3):\1:' \
|
||||
-i lib/matplotlib/tests/test_*.py || die
|
||||
|
||||
hprefixify setupext.py
|
||||
|
||||
rm -rf libqhull || 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
|
||||
[libs]
|
||||
system_freetype = True
|
||||
system_qhull = True
|
||||
[packages]
|
||||
tests = $(usex test True False)
|
||||
[gui_support]
|
||||
agg = True
|
||||
gtk = False
|
||||
gtkagg = False
|
||||
macosx = False
|
||||
pyside = False
|
||||
pysideagg = False
|
||||
qt4 = False
|
||||
qt4agg = False
|
||||
$(use_setup cairo)
|
||||
$(use_setup gtk3)
|
||||
$(use_setup qt5)
|
||||
$(use_setup tk)
|
||||
$(use_setup wxwidgets wx)
|
||||
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
|
||||
}
|
||||
|
||||
wrap_setup() {
|
||||
local MAKEOPTS=-j1
|
||||
local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
|
||||
"$@"
|
||||
}
|
||||
|
||||
python_compile() {
|
||||
wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
|
||||
}
|
||||
|
||||
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 \
|
||||
emake SPHINXOPTS= O=-Dplot_formats=png:100 html
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
virtx distutils-r1_src_test
|
||||
}
|
||||
|
||||
python_test() {
|
||||
# we need to rebuild mpl against bundled freetype, otherwise
|
||||
# over 1000 tests will fail because of mismatched font rendering
|
||||
grep -v system_freetype "${BUILD_DIR}"/setup.cfg \
|
||||
> "${BUILD_DIR}"/test-setup.cfg || die
|
||||
local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg
|
||||
ln -s "${WORKDIR}/freetype-${FT_PV}" "${BUILD_DIR}" || die
|
||||
distutils-r1_python_compile -j1 --build-lib="${BUILD_DIR}"/test-lib
|
||||
local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
|
||||
|
||||
"${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(m.test(argv=['-m', 'not network'], verbosity=2))" || die
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
Reference in New Issue
Block a user