From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57079) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gfAdw-0005fE-G8 for guix-patches@gnu.org; Thu, 03 Jan 2019 16:35:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gfAds-00049c-Pq for guix-patches@gnu.org; Thu, 03 Jan 2019 16:35:08 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:59850) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gfAdr-00049A-GM for guix-patches@gnu.org; Thu, 03 Jan 2019 16:35:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gfAdr-0000v5-Bq for guix-patches@gnu.org; Thu, 03 Jan 2019 16:35:03 -0500 Subject: [bug#33759] [PATCH v2 3/5] gnu: python-2.7: Include /lib/python.../test/support. Resent-Message-ID: From: Christopher Baines Date: Thu, 3 Jan 2019 21:34:50 +0000 Message-Id: <20190103213452.1829-3-mail@cbaines.net> In-Reply-To: <20190103213452.1829-1-mail@cbaines.net> References: <20181215121700.11320-1-mail@cbaines.net> <20190103213452.1829-1-mail@cbaines.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 33759@debbugs.gnu.org Don't remove the support directory from the /lib/python.../test/ directory, as this is used from the test_support module. /gnu/store/...-python2-2.7.15/lib/python2.7/test/test_support.py:2: in import test.support E ImportError: No module named support * gnu/packages/python.scm (python-2.7)[arguments]: Change the 'remove-tests phase to not remove the support directory. --- gnu/packages/python.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 852beb73da..550643adb8 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -260,12 +260,9 @@ (scandir testdir (match-lambda ((or "." "..") #f) + ("support" #f) (file (not - ;; FIXME: Add the 'support' directory - ;; in the next rebuild cycle, since it - ;; moved in 2.7.14. See also - ;; python2-futures below. (string-prefix? "test_support." file)))))) (call-with-output-file "__init__.py" (const #t)) -- 2.20.1