commit: e1e8c193a6ce07f105dc3767bed420b7010eefd9 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Jul 28 11:07:23 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jul 28 11:07:23 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1e8c193
dev-python/cython: backport --version fix Closes: https://bugs.gentoo.org/911333 Thanks-to: Eli Schwartz <eschwartz93 <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> dev-python/cython/cython-3.0.0-r1.ebuild | 85 ++++++++++++++++++++++ .../files/cython-3.0.0-version-stderr-stdout.patch | 35 +++++++++ 2 files changed, 120 insertions(+) diff --git a/dev-python/cython/cython-3.0.0-r1.ebuild b/dev-python/cython/cython-3.0.0-r1.ebuild new file mode 100644 index 000000000000..5455a20d026a --- /dev/null +++ b/dev-python/cython/cython-3.0.0-r1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_TESTED=( python3_{10..11} ) +PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_12 pypy3 ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 multiprocessing toolchain-funcs + +MY_P=${P/_rc/rc} +DESCRIPTION="A Python to C compiler" +HOMEPAGE=" + https://cython.org/ + https://github.com/cython/cython/ + https://pypi.org/project/Cython/ +" +SRC_URI=" + https://github.com/cython/cython/archive/${PV/_rc/rc}.tar.gz + -> ${MY_P}.gh.tar.gz +" +S=${WORKDIR}/${MY_P} + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + ${RDEPEND} + test? ( + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + ' python3_{10..11}) + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch" + "${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch" + "${FILESDIR}/${PN}-0.29.23-pythran-parallel-install.patch" + "${FILESDIR}/${P}-version-stderr-stdout.patch" +) + +distutils_enable_sphinx docs \ + dev-python/jinja \ + dev-python/sphinx-issues \ + dev-python/sphinx-tabs + +python_compile() { + # Python gets confused when it is in sys.path before build. + local -x PYTHONPATH= + + distutils-r1_python_compile +} + +python_test() { + if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then + einfo "Skipping tests on ${EPYTHON} (xfail)" + return + fi + + # Needed to avoid confusing cache tests + unset CYTHON_FORCE_REGEN + + tc-export CC + # https://github.com/cython/cython/issues/1911 + local -x CFLAGS="${CFLAGS} -fno-strict-overflow" + "${PYTHON}" runtests.py \ + -vv \ + -j "$(makeopts_jobs)" \ + --work-dir "${BUILD_DIR}"/tests \ + --no-examples \ + --no-code-style \ + || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt ) + distutils-r1_python_install_all +} diff --git a/dev-python/cython/files/cython-3.0.0-version-stderr-stdout.patch b/dev-python/cython/files/cython-3.0.0-version-stderr-stdout.patch new file mode 100644 index 000000000000..7a12c6eead53 --- /dev/null +++ b/dev-python/cython/files/cython-3.0.0-version-stderr-stdout.patch @@ -0,0 +1,35 @@ +https://bugs.gentoo.org/911333 +https://github.com/cython/cython/pull/5572 +https://github.com/cython/cython/commit/ca69b359b040bf6c0fc90692bbea3bdd9d7877e6 + +From ca69b359b040bf6c0fc90692bbea3bdd9d7877e6 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <[email protected]> +Date: Fri, 28 Jul 2023 06:52:03 -0400 +Subject: [PATCH] Only write the version to stderr, if it's a separate file + descriptor from stdout (GH-5572) + +At least one project tries to detect the Cython version by redirecting stderr to +stdout and capturing it. This is done in pure POSIX shell, so it probably seemed +like the simple and obvious solution for a less capable programming language +given that no output at all was expected on stdout. + +But the result is that the version number appears twice, and then gets misparsed +and ends up triggering bad assumptions in the code running cython. + +It turns out that it's pretty easy to just print once, though. Detect when +stdout and stderr are redirected to the same location, and only print once. + +See https://github.com/cython/cython/issues/5504 +Fixes https://bugs.gentoo.org/911333 +--- a/Cython/Compiler/Main.py ++++ b/Cython/Compiler/Main.py +@@ -776,7 +776,7 @@ def main(command_line = 0): + print("Cython version %s" % __version__) + # For legacy reasons, we also write the version to stderr. + # New tools should expect it in stdout, but existing ones still pipe from stderr. +- if not sys.stderr.isatty(): ++ if not sys.stderr.isatty() and os.fstat(1) != os.fstat(2): + sys.stderr.write("Cython version %s\n" % __version__) + if options.working_path!="": + os.chdir(options.working_path) +
