mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-04 13:47:35 -08:00
dev-python/cython: workaround parallel install race for importing pythran
An empty directory in site-packages is a valid Python module, unfortunately, because of namespaces. If installing packages in parallel, the pythran module might "exist" but be empty (hence no __version__ attribute). Catch AttributeError to avoid a narrow race. This might still be a Portage issue if there's a substantial delay between creating the directory and installing the remaining files though. Thanks to Eli Schwartz for helping out. Bug: https://bugs.gentoo.org/902713 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
parent
5e4c1eaf5f
commit
9e9a93ca1c
91
dev-python/cython/cython-0.29.33-r1.ebuild
Normal file
91
dev-python/cython/cython-0.29.33-r1.ebuild
Normal file
@ -0,0 +1,91 @@
|
||||
# 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_{9..11} pypy3 )
|
||||
PYTHON_REQ_USE="threads(+)"
|
||||
|
||||
inherit distutils-r1 toolchain-funcs elisp-common
|
||||
|
||||
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}.tar.gz
|
||||
-> ${P}.gh.tar.gz
|
||||
"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
|
||||
IUSE="emacs test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
emacs? ( >=app-editors/emacs-23.1:* )
|
||||
"
|
||||
BDEPEND="
|
||||
${RDEPEND}
|
||||
test? (
|
||||
$(python_gen_cond_dep '
|
||||
dev-python/numpy[${PYTHON_USEDEP}]
|
||||
' python3_{8..10})
|
||||
)
|
||||
"
|
||||
|
||||
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"
|
||||
)
|
||||
|
||||
SITEFILE=50cython-gentoo.el
|
||||
|
||||
distutils_enable_sphinx docs
|
||||
|
||||
python_compile() {
|
||||
# Python gets confused when it is in sys.path before build.
|
||||
local -x PYTHONPATH=
|
||||
|
||||
distutils-r1_python_compile
|
||||
}
|
||||
|
||||
python_compile_all() {
|
||||
use emacs && elisp-compile Tools/cython-mode.el
|
||||
}
|
||||
|
||||
python_test() {
|
||||
if has "${EPYTHON}" pypy3 python3.11; then
|
||||
einfo "Skipping tests on ${EPYTHON} (xfail)"
|
||||
return
|
||||
fi
|
||||
|
||||
tc-export CC
|
||||
# https://github.com/cython/cython/issues/1911
|
||||
local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
|
||||
"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests ||
|
||||
die "Tests fail with ${EPYTHON}"
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
|
||||
distutils-r1_python_install_all
|
||||
|
||||
if use emacs; then
|
||||
elisp-install ${PN} Tools/cython-mode.*
|
||||
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
@ -0,0 +1,20 @@
|
||||
An empty directory in site-packages is a valid Python module, unfortunately, because
|
||||
of namespaces. If installing packages in parallel, the pythran module might "exist"
|
||||
but be empty (hence no __version__ attribute). Catch AttributeError to avoid a narrow
|
||||
race.
|
||||
|
||||
See https://bugs.gentoo.org/902713.
|
||||
|
||||
This might still be a Portage issue if there's a substantial delay between creating
|
||||
the directory and installing the remaining files though.
|
||||
--- a/Cython/Compiler/Pythran.py
|
||||
+++ b/Cython/Compiler/Pythran.py
|
||||
@@ -10,7 +10,7 @@ try:
|
||||
import pythran
|
||||
pythran_is_pre_0_9 = tuple(map(int, pythran.__version__.split('.')[0:2])) < (0, 9)
|
||||
pythran_is_pre_0_9_6 = tuple(map(int, pythran.__version__.split('.')[0:3])) < (0, 9, 6)
|
||||
-except ImportError:
|
||||
+except (AttributeError, ImportError):
|
||||
pythran = None
|
||||
pythran_is_pre_0_9 = True
|
||||
pythran_is_pre_0_9_6 = True
|
||||
Loading…
x
Reference in New Issue
Block a user