diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-05-02 23:23:40 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-05-02 23:23:40 +0100 |
| commit | f20958f66a5e97c92cc44354e07e3e3089dfc23d (patch) | |
| tree | fbf2993fb14c0f373d35922030b711e3fda4f864 /dev-python/mrcfile | |
| parent | e805507c58bab294dddb75f6fc9b551d9d92de86 (diff) | |
gentoo auto-resync : 02:05:2023 - 23:23:39
Diffstat (limited to 'dev-python/mrcfile')
| -rw-r--r-- | dev-python/mrcfile/Manifest | 3 | ||||
| -rw-r--r-- | dev-python/mrcfile/files/mrcfile-1.4.3-test-assertion-error.patch | 25 | ||||
| -rw-r--r-- | dev-python/mrcfile/mrcfile-1.4.3.ebuild | 5 |
3 files changed, 32 insertions, 1 deletions
diff --git a/dev-python/mrcfile/Manifest b/dev-python/mrcfile/Manifest index 6d0494afe418..cffc2e4ab581 100644 --- a/dev-python/mrcfile/Manifest +++ b/dev-python/mrcfile/Manifest @@ -1,3 +1,4 @@ +AUX mrcfile-1.4.3-test-assertion-error.patch 1046 BLAKE2B 87a3c16f27c7b11ccc71655570c17c3fd37e1fec396d82a1fd3ca98ff5527167794cb1cf5dabeb680bdbe80c8da6ce56b707416c571702685fb6e2ac20c72a83 SHA512 432b3743e2c1e2c8820a02fd51b681ea1a3ca30573b8f110fbdcac723cc90c2edb939186c1bbbdbf82b3110693a64361a1a4b2cb87cf019938fb50a65edae329 DIST mrcfile-1.4.3.gh.tar.gz 148147024 BLAKE2B aa604965e6e40a25f57ec61bb3a3fc2fc6a83827db11620678138bec893539502a8e00e6e279e3bb86805773201338f430cc4d7d4b60efaee2d36933f071132e SHA512 e4bdc9b03ea55ae6bcaf29d8f8154e941f7e8b780f924a3265156a25bfa7f7a6f88abb3ce4374208104a4a3eea8d18724a248aae9fea2018a24ae559680ac2b7 -EBUILD mrcfile-1.4.3.ebuild 552 BLAKE2B 7aa114f696eb59bd8c4836efe6be9cdea1cadb125ade6817bc7c82fd2f17a807550fa292be250e4be85509a800ae113897a71ffaab624c599475cf5e16cc05a0 SHA512 603d410132ab9781401e2e1274293b9908ea01502048d67b857d869ff8572b330619a68efb6160ee8abd5990c302e741481ca0040bdcdd09877306404b6604fb +EBUILD mrcfile-1.4.3.ebuild 658 BLAKE2B 35a22644e62d8e9d22f6297c688c2a8b6a8d63f53a9b477664ac770aaee4b9bd419fe3af136bf18e673b433e6ee983beeff9d62009647c3e2883fb771fa60cb9 SHA512 8008671418ae99b012e41002992fb43643de0093447496a2c6bb809e15cbe2653062c1762b7319648163aad6ff9c897d0e8ba3a0fc4ce18297a4c84e3f09bf62 MISC metadata.xml 388 BLAKE2B 7327577122145fab2e580fa79005b7be4a61c6e65c68433230b737f5bd3e988150999bab5b9f4ee7878a9757a40133796a7b15b80c023f585f0c6c1fb30af730 SHA512 55efedf64a9fdf287874eb9345b3bfad5a4281c98e46b4fd43a4ba2f1a3ca5af68c1047779bf811679ff953e54adb4b3bc32fd97f137287ed291e89fafb2ffd6 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" +) |