From unknown Mon Jun 23 22:06:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#67855] [PATCH] gnu: python-cookiecutter: Update to 2.5.0. Resent-From: Troy Figiel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Dec 2023 20:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67855 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67855@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17027568456267 (code B ref -1); Sat, 16 Dec 2023 20:01:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Dec 2023 20:00:45 +0000 Received: from localhost ([127.0.0.1]:56112 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rEaq4-0001c1-H0 for submit@debbugs.gnu.org; Sat, 16 Dec 2023 15:00:45 -0500 Received: from lists.gnu.org ([2001:470:142::17]:43870) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rEaq1-0001HJ-G3 for submit@debbugs.gnu.org; Sat, 16 Dec 2023 15:00:43 -0500 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 1rEapt-0007xq-6f for guix-patches@gnu.org; Sat, 16 Dec 2023 15:00:33 -0500 Received: from mout-p-101.mailbox.org ([2001:67c:2050:0:465::101]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1rEapp-0005Jc-2V for guix-patches@gnu.org; Sat, 16 Dec 2023 15:00:32 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:b231:465::202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4SsxlT6dHZz9sns for ; Sat, 16 Dec 2023 21:00:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=troyfigiel.com; s=MBO0001; t=1702756822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=Z/uDbg6YuasOHke5C96Ojh8XxKUKNK7UmVl1yW2YIjc=; b=ov0BFLjiylxPHtNUoGRwe3wIGjl4aiGFsHIMtwq8C5SrTsaKp7DMDsVBnRP61rL2NvV+Sd YAO7EFjBW9+Q9cGY94RfUQ/8r4iaewUZHt7++ufJXccn1jtiCJgW2vrl38RTluPLRxOBuw zlBe/Brj8mm9Gtq1D5Lf6YR5yFl5Av9LlcVo9k+q94OroN5NsIOlYAAcfncYXgzRD7YRVk s8QJmmYb5qHvI8eAoRrUVO722lDjnkiclLciE355LeknOlawGRsa1i1EEhd/+daUKjqCzx bmOzfGdkPFXy8a8ARQCXBzOcTszHtjjVVXinR3t8NfxvoQSjlyN/QC9q98kHeA== From: Troy Figiel Date: Sat, 16 Dec 2023 14:23:48 +0100 Message-ID: <87sf41hq96.fsf@troyfigiel.com> MIME-Version: 1.0 Content-Type: text/plain X-Rspamd-Queue-Id: 4SsxlT6dHZz9sns Received-SPF: pass client-ip=2001:67c:2050:0:465::101; envelope-from=troy@troyfigiel.com; helo=mout-p-101.mailbox.org X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_06_12=1.543, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/python-xyz.scm (python-cookiecutter): Update to 2.5.0. [arguments]<#:phases>: Add 'pre-check phase to set a writable home directory and patch dynamically generated shebangs. Replace the [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date -0.0 T_SCC_BODY_TEXT_LINE No description available. X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/python-xyz.scm (python-cookiecutter): Update to 2.5.0. [arguments]<#:phases>: Add 'pre-check phase to set a writable home directory and patch dynamically generated shebangs. Replace the [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/python-xyz.scm (python-cookiecutter): Update to 2.5.0. [arguments]<#:phases>: Add 'pre-check phase to set a writable home directory and patch dynamically generated shebangs. Replace the default check phase to use pytest. [native-inputs]: Add bash-minimal and git. Remove python-pytest-catchlog. [propagated-inputs]: Add python-arrow, python-pyyaml and python-rich. Remove python-future, python-jinja2-time, python-poyo, python-text-unidecode and python-whichcraft. Change-Id: Ifc612136fa9a67ad643d0e1c031d173a3b3904a4 --- gnu/packages/python-xyz.scm | 51 +++++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 86f8d81689..b8e465020f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17494,28 +17494,47 @@ (define-public python-whichcraft (define-public python-cookiecutter (package (name "python-cookiecutter") - (version "1.7.3") + (version "2.5.0") (source (origin (method url-fetch) (uri (pypi-uri "cookiecutter" version)) (sha256 - (base32 "0mx49whhwcxmvcak27zr7p7ndzkn3w7psfd7fzh3n91fi1r4v6kb")))) + (base32 "1v1iafk8j2f5cciw9mf4263v91070c6z049cpnw42gwffhs907p6")))) (build-system python-build-system) - (native-inputs - (list python-freezegun python-pytest python-pytest-catchlog - python-pytest-cov python-pytest-mock)) - (propagated-inputs - (list python-binaryornot - python-click - python-future - python-jinja2 - python-jinja2-time - python-poyo - python-requests - python-slugify - python-text-unidecode - python-whichcraft)) + (arguments + (list + #:phases #~(modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + ;; test_get_user_config.py requires a writable home + ;; directory. + (setenv "HOME" + (getcwd)) + ;; test_hooks.py dynamically creates shell scripts + ;; with a /bin/bash shebang. We have to patch these. + (substitute* "tests/test_hooks.py" + (("/bin/bash") + (string-append #$(this-package-native-input + "bash-minimal") "/bin/bash"))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest"))))))) + (native-inputs (list bash-minimal + git + python-freezegun + python-pytest + python-pytest-cov + python-pytest-mock)) + (propagated-inputs (list python-arrow + python-binaryornot + python-click + python-jinja2 + python-pyyaml + python-requests + python-rich + python-slugify)) (home-page "https://github.com/cookiecutter/cookiecutter") (synopsis "Command-line utility that creates projects from project templates") base-commit: d5298c5e334e56a9aabddcb62d312e63135864f6 -- 2.40.1 From unknown Mon Jun 23 22:06:36 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Troy Figiel Subject: bug#67855: closed (Re: [bug#67855] [PATCH] gnu: python-cookiecutter: Update to 2.5.0.) Message-ID: References: <87o7eiw30y.fsf@cbaines.net> <87sf41hq96.fsf@troyfigiel.com> X-Gnu-PR-Message: they-closed 67855 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 67855@debbugs.gnu.org Date: Fri, 22 Dec 2023 17:39:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1703266743-13511-1" This is a multi-part message in MIME format... ------------=_1703266743-13511-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #67855: [PATCH] gnu: python-cookiecutter: Update to 2.5.0. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 67855@debbugs.gnu.org. --=20 67855: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D67855 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1703266743-13511-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 67855-done) by debbugs.gnu.org; 22 Dec 2023 17:39:01 +0000 Received: from localhost ([127.0.0.1]:47820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rGjUC-0003VO-Pl for submit@debbugs.gnu.org; Fri, 22 Dec 2023 12:39:01 -0500 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:36267) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rGjUA-0003VH-VP for 67855-done@debbugs.gnu.org; Fri, 22 Dec 2023 12:38:59 -0500 Received: from localhost (132.249.6.51.dyn.plus.net [51.6.249.132]) by mira.cbaines.net (Postfix) with ESMTPSA id C9B2227BBE2; Fri, 22 Dec 2023 17:38:53 +0000 (GMT) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id f4f6255a; Fri, 22 Dec 2023 17:38:53 +0000 (UTC) References: <87sf41hq96.fsf@troyfigiel.com> User-agent: mu4e 1.10.7; emacs 29.1 From: Christopher Baines To: Troy Figiel Subject: Re: [bug#67855] [PATCH] gnu: python-cookiecutter: Update to 2.5.0. Date: Fri, 22 Dec 2023 17:38:31 +0000 In-reply-to: <87sf41hq96.fsf@troyfigiel.com> Message-ID: <87o7eiw30y.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67855-done Cc: 67855-done@debbugs.gnu.org, guix-patches@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Troy Figiel writes: > * gnu/packages/python-xyz.scm (python-cookiecutter): Update to 2.5.0. > [arguments]<#:phases>: Add 'pre-check phase to set a writable home directory > and patch dynamically generated shebangs. Replace the default check phase to use pytest. > [native-inputs]: Add bash-minimal and git. Remove python-pytest-catchlog. > [propagated-inputs]: Add python-arrow, python-pyyaml and python-rich. Remove > python-future, python-jinja2-time, python-poyo, python-text-unidecode and > python-whichcraft. > > Change-Id: Ifc612136fa9a67ad643d0e1c031d173a3b3904a4 > --- > gnu/packages/python-xyz.scm | 51 +++++++++++++++++++++++++------------ > 1 file changed, 35 insertions(+), 16 deletions(-) Thanks for the patch, I've pushed it to master as 0de5677a1853dc8c4d74f239de8787d49fc77c94. Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmWFya1fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XdoPxAAn0gLf9FmeZ/OP3HRX3z2GAODySOsjTNd XqK/Q+NSpOm8rpUhv3x8NB5/WkvvXRAvtndiuyM+l1KQv6/6HZW+/6sGdJqfJOL9 8VsaaHtH4BS3PnMJCGjS7ZgPwjKz2tJVQzKKSn2XSg0yLZIeg6+krSgp7BARERUI gesukvuQ9bie95YsDMy+ZTEgh+4IGF9eWuZLrJuUrW+4cCj9ymHxIoIqQOsdewQt VyEAiCOWCNNnkdFVZhnaeR/BcPXLwZvh/iS+Ref+gWcR6sxBbH9JSLWWa60GWj7O 58X2dk/xZFq3jMtjZ7N+x8sFPbON9/ok5uvHzRPmxJhCr/c3CdCUxuD8OTwuFt43 tyeV1BMw+UwY4I9/rLDP2sCcn783shXpu/gCA918koutCEbj33L/1lcN6atU3sqQ IVBj83sJdvi+AM3SxQKkmj4pkTnMQmWY1R5+/LzrtngOPd4LsC3SyMrmoVvTAbOp d0Ja/JLsuGDTuDJeyHr/+Nqv4X/U04PjAd8bNJV+5MPPLn2UYwVzD5XB9DMerBHY g9GiNxZpCMjBWliiCesuXWrrTH8RrDrMLzSNILoFiXX5IUpHaqnULj1yGq8Y28Ys 3PX6Prn4RbTa2bp7yY17N77uvj35j+xpCznE0L3YGLjzPAGUhiFsSlpGmWto2Lqs b+/0J8peVwA= =jobV -----END PGP SIGNATURE----- --=-=-=-- ------------=_1703266743-13511-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 16 Dec 2023 20:00:45 +0000 Received: from localhost ([127.0.0.1]:56112 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rEaq4-0001c1-H0 for submit@debbugs.gnu.org; Sat, 16 Dec 2023 15:00:45 -0500 Received: from lists.gnu.org ([2001:470:142::17]:43870) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rEaq1-0001HJ-G3 for submit@debbugs.gnu.org; Sat, 16 Dec 2023 15:00:43 -0500 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 1rEapt-0007xq-6f for guix-patches@gnu.org; Sat, 16 Dec 2023 15:00:33 -0500 Received: from mout-p-101.mailbox.org ([2001:67c:2050:0:465::101]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1rEapp-0005Jc-2V for guix-patches@gnu.org; Sat, 16 Dec 2023 15:00:32 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:b231:465::202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4SsxlT6dHZz9sns for ; Sat, 16 Dec 2023 21:00:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=troyfigiel.com; s=MBO0001; t=1702756822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=Z/uDbg6YuasOHke5C96Ojh8XxKUKNK7UmVl1yW2YIjc=; b=ov0BFLjiylxPHtNUoGRwe3wIGjl4aiGFsHIMtwq8C5SrTsaKp7DMDsVBnRP61rL2NvV+Sd YAO7EFjBW9+Q9cGY94RfUQ/8r4iaewUZHt7++ufJXccn1jtiCJgW2vrl38RTluPLRxOBuw zlBe/Brj8mm9Gtq1D5Lf6YR5yFl5Av9LlcVo9k+q94OroN5NsIOlYAAcfncYXgzRD7YRVk s8QJmmYb5qHvI8eAoRrUVO722lDjnkiclLciE355LeknOlawGRsa1i1EEhd/+daUKjqCzx bmOzfGdkPFXy8a8ARQCXBzOcTszHtjjVVXinR3t8NfxvoQSjlyN/QC9q98kHeA== From: Troy Figiel To: guix-patches@gnu.org Subject: [PATCH] gnu: python-cookiecutter: Update to 2.5.0. Date: Sat, 16 Dec 2023 14:23:48 +0100 Message-ID: <87sf41hq96.fsf@troyfigiel.com> MIME-Version: 1.0 Content-Type: text/plain X-Rspamd-Queue-Id: 4SsxlT6dHZz9sns Received-SPF: pass client-ip=2001:67c:2050:0:465::101; envelope-from=troy@troyfigiel.com; helo=mout-p-101.mailbox.org X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_06_12=1.543, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/python-xyz.scm (python-cookiecutter): Update to 2.5.0. [arguments]<#:phases>: Add 'pre-check phase to set a writable home directory and patch dynamically generated shebangs. Replace the [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/python-xyz.scm (python-cookiecutter): Update to 2.5.0. [arguments]<#:phases>: Add 'pre-check phase to set a writable home directory and patch dynamically generated shebangs. Replace the [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/python-xyz.scm (python-cookiecutter): Update to 2.5.0. [arguments]<#:phases>: Add 'pre-check phase to set a writable home directory and patch dynamically generated shebangs. Replace the default check phase to use pytest. [native-inputs]: Add bash-minimal and git. Remove python-pytest-catchlog. [propagated-inputs]: Add python-arrow, python-pyyaml and python-rich. Remove python-future, python-jinja2-time, python-poyo, python-text-unidecode and python-whichcraft. Change-Id: Ifc612136fa9a67ad643d0e1c031d173a3b3904a4 --- gnu/packages/python-xyz.scm | 51 +++++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 86f8d81689..b8e465020f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17494,28 +17494,47 @@ (define-public python-whichcraft (define-public python-cookiecutter (package (name "python-cookiecutter") - (version "1.7.3") + (version "2.5.0") (source (origin (method url-fetch) (uri (pypi-uri "cookiecutter" version)) (sha256 - (base32 "0mx49whhwcxmvcak27zr7p7ndzkn3w7psfd7fzh3n91fi1r4v6kb")))) + (base32 "1v1iafk8j2f5cciw9mf4263v91070c6z049cpnw42gwffhs907p6")))) (build-system python-build-system) - (native-inputs - (list python-freezegun python-pytest python-pytest-catchlog - python-pytest-cov python-pytest-mock)) - (propagated-inputs - (list python-binaryornot - python-click - python-future - python-jinja2 - python-jinja2-time - python-poyo - python-requests - python-slugify - python-text-unidecode - python-whichcraft)) + (arguments + (list + #:phases #~(modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + ;; test_get_user_config.py requires a writable home + ;; directory. + (setenv "HOME" + (getcwd)) + ;; test_hooks.py dynamically creates shell scripts + ;; with a /bin/bash shebang. We have to patch these. + (substitute* "tests/test_hooks.py" + (("/bin/bash") + (string-append #$(this-package-native-input + "bash-minimal") "/bin/bash"))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest"))))))) + (native-inputs (list bash-minimal + git + python-freezegun + python-pytest + python-pytest-cov + python-pytest-mock)) + (propagated-inputs (list python-arrow + python-binaryornot + python-click + python-jinja2 + python-pyyaml + python-requests + python-rich + python-slugify)) (home-page "https://github.com/cookiecutter/cookiecutter") (synopsis "Command-line utility that creates projects from project templates") base-commit: d5298c5e334e56a9aabddcb62d312e63135864f6 -- 2.40.1 ------------=_1703266743-13511-1-- From unknown Mon Jun 23 22:06:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#67855] [PATCH] gnu: python-cookiecutter: Update to 2.5.0. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Dec 2023 17:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67855 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Troy Figiel Cc: 67855-done@debbugs.gnu.org, 67855@debbugs.gnu.org X-Debbugs-Original-Cc: 67855-done@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170326675013569 (code B ref -1); Fri, 22 Dec 2023 17:40:02 +0000 Received: (at submit) by debbugs.gnu.org; 22 Dec 2023 17:39:10 +0000 Received: from localhost ([127.0.0.1]:47831 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rGjUM-0003Wn-3n for submit@debbugs.gnu.org; Fri, 22 Dec 2023 12:39:10 -0500 Received: from lists.gnu.org ([2001:470:142::17]:52416) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rGjUK-0003W0-NJ for submit@debbugs.gnu.org; Fri, 22 Dec 2023 12:39:09 -0500 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 1rGjU9-0006uw-7g for guix-patches@gnu.org; Fri, 22 Dec 2023 12:38:57 -0500 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGjU7-0008Hs-Pe for guix-patches@gnu.org; Fri, 22 Dec 2023 12:38:56 -0500 Received: from localhost (132.249.6.51.dyn.plus.net [51.6.249.132]) by mira.cbaines.net (Postfix) with ESMTPSA id C9B2227BBE2; Fri, 22 Dec 2023 17:38:53 +0000 (GMT) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id f4f6255a; Fri, 22 Dec 2023 17:38:53 +0000 (UTC) References: <87sf41hq96.fsf@troyfigiel.com> User-agent: mu4e 1.10.7; emacs 29.1 From: Christopher Baines Date: Fri, 22 Dec 2023 17:38:31 +0000 In-reply-to: <87sf41hq96.fsf@troyfigiel.com> Message-ID: <87o7eiw30y.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) --=-=-= Content-Type: text/plain Troy Figiel writes: > * gnu/packages/python-xyz.scm (python-cookiecutter): Update to 2.5.0. > [arguments]<#:phases>: Add 'pre-check phase to set a writable home directory > and patch dynamically generated shebangs. Replace the default check phase to use pytest. > [native-inputs]: Add bash-minimal and git. Remove python-pytest-catchlog. > [propagated-inputs]: Add python-arrow, python-pyyaml and python-rich. Remove > python-future, python-jinja2-time, python-poyo, python-text-unidecode and > python-whichcraft. > > Change-Id: Ifc612136fa9a67ad643d0e1c031d173a3b3904a4 > --- > gnu/packages/python-xyz.scm | 51 +++++++++++++++++++++++++------------ > 1 file changed, 35 insertions(+), 16 deletions(-) Thanks for the patch, I've pushed it to master as 0de5677a1853dc8c4d74f239de8787d49fc77c94. Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmWFya1fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XdoPxAAn0gLf9FmeZ/OP3HRX3z2GAODySOsjTNd XqK/Q+NSpOm8rpUhv3x8NB5/WkvvXRAvtndiuyM+l1KQv6/6HZW+/6sGdJqfJOL9 8VsaaHtH4BS3PnMJCGjS7ZgPwjKz2tJVQzKKSn2XSg0yLZIeg6+krSgp7BARERUI gesukvuQ9bie95YsDMy+ZTEgh+4IGF9eWuZLrJuUrW+4cCj9ymHxIoIqQOsdewQt VyEAiCOWCNNnkdFVZhnaeR/BcPXLwZvh/iS+Ref+gWcR6sxBbH9JSLWWa60GWj7O 58X2dk/xZFq3jMtjZ7N+x8sFPbON9/ok5uvHzRPmxJhCr/c3CdCUxuD8OTwuFt43 tyeV1BMw+UwY4I9/rLDP2sCcn783shXpu/gCA918koutCEbj33L/1lcN6atU3sqQ IVBj83sJdvi+AM3SxQKkmj4pkTnMQmWY1R5+/LzrtngOPd4LsC3SyMrmoVvTAbOp d0Ja/JLsuGDTuDJeyHr/+Nqv4X/U04PjAd8bNJV+5MPPLn2UYwVzD5XB9DMerBHY g9GiNxZpCMjBWliiCesuXWrrTH8RrDrMLzSNILoFiXX5IUpHaqnULj1yGq8Y28Ys 3PX6Prn4RbTa2bp7yY17N77uvj35j+xpCznE0L3YGLjzPAGUhiFsSlpGmWto2Lqs b+/0J8peVwA= =jobV -----END PGP SIGNATURE----- --=-=-=--