From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6781215803E for ; Sun, 31 Dec 2023 08:53:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A27B2BC03D; Sun, 31 Dec 2023 08:53:48 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E7BD62BC03B for ; Sun, 31 Dec 2023 08:53:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B6AD333BDC5 for ; Sun, 31 Dec 2023 08:53:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6000714C6 for ; Sun, 31 Dec 2023 08:53:44 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1704012621.2743e3a94792e768d688acfcb407510c4842a22a.andrewammerlaan@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/nilearn/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-biology/nilearn/files/0.4.1-bundled_joblib_test.patch X-VCS-Directories: sci-biology/nilearn/files/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 2743e3a94792e768d688acfcb407510c4842a22a X-VCS-Branch: master Date: Sun, 31 Dec 2023 08:53:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cb534ff6-7a4a-46b8-b60e-db768e5fc4e7 X-Archives-Hash: 785ba8bfbd1f7e9e38688f16fe7f934b commit: 2743e3a94792e768d688acfcb407510c4842a22a Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sat Dec 30 17:53:20 2023 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Sun Dec 31 08:50:21 2023 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=2743e3a9 sci-biology/nilearn: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Andrew Ammerlaan gentoo.org> .../nilearn/files/0.4.1-bundled_joblib_test.patch | 39 ---------------------- 1 file changed, 39 deletions(-) diff --git a/sci-biology/nilearn/files/0.4.1-bundled_joblib_test.patch b/sci-biology/nilearn/files/0.4.1-bundled_joblib_test.patch deleted file mode 100644 index e229d25fb..000000000 --- a/sci-biology/nilearn/files/0.4.1-bundled_joblib_test.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/nilearn/input_data/tests/test_nifti_masker.py 2018-08-02 18:57:07.700111595 +0200 -+++ b/nilearn/input_data/tests/test_nifti_masker.py 2018-08-02 18:57:29.453556439 +0200 -@@ -219,36 +219,6 @@ - assert_raises(ValueError, masker.fit_transform, data_img) - - --def test_joblib_cache(): -- from sklearn.externals.joblib import hash, Memory -- mask = np.zeros((40, 40, 40)) -- mask[20, 20, 20] = 1 -- mask_img = Nifti1Image(mask, np.eye(4)) -- -- with testing.write_tmp_imgs(mask_img, create_files=True) as filename: -- masker = NiftiMasker(mask_img=filename) -- masker.fit() -- mask_hash = hash(masker.mask_img_) -- masker.mask_img_.get_data() -- assert_true(mask_hash == hash(masker.mask_img_)) -- -- # Test a tricky issue with memmapped joblib.memory that makes -- # imgs return by inverse_transform impossible to save -- cachedir = mkdtemp() -- try: -- masker.memory = Memory(cachedir=cachedir, mmap_mode='r', -- verbose=0) -- X = masker.transform(mask_img) -- # inverse_transform a first time, so that the result is cached -- out_img = masker.inverse_transform(X) -- out_img = masker.inverse_transform(X) -- out_img.to_filename(os.path.join(cachedir, 'test.nii')) -- finally: -- # enables to delete "filename" on windows -- del masker -- shutil.rmtree(cachedir, ignore_errors=True) -- -- - def test_mask_init_errors(): - # Errors that are caught in init - mask = NiftiMasker(mask_strategy='oops')