From patchwork Mon Apr 25 03:56:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 38866 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 C1D4327BBEA; Mon, 25 Apr 2022 05:23:29 +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 4AE5827BBE9 for ; Mon, 25 Apr 2022 05:23:29 +0100 (BST) Received: from localhost ([::1]:47066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1niqFz-00035i-1n for patchwork@mira.cbaines.net; Mon, 25 Apr 2022 00:23:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38844) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nipvT-0007zg-TA for guix-patches@gnu.org; Mon, 25 Apr 2022 00:02:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38776) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nipvS-0001jh-4x for guix-patches@gnu.org; Mon, 25 Apr 2022 00:02:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nipvS-0008D6-2R for guix-patches@gnu.org; Mon, 25 Apr 2022 00:02:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55104] [PATCH 068/232] gnu: python-setuptools: Update to 62.0.0. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Apr 2022 04:02:14 +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.165085931531262 (code B ref 55104); Mon, 25 Apr 2022 04:02:14 +0000 Received: (at 55104) by debbugs.gnu.org; 25 Apr 2022 04:01:55 +0000 Received: from localhost ([127.0.0.1]:60846 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nipv9-000884-6v for submit@debbugs.gnu.org; Mon, 25 Apr 2022 00:01:55 -0400 Received: from mail-qt1-f172.google.com ([209.85.160.172]:40612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nipts-0007rD-UF for 55104@debbugs.gnu.org; Mon, 25 Apr 2022 00:00:37 -0400 Received: by mail-qt1-f172.google.com with SMTP id o18so9571429qtk.7 for <55104@debbugs.gnu.org>; Sun, 24 Apr 2022 21:00:36 -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=4r59s70pJ5ZDTtbNNmy+IZn4x/rIgNm2a7jeSeOhvPM=; b=FIPfwy+3po+2aWM455YbjojQIjQXIsQ4KodokU4Ejw3Gr7PcDfKeiSOpz6kASmUY99 ykPfeta4KW38v2TEgPeqrLLI73cVW6UMn31SZeYfYhlkXItoSzJAyyb8i8MRaUy/8Knv mWhevebq5iFHS7/qozETJ4T48ARmoVA2Z6lnFQsN4NpIWsRvjHZED5b5c7TfSJJ+zjrL Or9mFOts7ZLYFuLOTBWaNw5WcfZeqERtx+ZTRi2mvc2yBrSzcow1l/N+UG0COW3A3SvA +rDXR4BgBK1jmBnvuWNYVrRjqoIf4MM/AlVzi5tKCcH4tfs0/bLVRUH1ncGeFbQCHwHk j1rA== 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=4r59s70pJ5ZDTtbNNmy+IZn4x/rIgNm2a7jeSeOhvPM=; b=JIFrlA78YwUf6CbsCq3dZKMVdzw2NOPb8+7ABUdLwz5GQDpmVgvIrAmk0pOLcQzfik b7kXfbO+hkOFVv0iIg6m44nqDS/9Fjx9ZId9RvzeIVIMveEdKKdws6O+gBDjUV6xuvNR 4m/xlY69nQyGs+okrXxe1kh7wWdQJkF9tOwrTz27tkbeH3LSLWq+jHxIZ8QPQ57o2L8U wEixbixDqNJricwN12krLgsy/EmO38x3ZfI4ocqRnrqr6PeMh2w8nkyOx7hvbyQlG9sj Nzyl88MygCEGey4AeMrrJ7Z8nu/dlwE2Oa0u6agD89e5dKFyeMd5Lk30ajrvDA0z0Fjm T3vg== X-Gm-Message-State: AOAM533ZyFZf+SFkAjgePAq/iz+YnLxnWlMKWYOhpFjS0EBY+cqMVqjA vCwlhRCRcaMQjRGxGLBEtzZdJjub+Wzlpw== X-Google-Smtp-Source: ABdhPJxfjxXAtDKViuhmYXKw3EsFOv12Tn/2YZViiR9dnX1Rj2HehHffZoMKS5KaiX2VA+Fx/ICsQQ== X-Received: by 2002:ac8:7a8a:0:b0:2f1:de6a:c044 with SMTP id x10-20020ac87a8a000000b002f1de6ac044mr10715432qtr.243.1650859231314; Sun, 24 Apr 2022 21:00:31 -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.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Apr 2022 21:00:30 -0700 (PDT) From: Maxim Cournoyer Date: Sun, 24 Apr 2022 23:56:34 -0400 Message-Id: <20220425035918.25683-68-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-setuptools): Update to 62.0.0. [source]: Simplify snippet and strip trailing #t. [arguments]: Re-indent. [synopsis]: Likewise. [description]: Use @itemize. [license]: Strip leading spaces from in-line comments. --- gnu/packages/python-xyz.scm | 57 ++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e589bbdd3a..011c57e087 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1840,44 +1840,41 @@ (define-public python2-serpent (define-public python-setuptools (package (name "python-setuptools") - (version "52.0.0") + (version "62.0.0") (source (origin - (method url-fetch) - (uri (pypi-uri "setuptools" version)) - (sha256 - (base32 - "15ibjdjhkwgj6qbmpsxikkqdfsb1550z46fly7dm15ah4bk1wfpv")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Remove included binaries which are used to build self-extracting - ;; installers for Windows. - ;; TODO: Find some way to build them ourself so we can include them. - (for-each delete-file (find-files "setuptools" "^(cli|gui).*\\.exe$")) - #t)))) + (method url-fetch) + (uri (pypi-uri "setuptools" version)) + (sha256 + (base32 + "0sm8n6y6q640cpac9wjyggidbgi4n9la7vs7pwriyvhvgzccp6br")) + (modules '((guix build utils))) + (snippet + ;; Remove included binaries which are used to build self-extracting + ;; installers for Windows. + ;; TODO: Find some way to build them ourself so we can include them. + '(for-each delete-file (find-files "setuptools" + "^(cli|gui).*\\.exe$"))))) (build-system python-build-system) ;; FIXME: Tests require pytest, which itself relies on setuptools. ;; One could bootstrap with an internal untested setuptools. - (arguments - `(#:tests? #f)) + (arguments (list #:tests? #f)) (home-page "https://pypi.org/project/setuptools/") - (synopsis - "Library designed to facilitate packaging Python projects") - (description - "Setuptools is a fully-featured, stable library designed to facilitate -packaging Python projects, where packaging includes: -Python package and module definitions, -distribution package metadata, -test hooks, -project installation, -platform-specific details, -Python 3 support.") + (synopsis "Library designed to facilitate packaging Python projects") + (description "Setuptools is a fully-featured, stable library designed to +facilitate packaging Python projects, where packaging includes: +@itemize +@item Python package and module definitions +@item distribution package metadata +@item test hooks +@item project installation +@item platform-specific details. +@end itemize") ;; TODO: setuptools now bundles the following libraries: ;; packaging, pyparsing, six and appdirs. How to unbundle? - (license (list license:psfl ; setuptools itself - license:expat ; six, appdirs, pyparsing - license:asl2.0 ; packaging is dual ASL2/BSD-2 + (license (list license:psfl ;setuptools itself + license:expat ;six, appdirs, pyparsing + license:asl2.0 ;packaging is dual ASL2/BSD-2 license:bsd-2)) (properties `((python2-variant . ,(delay python2-setuptools))))))