| 1 |
commit: c18f8b7d41aa648870d658a6e12af7399e9a55a4 |
| 2 |
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 7 17:54:07 2022 +0000 |
| 4 |
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 7 17:55:34 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c18f8b7d |
| 7 |
|
| 8 |
sys-apps/pkgcore: (live) use flit instead of setuptools |
| 9 |
|
| 10 |
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-apps/pkgcore/pkgcore-9999.ebuild | 24 ++++++++++-------------- |
| 13 |
1 file changed, 10 insertions(+), 14 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild |
| 16 |
index 86ca28dcedd6..ad37b266d812 100644 |
| 17 |
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild |
| 18 |
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild |
| 19 |
@@ -3,7 +3,7 @@ |
| 20 |
|
| 21 |
EAPI=8 |
| 22 |
|
| 23 |
-DISTUTILS_USE_PEP517=setuptools |
| 24 |
+DISTUTILS_USE_PEP517=standalone |
| 25 |
PYTHON_COMPAT=( python3_{9..11} ) |
| 26 |
inherit distutils-r1 |
| 27 |
|
| 28 |
@@ -32,31 +32,27 @@ else |
| 29 |
RDEPEND+=" >=dev-python/snakeoil-0.10.1[${PYTHON_USEDEP}]" |
| 30 |
fi |
| 31 |
BDEPEND=" |
| 32 |
+ >=dev-python/flit_core-3.8[${PYTHON_USEDEP}] |
| 33 |
test? ( |
| 34 |
- >=dev-python/pytest-6[${PYTHON_USEDEP}] |
| 35 |
dev-vcs/git |
| 36 |
) |
| 37 |
" |
| 38 |
|
| 39 |
-distutils_enable_tests setup.py |
| 40 |
+distutils_enable_tests pytest |
| 41 |
+ |
| 42 |
+EPYTEST_DESELECT=( |
| 43 |
+ # fail because of forcing Gentoo's prefix |
| 44 |
+ tests/ebuild/test_eapi.py::TestEAPI::test_register |
| 45 |
+ tests/ebuild/test_eapi.py::TestEAPI::test_is_supported |
| 46 |
+) |
| 47 |
|
| 48 |
src_prepare() { |
| 49 |
# force Gentoo's prefix |
| 50 |
- sed -e "/INSTALL_PREFIX =/s@= .*\$@= '${EPREFIX}/usr'@" -i setup.py || die |
| 51 |
+ sed -e "/INSTALL_PREFIX =/s@= .*\$@= '${EPREFIX}/usr'@" -i py_build.py || die |
| 52 |
|
| 53 |
distutils-r1_src_prepare |
| 54 |
} |
| 55 |
|
| 56 |
-src_test() { |
| 57 |
- # With PYTHONDONTWRITEBYTECODE=, python will try rebuild all sorts of modules. |
| 58 |
- # https://bugs.gentoo.org/840266 |
| 59 |
- local -x SANDBOX_PREDICT=${SANDBOX_PREDICT} |
| 60 |
- addpredict / |
| 61 |
- |
| 62 |
- local -x PYTHONDONTWRITEBYTECODE= |
| 63 |
- distutils-r1_src_test |
| 64 |
-} |
| 65 |
- |
| 66 |
python_install_all() { |
| 67 |
local DOCS=( NEWS.rst ) |
| 68 |
[[ ${PV} == *9999 ]] || doman man/* |
Archives