From 5d5d9b4dcdab4adc68e5335455de34239c856748 Mon Sep 17 00:00:00 2001 From: icp Date: Sat, 8 Jul 2023 21:59:23 +0530 Subject: [PATCH 1/3] common/build-style/python3-module.sh: enable `PY_IGNORE_IMPORTMISMATCH` for testing Fixes `ImportMismatchError` for doctest-modules in pytest Ref: https://github.com/pytest-dev/pytest/issues/2042#issuecomment-381309723 --- common/build-style/python3-module.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/build-style/python3-module.sh b/common/build-style/python3-module.sh index b76d89c8b502a..8aec7a0e45902 100644 --- a/common/build-style/python3-module.sh +++ b/common/build-style/python3-module.sh @@ -12,7 +12,7 @@ do_check() { if python3 -c 'import xdist' >/dev/null 2>&1; then testjobs="-n $XBPS_MAKEJOBS" fi - PYTHONPATH="$(cd build/lib* && pwd)" \ + PYTHONPATH="$(cd build/lib* && pwd)" PY_IGNORE_IMPORTMISMATCH=1 \ ${make_check_pre} \ python3 -m pytest ${testjobs} ${make_check_args} ${make_check_target} else From 43503603b822b8c83be4792a359f7ee3ae3e9dd8 Mon Sep 17 00:00:00 2001 From: icp Date: Sat, 8 Jul 2023 22:00:55 +0530 Subject: [PATCH 2/3] common/build-style/python3-pep517.sh: enable `PY_IGNORE_IMPORTMISMATCH` for testing Fixes `ImportMismatchError` for doctest-modules in pytest Ref: https://github.com/pytest-dev/pytest/issues/2042#issuecomment-381309723 --- common/build-style/python3-pep517.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/build-style/python3-pep517.sh b/common/build-style/python3-pep517.sh index 5ec20dd117f8a..46ce6cf3699ff 100644 --- a/common/build-style/python3-pep517.sh +++ b/common/build-style/python3-pep517.sh @@ -33,7 +33,7 @@ do_check() { python3 -m installer --destdir "${testdir}" \ ${make_install_args} ${make_install_target:-dist/*.whl} - PATH="${testdir}/usr/bin:${PATH}" PYTHONPATH="${testdir}/${py3_sitelib}" \ + PATH="${testdir}/usr/bin:${PATH}" PYTHONPATH="${testdir}/${py3_sitelib}" PY_IGNORE_IMPORTMISMATCH=1 \ ${make_check_pre} pytest3 ${testjobs} ${make_check_args} ${make_check_target} } From 9f6f425d4a4ec9999295839f4220b3d399add334 Mon Sep 17 00:00:00 2001 From: icp Date: Sat, 8 Jul 2023 22:21:43 +0530 Subject: [PATCH 3/3] python3-keyring: remove redundant `PY_IGNORE_IMPORTMISMATCH` export --- srcpkgs/python3-keyring/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/python3-keyring/template b/srcpkgs/python3-keyring/template index e04682c8ec5d4..20bf6b03811c8 100644 --- a/srcpkgs/python3-keyring/template +++ b/srcpkgs/python3-keyring/template @@ -14,7 +14,6 @@ homepage="https://pypi.org/project/keyring/" changelog="https://raw.githubusercontent.com/jaraco/keyring/main/NEWS.rst" distfiles="${PYPI_SITE}/k/keyring/keyring-${version}.tar.gz" checksum=ca0746a19ec421219f4d713f848fa297a661a8a8c1504867e55bfb5e09091509 -make_check_pre="env PY_IGNORE_IMPORTMISMATCH=1" pre_check() { vsed -e '/addopts/d' -i pytest.ini