From patchwork Thu Jan 3 21:34:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 654 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5C9CD16A01; Thu, 3 Jan 2019 21:36:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mira.cbaines.net (Postfix) with ESMTP id 173C9169FC for ; Thu, 3 Jan 2019 21:36:18 +0000 (GMT) Received: from localhost ([127.0.0.1]:58017 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gfAf3-0006fo-I6 for patchwork@mira.cbaines.net; Thu, 03 Jan 2019 16:36:17 -0500 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 X-Loop: help-debbugs@gnu.org Subject: [bug#33759] [PATCH v2 3/5] gnu: python-2.7: Include /lib/python.../test/support. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Jan 2019 21:35:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33759 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33759@debbugs.gnu.org Received: via spool by 33759-submit@debbugs.gnu.org id=B33759.15465512963493 (code B ref 33759); Thu, 03 Jan 2019 21:35:03 +0000 Received: (at 33759) by debbugs.gnu.org; 3 Jan 2019 21:34:56 +0000 Received: from localhost ([127.0.0.1]:46018 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gfAdk-0000uB-Bl for submit@debbugs.gnu.org; Thu, 03 Jan 2019 16:34:56 -0500 Received: from li622-129.members.linode.com ([212.71.249.129]:56808 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gfAdh-0000tW-Tf for 33759@debbugs.gnu.org; Thu, 03 Jan 2019 16:34:55 -0500 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 1A9A616A0B for <33759@debbugs.gnu.org>; Thu, 3 Jan 2019 21:34:53 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 71742858 for <33759@debbugs.gnu.org>; Thu, 3 Jan 2019 21:34:52 +0000 (UTC) From: Christopher Baines Date: Thu, 3 Jan 2019 21:34:50 +0000 Message-Id: <20190103213452.1829-3-mail@cbaines.net> X-Mailer: git-send-email 2.20.1 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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))