From af42afeb201514cfc34a8a056def3389af35a54b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 Jan 2023 11:46:20 +0000 Subject: gentoo auto-resync : 12:01:2023 - 11:46:19 --- dev-python/matplotlib/Manifest | 3 + .../matplotlib/files/matplotlib-3.6.3-test.patch | 25 ++ dev-python/matplotlib/matplotlib-3.6.3.ebuild | 281 +++++++++++++++++++++ 3 files changed, 309 insertions(+) create mode 100644 dev-python/matplotlib/files/matplotlib-3.6.3-test.patch create mode 100644 dev-python/matplotlib/matplotlib-3.6.3.ebuild (limited to 'dev-python/matplotlib') diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest index eeef05ad8b66..7e28307bff5a 100644 --- a/dev-python/matplotlib/Manifest +++ b/dev-python/matplotlib/Manifest @@ -2,11 +2,14 @@ AUX matplotlib-3.3.3-disable-lto.patch 828 BLAKE2B 2044ef633091f27080d20e3e1b2c7 AUX matplotlib-3.5.2-test.patch 10981 BLAKE2B cd7406a1452b22d5782ef293b10e1fbed819c0fd832a7e4d5104020250f207bb87186a95815e2357379b2dc3bc87ae2f37387c7c423bdf41122ec330712ad53f SHA512 551d3ec3fb2bb14ccecee8056d78511e9b739af8b00f41d60be9a840b661725ff2eb4b22d72d8a9ccafa22e61c99db8dff216d7fb8ce537446a95056abea4d93 AUX matplotlib-3.6.0-test.patch 10781 BLAKE2B 797fe4c86d94ecbfa5b7699c63f68e663ab842cb0a5bdedb059103bd62bc91e73bf135d3fca49ba93bf246e0fc68012b8ee85a20c83582823cf210d238ec8d0c SHA512 195fdf5f6af23ba5eb72fbd65ded1066c7e400af73e5c64fe989a231c6a3a32f0eb8a2196b48a7ba39079e3815d4a6c346dcc41175b80a673c7beefaa85bbb53 AUX matplotlib-3.6.2-test.patch 8245 BLAKE2B 12fbf6e5f68521e2dd91b577ec44da288ca84453a751687cbf3bba416ae0a0ba3a92a4577636f1b1455f6c1c9dd5064eea19ef18194005bf8ef758c4d48bd8f2 SHA512 eb21cd4e81a0a560a766fa6b47754011f388f0f5a677815326f49fcd9c22ef117aac1cb23445e3cd2c70aa52b00a4f298dff85d01692cfb4020bc38c37cee9d7 +AUX matplotlib-3.6.3-test.patch 804 BLAKE2B 1c4f28dec39bd282a5e04ba7656b2fed55d0bd114308f019b3cc6bcad7640ae1d2f29aed77346980853c7a251500d612555668fb0d9ee29573c13fdd3de87266 SHA512 fda1982cfed86eaf39cbcb4eff41d034f7e6dfee17afb9bf9d3932959e6d6b7ec19469fdc400f1b69a25419e2026a9858ea7d95fdf2e7bb9a257241aa1960030 DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b DIST matplotlib-3.5.3.tar.gz 35236343 BLAKE2B 0d3f4e15295afe2c737e441325206e77c520a514bc87ab1eebef624f89896a2cf609e8d57b8fa8ef28ecf8c836e20cb296adaa95f81dbfcf3f2a45631e3dd02c SHA512 f431d3046e9c5fbe5d44a16a762e9a178ba34380974964660eaf3681671178866a63b3bad9aad8d3ad423926f7db2965d514e9b1489e3a824a4532a01f0e0670 DIST matplotlib-3.6.1.tar.gz 35826557 BLAKE2B b30710436a773298dcdf233e592656d9815f55f0daab0cc28811b9adbfd3b2ede08f4c13e0dfa43c5fb283bc1ba96ea793084f3d65ba13b9697d14ffa406a273 SHA512 40b148fe4574eea88e7e74c2844a4811c71651602bd7e0a863482571bfa216c01d4f5fcd36add14af82c5cacdb6ae9d441ed251ee5239d06bcc8d40c9ee8841b DIST matplotlib-3.6.2.tar.gz 35843927 BLAKE2B 22b933b2ca2bfb156ee1592f522da6e7566f279fd6c7ef2d2f5aeb8697fc04085b57ba6bb5f7948572b3e671687b74d6ba9f7def2728b6224fbc98b121281a3c SHA512 51b84a4328a85f674cb44728955fca8bb5b8b702c788158b8bcfc13a44206a5a658ac12ed8f9a5f6ec53ef543395fab4f3871f91013ba1432f3e2b848c36976f +DIST matplotlib-3.6.3.tar.gz 35868590 BLAKE2B aa511e7d82c41ff2b5622b23847c2e94ed5d400be74eddcdab12ddba8d25bcc1b778c5fb2a29935bca71b76cbf4213088286c9a6a3d085e06036069909ccc1e7 SHA512 844ca90bcc9953d3d1289a6d471180a3dadb49c75eb59858bbbfb67d4b1292b83b86b366f22ab12d9e97c980376d48b86e745607ec4e812a3010c6fec01398dc EBUILD matplotlib-3.5.3.ebuild 7442 BLAKE2B d836df9fd184d6f55100527f9ff037e8707e2dd23c76b69beeafcff68c78d1bbbfc3de803b1a7ccdb6e4231d56fd97366495f162f2f9d1142979febf282f4eb3 SHA512 524ced6de727064ed0d2171dc410af864621842d189436941d90761abd3e7318d1704c7f8801ced1049235ab61c0548107805d3d6342f0dd3d085fe4fe657ced EBUILD matplotlib-3.6.1.ebuild 7340 BLAKE2B f4bb2e08203ab5bd159198e64292e508af8f135ff9ab58572e0fb86505a5edc66a021e545e4921f01db143cf0d8bd572a1ce1dcd4fbb0648262b3d6ca0ad400f SHA512 709b38bd54a6287cdc5b4ae6b96920dc02ffa6054c7ed9b2666b0b61e88f558af23cb2b43934777f8504a4aa4bb83753ee965b65428af0eda2bba89d12fbd360 EBUILD matplotlib-3.6.2.ebuild 7428 BLAKE2B 31fcc9b468aa5595855a15783171cee3af683b923533f2f6c0c27f24bd5782fc94fcdbb1156658a113dfe92f1393e5eb8dd43bb572ec6bc8285d0409b92f7e55 SHA512 13298946e4cb44b115b5e9efb13acf5cadbc5690d064aa04a7baa67b34e8e524d42b1f39dabd72cffc29332e6ae8a2e1b66d63dc99e5c3b0ca081afcc7c2fd20 +EBUILD matplotlib-3.6.3.ebuild 7473 BLAKE2B f9b2d24955c959494162a2fc12a4806bef19336f05d8c84a8c4a2b1b902b8e75aa6c735cc8a93efc371bef67c74c1f7bf8aa136577f865dad1481e7751ecba53 SHA512 f773bc9e85b9ff888c142027dc6a032db9e9a67087b194cdd24da955086d42978c76d69b5908b3fe16461f2d1b9f0c27807a442d09f5ac5dcc16f25ff8834128 MISC metadata.xml 1074 BLAKE2B 1d7dce116e09939378872c2eaf5153948b7e934626110eb4899d0dfc2781429522328f1c4efd2c40f829da64e19bed8f9fbd1b8907a6e74a5fd54587c1d29e5b SHA512 e344bfc813e09c24a8edfa9c062eb2a6c44535559370f508a27a2de20c6ab92aeb48bc8daf9c357178e513eb2474a33782e4098c0f3bcbb84b11f7388ef1a704 diff --git a/dev-python/matplotlib/files/matplotlib-3.6.3-test.patch b/dev-python/matplotlib/files/matplotlib-3.6.3-test.patch new file mode 100644 index 000000000000..176f2f03c5c9 --- /dev/null +++ b/dev-python/matplotlib/files/matplotlib-3.6.3-test.patch @@ -0,0 +1,25 @@ +From 28294f8dc7305707c6e9a481c42416b2fb5714a1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Thu, 12 Jan 2023 06:39:23 +0100 +Subject: [PATCH] Increase more tolerances + +--- + lib/matplotlib/tests/test_lines.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/matplotlib/tests/test_lines.py b/lib/matplotlib/tests/test_lines.py +index e83a90ccb1..ddba36333f 100644 +--- a/lib/matplotlib/tests/test_lines.py ++++ b/lib/matplotlib/tests/test_lines.py +@@ -166,7 +166,7 @@ def test_set_drawstyle(): + + + @image_comparison(['line_collection_dashes'], remove_text=True, style='mpl20', +- tol=0.62) ++ tol=0.65) + def test_set_line_coll_dash_image(): + fig, ax = plt.subplots() + np.random.seed(0) +-- +2.39.0 + diff --git a/dev-python/matplotlib/matplotlib-3.6.3.ebuild b/dev-python/matplotlib/matplotlib-3.6.3.ebuild new file mode 100644 index 000000000000..5815c0dee7bc --- /dev/null +++ b/dev-python/matplotlib/matplotlib-3.6.3.ebuild @@ -0,0 +1,281 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_REQ_USE='tk?,threads(+)' + +inherit distutils-r1 flag-o-matic multiprocessing prefix toolchain-funcs \ + virtualx + +FT_PV=2.6.1 +DESCRIPTION="Pure python plotting library with matlab like syntax" +HOMEPAGE=" + https://matplotlib.org/ + https://github.com/matplotlib/matplotlib/ + https://pypi.org/project/matplotlib/ +" +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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~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/contourpy-1.0.1[${PYTHON_USEDEP}] + >=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}] + >=dev-python/fonttools-4.22.0[${PYTHON_USEDEP}] + >=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}] + >=dev-python/numpy-1.19[${PYTHON_USEDEP}] + >=dev-python/packaging-20.0[${PYTHON_USEDEP}] + >=dev-python/pillow-7.1.1[jpeg,webp,${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}] + media-fonts/dejavu + media-fonts/stix-fonts + media-libs/freetype:2 + media-libs/libpng:0 + >=media-libs/qhull-2013:= + virtual/imagemagick-tools[jpeg,tiff] + 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? ( + >=dev-python/tornado-6.0.4[${PYTHON_USEDEP}] + ) + wxwidgets? ( + $(python_gen_cond_dep ' + dev-python/wxpython:*[${PYTHON_USEDEP}] + ' python3_{8..10}) + ) +" + +BDEPEND=" + ${RDEPEND} + >=dev-python/setuptools_scm-7[${PYTHON_USEDEP}] + dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}] + 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/mock[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + >=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}] + >=dev-python/tornado-6.0.4[${PYTHON_USEDEP}] + x11-libs/gtk+:3[introspection] + ) +" + +distutils_enable_tests pytest + +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 + + # Affects installed _version.py, bug #854600 + export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} + + local PATCHES=( + "${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch + "${FILESDIR}"/matplotlib-3.6.2-test.patch + "${FILESDIR}"/matplotlib-3.6.3-test.patch + ) + + sed \ + -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \ + -i lib/matplotlib/{mathtext,fontconfig_pattern}.py \ + || die "sed pyparsing failed" + sed -i -e '/setuptools_scm/s:,<7::' setup.py || die + + hprefixify setupext.py + + rm -rf libqhull || 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 + + unset DISPLAY # bug #278524 + export XDG_RUNTIME_DIR="${T}/runtime-dir" + mkdir "${XDG_RUNTIME_DIR}" || die + chmod 0700 "${XDG_RUNTIME_DIR}" || die +} + +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 = True + [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 + find "${BUILD_DIR}" -name '*.pth' -delete || die +} + +python_compile_all() { + if use doc; then + cd doc || die + + VARTEXFONTS="${T}"/fonts \ + emake SPHINXOPTS= O=-Dplot_formats=png:100 html + fi +} + +src_test() { + mkdir build || die + ln -s "${WORKDIR}/freetype-${FT_PV}" build/ || die + virtx distutils-r1_src_test +} + +python_test() { + local EPYTEST_DESELECT=( + # broken by -Wdefault + "tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg6-MatplotlibDeprecationWarning]" + "tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg7-MatplotlibDeprecationWarning]" + tests/test_testing.py::test_warn_to_fail + # TODO? + tests/test_backend_qt.py::test_fig_sigint_override + ) + [[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=( + # https://github.com/matplotlib/matplotlib/issues/23384 + "tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtagg', 'QT_API': 'PyQt5'}]" + "tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtcairo', 'QT_API': 'PyQt5'}]" + ) + + # 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 + + esetup.py build -j1 --build-lib="${BUILD_DIR}"/test-lib + local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH} + + # speed tests up + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + nonfatal epytest --pyargs matplotlib -m "not network" \ + -p xdist.plugin -n "$(makeopts_jobs)" || die +} + +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 +} -- cgit v1.2.3