From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id 6KWLDuhbPWaKugAAe85BDQ:P1 (envelope-from ) for ; Fri, 10 May 2024 01:27:36 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 6KWLDuhbPWaKugAAe85BDQ (envelope-from ) for ; Fri, 10 May 2024 01:27:36 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1715297256; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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; bh=pN4Y5+2hONhHGCBKm6jmvn+RS4/jL9wlnuc+5Z2RyME=; b=krQTe11EbeqQQdZufWZRmc7dU1UDgfJQK9vlgvhYjC+J4kRZEVNTIWybebVG3US/2b6mw1 ApD7FHzuuHuC9zVKw049JlPkClNBPc9dm3zUYamncDKl5kJ+XGEJ9OO7cZ0iYHXQSFUj/0 KG77SnJ6u2ueSNvUagd24ZHG6j+EbQSqPPiQ2veriiECtEJbtiEwG2ehuBVTWMzHcZ4t4o g7A/+ahJ1QzP1xdvRZNVuqch54uHasef0nVPwZ2uE/IKtP7YJsKGT4fqvkjkbTJMShHzOG B+U3qNleWSO05OqXtyma5s/fi5P2nMpIax7M2Gs1FfCSxIB4tslOXDU7s7RdTw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1715297256; a=rsa-sha256; cv=none; b=VMJjbMsGq545zBHnioGEhLf3tK9MFjcM50a20E5gq7jfH1iNNGpdtypKrA/XowLuBE5pkt 8818CfkC9UXq0rjZ6jRJ9dAA52/ByjjmalSEACLTmpexKls5amuYobIBpI7iFa2FDuCkZZ UUHwDRPtIl74Q61a16m7hzFK8jhLW2iENpNBw2I8FH3gB0tTz+zmOiIf42jTzN2bUwkodt 0nzxir4jdBI6GGQrTNxuMDDMlOmbIXBwjDs8p/jFAyQ716fPruJXdAp5XiPH277Pd9W6+l PvsmeB0lAycfOzeA/uu9/eijLDrwGskyXc0i7luN0ySdHOW+jMxDe5bogWRNDg== 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 035B96D870 for ; Fri, 10 May 2024 01:27:36 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s5Chp-0006Cr-In; Thu, 09 May 2024 18:57:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s5ChO-0005tg-1L for guix-patches@gnu.org; Thu, 09 May 2024 18:57:14 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s5ChN-0006SA-OJ for guix-patches@gnu.org; Thu, 09 May 2024 18:57:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s5ChM-0002gk-2p for guix-patches@gnu.org; Thu, 09 May 2024 18:57:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70855] [PATCH 22/92] gnu: conda: Reindent. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 May 2024 22:57:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70855 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70855@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 70855-submit@debbugs.gnu.org id=B70855.17152954089987 (code B ref 70855); Thu, 09 May 2024 22:57:12 +0000 Received: (at 70855) by debbugs.gnu.org; 9 May 2024 22:56:48 +0000 Received: from localhost ([127.0.0.1]:41094 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5Cgy-0002au-3R for submit@debbugs.gnu.org; Thu, 09 May 2024 18:56:48 -0400 Received: from 15.mo581.mail-out.ovh.net ([87.98.180.21]:57087) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5Cgr-0002Zw-5v for 70855@debbugs.gnu.org; Thu, 09 May 2024 18:56:42 -0400 Received: from director11.ghost.mail-out.ovh.net (unknown [10.108.9.101]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 4Vb6p112Zhz1FRC for <70855@debbugs.gnu.org>; Thu, 9 May 2024 22:56:41 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-lmjrs (unknown [10.108.42.39]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id DF5EF1FD83; Thu, 9 May 2024 22:56:40 +0000 (UTC) Received: from ngraves.fr ([37.59.142.98]) by ghost-submission-6684bf9d7b-lmjrs with ESMTPSA id PEOTMqhUPWbnQAAAamcrRw (envelope-from ); Thu, 09 May 2024 22:56:40 +0000 X-OVh-ClientIp: 81.67.146.208 Date: Fri, 10 May 2024 00:53:17 +0200 Message-ID: <20240509225530.24649-22-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240509225530.24649-1-ngraves@ngraves.fr> References: <20240509225530.24649-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 6100407173867889378 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvdeffedgudehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdehleeiffehtedvlefhffffjeefgfduhfetkeevheeiteduiedugfekuedtheejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleeknecuvehluhhsthgvrhfuihiivgepvdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejtdekheehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedupdhmohguvgepshhmthhpohhuth 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches From: Nicolas Graves via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -6.39 X-Spam-Score: -6.39 X-Migadu-Queue-Id: 035B96D870 X-Migadu-Scanner: mx13.migadu.com X-TUID: 9rbu9FVFePMH * gnu/packages/package-management.scm (conda): Reindent. Change-Id: I954ec137b4dc39cd561da9ed0e583991bb3de1db --- gnu/packages/package-management.scm | 112 ++++++++++++++-------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 8a47135ad02..a01c9faab13 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1164,8 +1164,8 @@ (define-public conda (origin (method git-fetch) (uri (git-reference - (url "https://github.com/conda/conda") - (commit version))) + (url "https://github.com/conda/conda") + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 @@ -1212,60 +1212,60 @@ (define-public conda "test_make_entry_point") " and not "))) #:phases - #~(modify-phases %standard-phases - ;; The default version of pytest does not support these options. - (add-after 'unpack 'use-older-pytest - (lambda _ - (substitute* "setup.cfg" - (("--xdoctest-.*") "")))) - (add-after 'unpack 'fix-ruamel-yaml-dependency - (lambda _ - (substitute* "setup.py" - (("ruamel_yaml_conda") "ruamel.yaml")))) - (add-after 'unpack 'correct-python-executable-name - (lambda* (#:key inputs #:allow-other-keys) - (let ((python (assoc-ref inputs "python-wrapper"))) - (substitute* "conda/core/initialize.py" - (("python_exe = join") - (format #f "python_exe = \"~a/bin/python\" #" - python)))))) - (add-after 'unpack 'do-not-use-python-root-as-prefix - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (python (assoc-ref inputs "python-wrapper"))) - (substitute* "tests/core/test_initialize.py" - (("\"\"\"\\) % conda_prefix") - (format #f "\"\"\") % ~s" python)) - (("CONDA_PYTHON_EXE \"%s\"' % join\\(conda_prefix") - (format #f "CONDA_PYTHON_EXE \"%s\"' % join(~s" - python)) - (("conda_prefix = abspath\\(sys.prefix\\)") - (format #f "conda_prefix = abspath(~s)" out))) - (substitute* "conda/base/context.py" - (("os.chdir\\(sys.prefix\\)") - (format #f "os.chdir(~s)" out)) - (("sys.prefix, '.condarc'") - (format #f "~s, '.condarc'" out)) - (("return abspath\\(sys.prefix\\)") - (format #f "return abspath(~s)" out)) - (("os.path.join\\(sys.prefix, bin_dir, exe\\)") - (format #f "\"~a/bin/conda\"" out)) - (("'CONDA_EXE', sys.executable") - (format #f "'CONDA_EXE', \"~a/bin/conda\"" out)))))) - (add-before 'build 'create-version-file - (lambda _ - (with-output-to-file "conda/.version" - (lambda () (display #$version))))) - (add-after 'create-entrypoints 'init - ;; This writes a whole bunch of shell initialization files to the - ;; prefix directory. Many features of conda can only be used after - ;; running "conda init". - (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - (setenv "HOME" "/tmp") - (invoke (string-append (assoc-ref outputs "out") - "/bin/conda") - "init")))))) + #~(modify-phases %standard-phases + ;; The default version of pytest does not support these options. + (add-after 'unpack 'use-older-pytest + (lambda _ + (substitute* "setup.cfg" + (("--xdoctest-.*") "")))) + (add-after 'unpack 'fix-ruamel-yaml-dependency + (lambda _ + (substitute* "setup.py" + (("ruamel_yaml_conda") "ruamel.yaml")))) + (add-after 'unpack 'correct-python-executable-name + (lambda* (#:key inputs #:allow-other-keys) + (let ((python (assoc-ref inputs "python-wrapper"))) + (substitute* "conda/core/initialize.py" + (("python_exe = join") + (format #f "python_exe = \"~a/bin/python\" #" + python)))))) + (add-after 'unpack 'do-not-use-python-root-as-prefix + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (python (assoc-ref inputs "python-wrapper"))) + (substitute* "tests/core/test_initialize.py" + (("\"\"\"\\) % conda_prefix") + (format #f "\"\"\") % ~s" python)) + (("CONDA_PYTHON_EXE \"%s\"' % join\\(conda_prefix") + (format #f "CONDA_PYTHON_EXE \"%s\"' % join(~s" + python)) + (("conda_prefix = abspath\\(sys.prefix\\)") + (format #f "conda_prefix = abspath(~s)" out))) + (substitute* "conda/base/context.py" + (("os.chdir\\(sys.prefix\\)") + (format #f "os.chdir(~s)" out)) + (("sys.prefix, '.condarc'") + (format #f "~s, '.condarc'" out)) + (("return abspath\\(sys.prefix\\)") + (format #f "return abspath(~s)" out)) + (("os.path.join\\(sys.prefix, bin_dir, exe\\)") + (format #f "\"~a/bin/conda\"" out)) + (("'CONDA_EXE', sys.executable") + (format #f "'CONDA_EXE', \"~a/bin/conda\"" out)))))) + (add-before 'build 'create-version-file + (lambda _ + (with-output-to-file "conda/.version" + (lambda () (display #$version))))) + (add-after 'create-entrypoints 'init + ;; This writes a whole bunch of shell initialization files to the + ;; prefix directory. Many features of conda can only be used after + ;; running "conda init". + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (setenv "HOME" "/tmp") + (invoke (string-append (assoc-ref outputs "out") + "/bin/conda") + "init")))))) (inputs (list python-wrapper)) (propagated-inputs -- 2.41.0