From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Subject: bug#24450: [PATCHv2] bug#24450: pypi importer outputs strange character series in optional dependency case. Date: Mon, 01 Apr 2019 17:28:45 +0200 Message-ID: <87sgv1lp76.fsf@gnu.org> References: <87h99fipj1.fsf@we.make.ritual.n0.is> <87tvfm1eos.fsf@gmail.com> <877ech5cvd.fsf_-_@kwak.i-did-not-set--mail-host-address--so-tickle-me> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([209.51.188.92]:35859) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hAyrx-0004ga-Q4 for bug-guix@gnu.org; Mon, 01 Apr 2019 11:29:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hAyrw-0004FE-Vk for bug-guix@gnu.org; Mon, 01 Apr 2019 11:29:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54545) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hAyrw-0004F7-Qx for bug-guix@gnu.org; Mon, 01 Apr 2019 11:29:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hAyru-0004LR-BY for bug-guix@gnu.org; Mon, 01 Apr 2019 11:29:04 -0400 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <877ech5cvd.fsf_-_@kwak.i-did-not-set--mail-host-address--so-tickle-me> (T460s laptop's message of "Fri, 29 Mar 2019 22:12:38 -0400") List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: T460s laptop Cc: ng0 , 24450@debbugs.gnu.org Hi Maxim, T460s laptop skribis: > From 37e499d5d5d5f690aa0a065c730e13f6a31dd30d Mon Sep 17 00:00:00 2001 > From: Maxim Cournoyer > Date: Thu, 28 Mar 2019 23:12:26 -0400 > Subject: [PATCH] import: pypi: Include optional test inputs as native-inp= uts. > > * guix/import/pypi.scm (maybe-inputs): Add INPUT-TYPE argument, and use i= t. > (test-section?): New predicate. > (parse-requires.txt): Collect the optional test inputs, and return them a= s the > second element of the returned list. > (parse-wheel-metadata): Likewise. > (guess-requirements): Adapt, and hide unzip output. > (make-pypi-sexp): Likewise, and include the test inputs requirements as n= ative > inputs in the returned package expression. > > * tests/pypi.scm (test-requires.txt): Include a test section in the > test-requires.txt data. > (test-requires.txt-beaker): New variable. > ("parse-requires.txt"): Adapt. > ("parse-requires.txt - Beaker"): New test. > ("parse-wheel-metadata, with extras"): Adapt. > ("parse-wheel-metadata, with extras - Jedi"): Adapt. > ("pypi->guix-package, no wheel"): Re-indent, and add the expected > native-inputs. > ("pypi->guix-package, wheels"): Likewise. > ("pypi->guix-package, no usable requirement file."): New test. It seems that the patch does several unrelated things, such as silencing =E2=80=98unzip=E2=80=99, improving docstrings, handling inputs other than =E2=80=98propagated-inputs=E2=80=99, and correctly parsing wheels. Could you try to separate these as much as possible to simplify review? Thank you! Ludo=E2=80=99.