From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 6C7RF3K3TWNgHQEAbAwnHQ (envelope-from ) for ; Mon, 17 Oct 2022 22:13:38 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id MOzuF3K3TWPbdwEAauVa8A (envelope-from ) for ; Mon, 17 Oct 2022 22:13:38 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E8BE33B057 for ; Mon, 17 Oct 2022 22:13:37 +0200 (CEST) Received: from localhost ([::1]:34354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1okWUT-000710-0z for larch@yhetil.org; Mon, 17 Oct 2022 16:13:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okWTx-0006sN-8b for guix-patches@gnu.org; Mon, 17 Oct 2022 16:13:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51099) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1okWTw-0002Gu-3z for guix-patches@gnu.org; Mon, 17 Oct 2022 16:13:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1okWTv-0007Op-Up for guix-patches@gnu.org; Mon, 17 Oct 2022 16:13:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58587] [PATCH 01/14] gnu: python-setuptools: Move to python-build. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Oct 2022 20:13:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58587 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58587@debbugs.gnu.org Cc: Lars-Dominik Braun Received: via spool by 58587-submit@debbugs.gnu.org id=B58587.166603753328157 (code B ref 58587); Mon, 17 Oct 2022 20:13:03 +0000 Received: (at 58587) by debbugs.gnu.org; 17 Oct 2022 20:12:13 +0000 Received: from localhost ([127.0.0.1]:50115 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1okWT6-0007K3-9v for submit@debbugs.gnu.org; Mon, 17 Oct 2022 16:12:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39130) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1okWT5-0007Jl-1E for 58587@debbugs.gnu.org; Mon, 17 Oct 2022 16:12:11 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:51462) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okWSz-0002BR-2W; Mon, 17 Oct 2022 16:12:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=FB5hIfd0iWFW843+4TFGSvtLo2B9qEI2PkzC+dNMgvA=; b=VwqjlP4H28xnE7A2J+pl OqKIBau7cqe3O/Vqnp4FvsB8xlF0SSo86P8n7GEFv0DUVs80jQaUF6sJzPYbkAcV4J5bVvCEK++Fa /9SixLoW0XNWF5d21h7Y+woLZEzutojL8Rm3o2r2FfEQpbx8k0011b7x/Os/+6xqT0+fZf0ldPNGj XmeEh1aqmCG9bm7Z3f0M9dTkzur6v1MMUJxQpAcMC0DGpQ23fyDA6lxTjgS3rfnbBx/t7Zt+Cz8I8 vomNAoYANHq+ogdAAI40jEI9Ip5YiSd8anVFgkXzEnexjZLadUqzKN7Zo5fQgOb4Aj8mriI69sgfR PM8m8OBMs8/lIQ==; Received: from [84.211.203.64] (port=45504 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okWSy-0004yW-D7; Mon, 17 Oct 2022 16:12:04 -0400 From: Marius Bakke Date: Mon, 17 Oct 2022 22:11:48 +0200 Message-Id: <20221017201201.4808-1-marius@gnu.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221017200624.4076-1-marius@gnu.org> References: <20221017200624.4076-1-marius@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1666037618; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=FB5hIfd0iWFW843+4TFGSvtLo2B9qEI2PkzC+dNMgvA=; b=snaxazgmRnn7s7r1ID9gkpMDAgL81uZGkSuBrCKhjyQHGOamwxbYODNh/WcETgIE4Hsr3w opZLUr6oNUevUXPuNQhQqoEP/u5RxUv7xlbRyGdvlOOOA1iepUXQV4d7BJHYGC2rPRzfPf EDOluvbLg7pRWD6WODs6Ehu3Q+MmFdHyiBqtXZimUg7ha79cMP1KAxlyEILMfvj8zwdIMY H39Xjw+PAvziPaA0FBzq2rr83o3YQGKm7EpeB+qrBulbX/T9FM9mV2LxtO2fAV6XpPuXkw KClrqOmKAftkcGte7C0A6/fSOKIatCzXjA7CB+xVq9vENI43FZvpyR/vPEVkiA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1666037618; a=rsa-sha256; cv=none; b=dZLdGFyMLDdergPJOcsurV2+b6Cm4Hs5iSVEEiO2T3vnXsr16tiYazE/v0gJ0UINsJEDw5 sttxh97Q2/CSog5ya2D3Po3T7nAwyqvvaz9gjjct6Xh3tmJumbcVxP3jxUI4ULIx/ibSka LDQ7GNInTX7/2pQvUpAvuujAoojzPb3dwEU7+0NYEIZ/4W3rfhqWQnncbWyrtVLbY597Sy sQtY+To2atdqnJ9YAYHBDRPpXMfhkNe1wxFZxTGNYOVPFZyN8yEkEfTAUxlP2CR/UNc/FF rDU7bDfmrZ2uM4r9JrZtwIaPG/GLVst9ZmdUhAMQoLkcrTbCq7OcAHfn9JmcHw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=VwqjlP4H; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.32 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=VwqjlP4H; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: E8BE33B057 X-Spam-Score: -1.32 X-Migadu-Scanner: scn1.migadu.com X-TUID: 4mnaSxC2piw0 From: Lars-Dominik Braun * gnu/packages/python-xyz.scm (python-setuptools): Move… * gnu/packages/python-build.scm: …here. * gnu/packages/chemistry.scm, gnu/packages/messaging.scm, gnu/packages/sequoia.scm, tests/lint.scm: Adjust module imports accordingly. Co-authored-by: Marius Bakke --- gnu/packages/chemistry.scm | 1 + gnu/packages/messaging.scm | 1 + gnu/packages/python-build.scm | 40 +++++++++++++++++++++++++++++++++++ gnu/packages/python-xyz.scm | 40 ----------------------------------- gnu/packages/sequoia.scm | 2 +- tests/lint.scm | 2 +- 6 files changed, 44 insertions(+), 42 deletions(-) diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index d0582c4b6f..6549da3453 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -56,6 +56,7 @@ (define-module (gnu packages chemistry) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages serialization) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index fa889d24a7..86d9914c90 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -116,6 +116,7 @@ (define-module (gnu packages messaging) #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index 9d9b07f769..3ff988820f 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -41,6 +41,46 @@ (define-module (gnu packages python-build) ;;; ;;; Code: +(define-public python-setuptools + (package + (name "python-setuptools") + (version "64.0.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "setuptools" version)) + (sha256 + (base32 + "1sllqf0bhsl2yilf1w0xnlz0r4yaksmwaj0ap91zdc6kgbigdjiv")) + (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 (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: +@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:bsd-2)))) + (define-public python-wheel (package (name "python-wheel") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ebc56bbc11..3ea29ec3b9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2043,46 +2043,6 @@ (define-public python-serpent other machines, such as over the network.") (license license:expat))) -(define-public python-setuptools - (package - (name "python-setuptools") - (version "64.0.3") - (source - (origin - (method url-fetch) - (uri (pypi-uri "setuptools" version)) - (sha256 - (base32 - "1sllqf0bhsl2yilf1w0xnlz0r4yaksmwaj0ap91zdc6kgbigdjiv")) - (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 (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: -@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:bsd-2)))) - (define-public python-setuptools-declarative-requirements (package (name "python-setuptools-declarative-requirements") diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm index a8d21ac1a4..7002f684b8 100644 --- a/gnu/packages/sequoia.scm +++ b/gnu/packages/sequoia.scm @@ -36,7 +36,7 @@ (define-module (gnu packages sequoia) #:use-module (gnu packages nettle) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) - #:use-module (gnu packages python-xyz) ;; python-setuptools + #:use-module (gnu packages python-build) ;python-setuptools #:use-module (gnu packages rust) #:use-module (gnu packages tls)) diff --git a/tests/lint.scm b/tests/lint.scm index 8be74d2604..641486f89b 100644 --- a/tests/lint.scm +++ b/tests/lint.scm @@ -49,7 +49,7 @@ (define-module (test-lint) #:use-module (gnu packages) #:use-module (gnu packages glib) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages python-xyz) + #:use-module (gnu packages python-build) #:use-module ((gnu packages bash) #:select (bash bash-minimal)) #:use-module (web uri) #:use-module (web server) -- 2.38.0