From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 33D061382C5 for ; Sun, 20 Jun 2021 14:37:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7584AE075F; Sun, 20 Jun 2021 14:37:39 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4B6CEE075F for ; Sun, 20 Jun 2021 14:37:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0BCE633D7E3 for ; Sun, 20 Jun 2021 14:37:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 44E097B4 for ; Sun, 20 Jun 2021 14:37:36 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1624199853.2bfa0a710b397bc24aacb5d4ba81d8f85e175d24.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/matplotlib/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/matplotlib/Manifest dev-python/matplotlib/matplotlib-3.4.2.ebuild X-VCS-Directories: dev-python/matplotlib/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 2bfa0a710b397bc24aacb5d4ba81d8f85e175d24 X-VCS-Branch: master Date: Sun, 20 Jun 2021 14:37:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0a9c5e45-14ea-4490-bc9b-6b9473fadfcc X-Archives-Hash: 2d6c50cec40a6828146c102952a403a1 commit: 2bfa0a710b397bc24aacb5d4ba81d8f85e175d24 Author: Michał Górny gentoo org> AuthorDate: Sun Jun 20 13:31:51 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Jun 20 14:37:33 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bfa0a71 dev-python/matplotlib: Bump to 3.4.2 Signed-off-by: Michał Górny gentoo.org> dev-python/matplotlib/Manifest | 1 + dev-python/matplotlib/matplotlib-3.4.2.ebuild | 279 ++++++++++++++++++++++++++ 2 files changed, 280 insertions(+) diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest index 6825d784117..1966957b6f1 100644 --- a/dev-python/matplotlib/Manifest +++ b/dev-python/matplotlib/Manifest @@ -2,3 +2,4 @@ DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2 DIST matplotlib-3.3.4.tar.gz 37941665 BLAKE2B 77b86dc3ceec3695a0d749197bcec684893d237da1aaf8778d9dc2038da1ba56b757bbce94efcf215ac30f35420b77e0a0e75ebb75b6d2cde5146d8a35ee25e7 SHA512 aadfe3db4edde9940b9e15daf1b6c5f237d3a6f38610956ceee994f919d711fce818ea12be4db18aa2a8638c4e8f434d79541fecaa7233e233bf4c73792bc4c4 DIST matplotlib-3.4.0.tar.gz 37142983 BLAKE2B 64b23d5b9e93e6b319674cea06d0ad425def952e50e7cb163ae91ae0d4460872bb329144271472b7dc2d0ab0a742c9c93ea735dca60ee4b4aa569cb4350cca0b SHA512 880c1e1027c819a34f5528b96d1b730cdd6541aa23931aef4185406ecec971ec2f4c8ca374eced56e654e016652472f7abcd0aae977dd4f327b8c511983a2a1d DIST matplotlib-3.4.1.tar.gz 37253296 BLAKE2B e1dfd1b0d8bb0d3ed13ac03a5b3112a237c4b7ef3c82694ad6779c810bbd94c165bde88d00fad270d5da6e269d778b33f276620b51e1f134fa2c5b9dcb0a4f28 SHA512 076510ddd152a395fabb76aa47566e9b75f3c8ba3c5246b39229b20fbfc209d4bbdfd441271b22e364f0974963309c02bdd0519fc2a7e8a406afc462f69246b6 +DIST matplotlib-3.4.2.tar.gz 37308683 BLAKE2B b769244b3d7a7da9125f6b634e9340676d849322491390d1c9a0cec3dfce59a8b5b5c0b567575ae78212129f7303b6b1fbbf30ce7c8a23c43c1304e83c9c5f5e SHA512 d4798dd2d6c857db0fe6d4ec85ebabc028b78627311bab17f7b9b30f6aa61d5243114b1cfe9d83293ad66ae47df83add5272f032954990dfc04054a792049f2a diff --git a/dev-python/matplotlib/matplotlib-3.4.2.ebuild b/dev-python/matplotlib/matplotlib-3.4.2.ebuild new file mode 100644 index 00000000000..54f4fde613b --- /dev/null +++ b/dev-python/matplotlib/matplotlib-3.4.2.ebuild @@ -0,0 +1,279 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..9} ) +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 ~ppc ~ppc64 ~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[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-xetex + ) + qt5? ( + dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] + ) + webagg? ( + >=www-servers/tornado-6.0.4[${PYTHON_USEDEP}] + ) + wxwidgets? ( + dev-python/wxpython:*[${PYTHON_USEDEP}] + ) +" + +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}] + dev-texlive/texlive-latexextra + dev-texlive/texlive-fontsrecommended + dev-texlive/texlive-latexrecommended + >=media-gfx/graphviz-2.42.3[cairo] + ) + test? ( + dev-python/flaky[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + dev-python/pygobject: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 +}