From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: Re: [PATCH 05/16] gnu: Add python-testpath. Date: Fri, 4 Nov 2016 11:25:02 +0100 Message-ID: <87oa1va6f5.fsf@mdc-berlin.de> References: <20161101122046.751-1-ricardo.wurmus@mdc-berlin.de> <20161101122046.751-6-ricardo.wurmus@mdc-berlin.de> <87d1ifmif0.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:51558) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c2bgR-0004Hz-TA for guix-devel@gnu.org; Fri, 04 Nov 2016 06:25:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c2bgO-0001Xr-La for guix-devel@gnu.org; Fri, 04 Nov 2016 06:25:15 -0400 In-Reply-To: <87d1ifmif0.fsf@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Roel Janssen Cc: guix-devel@gnu.org Roel Janssen writes: > Ricardo Wurmus writes: > >> * gnu/packages/python.scm (python-testpath, python2-testpath): New >> variables. >> --- >> gnu/packages/python.scm | 42 ++++++++++++++++++++++++++++++++++++++++= ++ >> 1 file changed, 42 insertions(+) >> >> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm >> index 9785b5e..e6f537e 100644 >> --- a/gnu/packages/python.scm >> +++ b/gnu/packages/python.scm >> @@ -4583,6 +4583,48 @@ installing kernelspecs for use with Jupyter fro= ntends.") >> (define-public python2-ipykernel >> (package-with-python2 python-ipykernel)) >> =20 >> + > > I don't think two blank lines are needed here. You=E2=80=99re right! That=E2=80=99s a rebase error. Due to the number = of dependency cycles I had the packages in a different order before. ~~ Ricardo