commit:     1aafbb4cdaf3067e41a772660b28dc1843ae4e8d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 12 10:34:41 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Apr 12 11:29:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aafbb4c

dev-lang/python: Fix test failure due to importing numpy in 3.8+

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-lang/python/files/test-__all__-numpy.patch | 13 +++++++++++++
 dev-lang/python/python-3.8.2-r1.ebuild         |  2 ++
 dev-lang/python/python-3.9.0_alpha5.ebuild     |  2 ++
 3 files changed, 17 insertions(+)

diff --git a/dev-lang/python/files/test-__all__-numpy.patch 
b/dev-lang/python/files/test-__all__-numpy.patch
new file mode 100644
index 00000000000..1b91abbf6f6
--- /dev/null
+++ b/dev-lang/python/files/test-__all__-numpy.patch
@@ -0,0 +1,13 @@
+diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py
+index c077881511..0728bef6c4 100644
+--- a/Lib/test/test___all__.py
++++ b/Lib/test/test___all__.py
+@@ -71,6 +71,8 @@ class AllTest(unittest.TestCase):
+         blacklist = set([
+             # Will raise a SyntaxError when compiling the exec statement
+             '__future__',
++            # imports numpy which causes warnings
++            'test.test_pickletools',
+         ])
+ 
+         if not sys.platform.startswith('java'):

diff --git a/dev-lang/python/python-3.8.2-r1.ebuild 
b/dev-lang/python/python-3.8.2-r1.ebuild
index 35d43534599..d6b9c2e9ec3 100644
--- a/dev-lang/python/python-3.8.2-r1.ebuild
+++ b/dev-lang/python/python-3.8.2-r1.ebuild
@@ -67,6 +67,8 @@ src_prepare() {
        local PATCHES=(
                "${WORKDIR}/${PATCHSET}"
                "${FILESDIR}/test.support.unlink-ignore-PermissionError.patch"
+               # add module importing numpy to blacklist
+               "${FILESDIR}/test-__all__-numpy.patch"
        )
 
        default

diff --git a/dev-lang/python/python-3.9.0_alpha5.ebuild 
b/dev-lang/python/python-3.9.0_alpha5.ebuild
index 49d4c9d5f87..2e9353ebaf6 100644
--- a/dev-lang/python/python-3.9.0_alpha5.ebuild
+++ b/dev-lang/python/python-3.9.0_alpha5.ebuild
@@ -83,6 +83,8 @@ src_prepare() {
        local PATCHES=(
                "${WORKDIR}/${PATCHSET}"
                "${FILESDIR}/test.support.unlink-ignore-PermissionError.patch"
+               # add module importing numpy to blacklist
+               "${FILESDIR}/test-__all__-numpy.patch"
        )
 
        default

Reply via email to