[gentoo-commits] repo/gentoo:master commit in: dev-python/mrcfile/files/, dev-python/mrcfile/

[gentoo-commits] repo/gentoo:master commit in: dev-python/mrcfile/files/, dev-python/mrcfile/

[Pacho Ramos]

commit:     e50f936c3b5f63ad22457240cecf48cfba3c1c28
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue May  2 19:18:43 2023 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue May  2 19:20:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e50f936c

dev-python/mrcfile: Apply Debian patch to allow tests to pass further

Upstream still didn't port the tests to work with latest numpy versions:
https://github.com/ccpem/mrcfile/issues/49

Debian maintainers modified the test meantime to pass until they are properly
fixed upstream.

Bug: https://bugs.gentoo.org/834884
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 .../files/mrcfile-1.4.3-test-assertion-error.patch | 25 ++++++++++++++++++++++
 dev-python/mrcfile/mrcfile-1.4.3.ebuild            |  5 +++++
 2 files changed, 30 insertions(+)

diff --git a/dev-python/mrcfile/files/mrcfile-1.4.3-test-assertion-error.patch b/dev-python/mrcfile/files/mrcfile-1.4.3-test-assertion-error.patch
new file mode 100644
index 000000000000..a68ffa562260
--- /dev/null
+++ b/dev-python/mrcfile/files/mrcfile-1.4.3-test-assertion-error.patch
@@ -0,0 +1,25 @@
+From: Roland Mas <lolando@debian.org>
+Date: Tue, 14 Feb 2023 15:49:05 +0100
+Subject: Comment out a failing test
+
+---
+ tests/test_mrcobject.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/tests/test_mrcobject.py b/tests/test_mrcobject.py
+index 276e9af..95b5591 100644
+--- a/tests/test_mrcobject.py
++++ b/tests/test_mrcobject.py
+@@ -338,7 +338,11 @@ class MrcObjectTest(AssertRaisesRegexMixin, unittest.TestCase):
+     def test_data_is_not_copied_unnecessarily(self):
+         data = np.arange(6, dtype=np.int16).reshape(1, 2, 3)
+         self.mrcobject.set_data(data)
+-        assert self.mrcobject.data is data
++        # Identity assertion fails with python3-numpy 1.24.2, so
++        # replace with an equality assertion assert
++        # This should be reverted eventually
++        # self.mrcobject.data is data
++        assert np.array_equal(self.mrcobject.data, data)
+     
+     def test_header_byte_order_is_unchanged_by_data_with_native_order(self):
+         data = np.arange(6, dtype=np.float32).reshape(3, 2)

diff --git a/dev-python/mrcfile/mrcfile-1.4.3.ebuild b/dev-python/mrcfile/mrcfile-1.4.3.ebuild
index 48c609b6c9c9..527f6481961d 100644
--- a/dev-python/mrcfile/mrcfile-1.4.3.ebuild
+++ b/dev-python/mrcfile/mrcfile-1.4.3.ebuild
@@ -27,3 +27,8 @@ RDEPEND="
 "
 
 distutils_enable_tests unittest
+
+PATCHES=(
+	# https://github.com/ccpem/mrcfile/issues/49
+	"${FILESDIR}/${P}-test-assertion-error.patch"
+)