From patchwork Mon Apr 25 03:56:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 38830 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 BB02027BBEA; Mon, 25 Apr 2022 05:17:01 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3800B27BBE9 for ; Mon, 25 Apr 2022 05:17:01 +0100 (BST) Received: from localhost ([::1]:38978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1niq9k-0005g3-Ax for patchwork@mira.cbaines.net; Mon, 25 Apr 2022 00:17:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38532) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nipus-0007oW-4c for guix-patches@gnu.org; Mon, 25 Apr 2022 00:01:52 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38676) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nipuh-0001O2-Re for guix-patches@gnu.org; Mon, 25 Apr 2022 00:01:31 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nipuh-00084C-PF for guix-patches@gnu.org; Mon, 25 Apr 2022 00:01:27 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55104] [PATCH 047/232] gnu: python-importlib-metadata: Update to 4.11.3. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Apr 2022 04:01:27 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55104 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55104@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 55104-submit@debbugs.gnu.org id=B55104.165085927830874 (code B ref 55104); Mon, 25 Apr 2022 04:01:27 +0000 Received: (at 55104) by debbugs.gnu.org; 25 Apr 2022 04:01:18 +0000 Received: from localhost ([127.0.0.1]:60785 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nipuX-00081d-NH for submit@debbugs.gnu.org; Mon, 25 Apr 2022 00:01:18 -0400 Received: from mail-qk1-f170.google.com ([209.85.222.170]:40941) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1niptd-0007nz-IO for 55104@debbugs.gnu.org; Mon, 25 Apr 2022 00:00:23 -0400 Received: by mail-qk1-f170.google.com with SMTP id e128so9967634qkd.7 for <55104@debbugs.gnu.org>; Sun, 24 Apr 2022 21:00:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=W2ndXJgJiWzxRqlwaNKv4fMP5ejdpNgu4pkasL3YoSg=; b=K+Acc6Abxs7Kp9vxQ6WqJ2mfuNpC6i78rJrn4yGYDH4vcY+tt/lWwbMPgYgC/BMtAH kbq1IDUMJ6mIzal2Tbfk3pDxhS50qwqdQcOtZqi6qN447+cWV+MAf5RXh6/wD6Hnq6oK JJJJQ2AKQoRweadeDQ2HD5oEQ4R2Xj1w+WGW1cQ9eE5z7rc1Z7sn7dGnAB1U64HdZMih 07E61co07bdqauH1epmT5S75erHhSX5DItnM8hKipeVDIjgXbNkqMkrnyLzqpwHGZQh8 ATYW+NEZTTfdkRQfOKN/DloRW3Irv1vjbNIlSSaIlj8QA0jyaYKI6R5BPCxlsHxC9nyU 7j7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=W2ndXJgJiWzxRqlwaNKv4fMP5ejdpNgu4pkasL3YoSg=; b=hi/vciIKuCcl/yxH0KQ9yUVb1uEIImY7NGtOcaqIA2M1RLrkuGN8uBmEt8KKfY5Pz+ p9qhXppitl2Dka+ghSZVYBZSngOZ7sPFuugHq66OK1CrbamQMTwjPxGrJhRBJtWKkMkB 4qjb0poMJ7OLaIB5hlMT0wicUq4fQJe42CTgr2k2wGSEiYcPQSm/ZOiVEPGRkIS2VfNV Ex+er+6HdqGagYpgp8YOSdxBCsLTGfIf6IwXf3TgYpYOG31MPqfON/rTfTcV61qEKbnP 1pLG00VKNZtcyzJTbxFM6ARliNzIReAh3cZ4aOaEhg10RWRRadrJO9Hr3fWAcbf3Q+9C cg2A== X-Gm-Message-State: AOAM530eyqwpwatF6QH1QfhhlEMJcoOmp0WJdvoMlPW6oal9FT9VVe4F RSLeCNt2qLFcSTyUO2MAabYDFlk0Ti2aPw== X-Google-Smtp-Source: ABdhPJzOZ1uYD3WhT2v8gZgxEaq+MTQszcFtReIUUIYQtJAi7NBYNLAoe9GZ/lZL1U80tyc1SVc58w== X-Received: by 2002:a37:63c7:0:b0:69e:5d71:e45c with SMTP id x190-20020a3763c7000000b0069e5d71e45cmr9119941qkb.620.1650859215826; Sun, 24 Apr 2022 21:00:15 -0700 (PDT) Received: from localhost.localdomain (dsl-150-232.b2b2c.ca. [66.158.150.232]) by smtp.gmail.com with ESMTPSA id w82-20020a376255000000b0069ee3f0ae63sm4478142qkb.45.2022.04.24.21.00.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Apr 2022 21:00:15 -0700 (PDT) From: Maxim Cournoyer Date: Sun, 24 Apr 2022 23:56:13 -0400 Message-Id: <20220425035918.25683-47-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220425035918.25683-1-maxim.cournoyer@gmail.com> References: <20220425035918.25683-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 * gnu/packages/python-xyz.scm (python-importlib-metadata): Update to 4.11.3. [phases]{build, install, check}: Override phases. [native-inputs]: Remove python-packaging. Add python-pypa-build and python-pytest. (python2-importlib-metadata): Adjust to keep unchanged. --- gnu/packages/python-xyz.scm | 68 +++++++++++++++++++++++++++---------- 1 file changed, 50 insertions(+), 18 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0c0d46eb5a..844724afb5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8376,19 +8376,41 @@ (define-public python2-importlib-resources-bootstrap (define-public python-importlib-metadata (package (name "python-importlib-metadata") - (version "1.5.0") + (version "4.11.3") (source (origin (method url-fetch) (uri (pypi-uri "importlib_metadata" version)) (sha256 (base32 - "00ikdj4gjhankdljnz7g5ggak4k9lql2926x0x117ir9j2lv7x86")))) + "0f951zynlh39yicqnhrs3p1qa5p3g6ajjfcggf12y51ppxz5jk7a")))) (build-system python-build-system) - (propagated-inputs - (list python-zipp)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + ;; XXX: PEP 517 manual build/install procedures copied from + ;; python-isort. + (replace 'build + (lambda _ + ;; ZIP does not support timestamps before 1980. + (setenv "SOURCE_DATE_EPOCH" "315532800") + (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((whl (car (find-files "dist" "\\.whl$")))) + (invoke "pip" "--no-cache-dir" "--no-input" + "install" "--no-deps" "--prefix" #$output whl)))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv" "tests"))))))) + (propagated-inputs (list python-zipp)) (native-inputs - (list python-setuptools-scm python-pyfakefs python-packaging)) + (list python-pypa-build + python-pyfakefs + python-pytest + python-setuptools-scm)) (home-page "https://importlib-metadata.readthedocs.io/") (synopsis "Read metadata from Python packages") (description @@ -8404,19 +8426,29 @@ (define-public python-importlib-metadata (define-public python2-importlib-metadata (let ((base (package-with-python2 (strip-python2-variant python-importlib-metadata)))) - (package/inherit - base - (name "python2-importlib-metadata") - (native-inputs - `(("python-setuptools-scm" ,python2-setuptools-scm) - ("python-pyfakefs" ,python2-pyfakefs-bootstrap) - ("python-packaging" ,python2-packaging-bootstrap))) - (propagated-inputs - `(("python-configparser" ,python2-configparser) - ("python-contextlib2" ,python2-contextlib2) - ("python-importlib-resources" ,python2-importlib-resources) - ("python-pathlib2" ,python2-pathlib2) - ,@(package-propagated-inputs base)))))) + (package/inherit base + (name "python2-importlib-metadata") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "importlib_metadata" version)) + (sha256 + (base32 + "00ikdj4gjhankdljnz7g5ggak4k9lql2926x0x117ir9j2lv7x86")))) + (arguments (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) ;reset standard phases + #~%standard-phases))) + (native-inputs + `(("python-setuptools-scm" ,python2-setuptools-scm) + ("python-pyfakefs" ,python2-pyfakefs-bootstrap) + ("python-packaging" ,python2-packaging-bootstrap))) + (propagated-inputs + `(("python-configparser" ,python2-configparser) + ("python-contextlib2" ,python2-contextlib2) + ("python-importlib-resources" ,python2-importlib-resources) + ("python-pathlib2" ,python2-pathlib2) + ,@(package-propagated-inputs base)))))) ;; This package is used by python2-pytest, and thus must not depend on it. (define-public python2-importlib-metadata-bootstrap