From unknown Sun Jun 22 00:42:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#50235] [PATCH] gnu: trash-cli: Update to 0.21.7.24. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 28 Aug 2021 07:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50235 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50235@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16301369309764 (code B ref -1); Sat, 28 Aug 2021 07:49:01 +0000 Received: (at submit) by debbugs.gnu.org; 28 Aug 2021 07:48:50 +0000 Received: from localhost ([127.0.0.1]:53349 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJt58-0002XP-2A for submit@debbugs.gnu.org; Sat, 28 Aug 2021 03:48:50 -0400 Received: from lists.gnu.org ([209.51.188.17]:51984) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJt54-0002XG-Dj for submit@debbugs.gnu.org; Sat, 28 Aug 2021 03:48:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32904) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mJt54-0008Dl-5B for guix-patches@gnu.org; Sat, 28 Aug 2021 03:48:46 -0400 Received: from relay12.mail.gandi.net ([217.70.178.232]:37493) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mJt51-00016j-TI for guix-patches@gnu.org; Sat, 28 Aug 2021 03:48:45 -0400 Received: (Authenticated sender: brice@waegenei.re) by relay12.mail.gandi.net (Postfix) with ESMTPSA id 40702200003 for ; Sat, 28 Aug 2021 07:48:37 +0000 (UTC) From: Brice Waegeneire Date: Sat, 28 Aug 2021 09:48:30 +0200 Message-Id: <20210828074830.6325-1-brice@waegenei.re> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=217.70.178.232; envelope-from=brice@waegenei.re; helo=relay12.mail.gandi.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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) 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: -2.6 (--) * gnu/packages/shellutils.scm (trash-cli): Update to 0.21.7.24. [source]: Use github repository instead of pypi. [arguments]: Use python 3. : Enable tests. : Add "fix-setup.py" phase. [native-inputs]: Add python-pytest, python-mock and python-six. [propagated-inputs]: Add python-psutil. --- gnu/packages/shellutils.scm | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) The switch from PyPi to Github is to get the "test" directory to be able to run the tests. diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 94b5536df7..7c153cdf25 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -38,11 +38,13 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bison) + #:use-module (gnu packages check) #:use-module (gnu packages flex) #:use-module (gnu packages golang) #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) #:use-module (gnu packages ruby) #:use-module (gnu packages shells) @@ -203,19 +205,20 @@ between various shells or commands.") (define-public trash-cli (package (name "trash-cli") - (version "0.17.1.14") + (version "0.21.7.24") (source (origin - (method url-fetch) - (uri (pypi-uri "trash-cli" version)) - (sha256 - (base32 - "01q0cl04ljf214z6s3g256gsxx3pqsgaf6ac1zh0vrq5bnhnr85h")))) + (method git-fetch) + (uri (git-reference + (url "https://github.com/andreafrancia/trash-cli") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "082mfl4mza4xkm3fdn5aka9rsbd8c149qj3cqqk62idrnszmgzg5")))) (build-system python-build-system) (arguments - `(#:python ,python-2 - #:tests? #f ; no tests - #:phases + `(#:phases (modify-phases %standard-phases (add-before 'build 'patch-path-constants (lambda* (#:key inputs #:allow-other-keys) @@ -225,8 +228,22 @@ between various shells or commands.") (("\"/lib/libc.so.6\".*") (string-append "\"" libc "/lib/libc.so.6\"\n")) (("\"df\"") - (string-append "\"" coreutils "/bin/df\""))))))))) + (string-append "\"" coreutils "/bin/df\"")))))) + (add-before 'build 'fix-setup.py + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (mkdir-p bin) + (substitute* "setup.py" + (("add_script\\('") + (string-append "add_script('" bin "/" ))))))))) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-mock" ,python-mock) + ("python-six" ,python-six))) (inputs `(("coreutils" ,coreutils))) + (propagated-inputs + `(("python-psutil" ,python-psutil))) (home-page "https://github.com/andreafrancia/trash-cli") (synopsis "Trash can management tool") (description base-commit: 4716d544443f25a4cd1397d9f8deb856e28bb515 -- 2.32.0 From unknown Sun Jun 22 00:42:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#50235] [PATCH] gnu: trash-cli: Update to 0.21.7.24. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Sep 2021 11:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50235 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brice Waegeneire Cc: 50235@debbugs.gnu.org Received: via spool by 50235-submit@debbugs.gnu.org id=B50235.163248461622998 (code B ref 50235); Fri, 24 Sep 2021 11:57:02 +0000 Received: (at 50235) by debbugs.gnu.org; 24 Sep 2021 11:56:56 +0000 Received: from localhost ([127.0.0.1]:56823 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTjp2-0005ys-6V for submit@debbugs.gnu.org; Fri, 24 Sep 2021 07:56:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51146) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTjp0-0005yc-Bt for 50235@debbugs.gnu.org; Fri, 24 Sep 2021 07:56:54 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:44636) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mTjou-0000Yq-8z; Fri, 24 Sep 2021 07:56:48 -0400 Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=60446 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTjou-0003sh-0C; Fri, 24 Sep 2021 07:56:48 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20210828074830.6325-1-brice@waegenei.re> Date: Fri, 24 Sep 2021 13:56:46 +0200 In-Reply-To: <20210828074830.6325-1-brice@waegenei.re> (Brice Waegeneire's message of "Sat, 28 Aug 2021 09:48:30 +0200") Message-ID: <87v92qnq4h.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) 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: -3.3 (---) Hi Brice, Brice Waegeneire skribis: > * gnu/packages/shellutils.scm (trash-cli): Update to 0.21.7.24. > [source]: Use github repository instead of pypi. > [arguments]: Use python 3. > : Enable tests. > : Add "fix-setup.py" phase. > [native-inputs]: Add python-pytest, python-mock and python-six. > [propagated-inputs]: Add python-psutil. LGTM! Ludo=E2=80=99. From unknown Sun Jun 22 00:42:27 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: Brice Waegeneire Subject: bug#50235: closed (Re: bug#50235: [PATCH] gnu: trash-cli: Update to 0.21.7.24.) Message-ID: References: <87tue1scea.fsf_-_@waegenei.re> <20210828074830.6325-1-brice@waegenei.re> X-Gnu-PR-Message: they-closed 50235 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 50235@debbugs.gnu.org Date: Tue, 18 Jan 2022 08:00:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1642492803-17889-1" This is a multi-part message in MIME format... ------------=_1642492803-17889-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #50235: [PATCH] gnu: trash-cli: Update to 0.21.7.24. 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 50235@debbugs.gnu.org. --=20 50235: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D50235 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1642492803-17889-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 50235-done) by debbugs.gnu.org; 18 Jan 2022 07:59:05 +0000 Received: from localhost ([127.0.0.1]:48844 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n9jOT-0004d0-1Z for submit@debbugs.gnu.org; Tue, 18 Jan 2022 02:59:05 -0500 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:44995) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n9jOR-0004cP-54 for 50235-done@debbugs.gnu.org; Tue, 18 Jan 2022 02:59:03 -0500 Received: (Authenticated sender: brice@waegenei.re) by mail.gandi.net (Postfix) with ESMTPSA id 608F060007; Tue, 18 Jan 2022 07:58:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=waegenei.re; s=gm1; t=1642492736; h=from:from: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: in-reply-to:in-reply-to:references:references; bh=n0k3ShYr6G4ciYG6vCNqAwC/gp2xc31koMVrOUmdvp0=; b=X+av52GBJzlVgM24G4uxqGg/B6Bzz5p5uKJO4jcVgee/QuyBYohaTsxrt7zujiD7QOIWJ6 d7zNUh7RXTU4n06GERWEtiZK+30JInnOq/klegRHGmwdHziwrzvNKZu8gSerJ+GOmLnO+e 18bzwjUkzgul0SI6ASQwtPdjZf9CSAEg55+zKPzdOaguNdl1NlVodcB9kuJnL4u5pnNmSt DX3+Xp16HDwNbEyxkBN8Xp6gINLRWqyNT9z+RV8sX/l7sa7kDjZHYS4HkOyrItV4mnILl0 4hn3j3505+fCcHKqUV/iccY1ngAdZQL9U6CfZHqEzXEV4BUKuXVa3sdQUHp7eA== From: Brice Waegeneire To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#50235: [PATCH] gnu: trash-cli: Update to 0.21.7.24. References: <20210828074830.6325-1-brice@waegenei.re> <87v92qnq4h.fsf@gnu.org> Date: Tue, 18 Jan 2022 08:58:53 +0100 In-Reply-To: <87v92qnq4h.fsf@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?= =?utf-8?Q?s?= message of "Fri, 24 Sep 2021 13:56:46 +0200") Message-ID: <87tue1scea.fsf_-_@waegenei.re> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.90 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50235-done Cc: 50235-done@debbugs.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.7 (-) Hello Ludo=E2=80=99, Ludovic Court=C3=A8s writes: > Brice Waegeneire skribis: > >> * gnu/packages/shellutils.scm (trash-cli): Update to 0.21.7.24. >> [source]: Use github repository instead of pypi. >> [arguments]: Use python 3. >> : Enable tests. >> : Add "fix-setup.py" phase. >> [native-inputs]: Add python-pytest, python-mock and python-six. >> [propagated-inputs]: Add python-psutil. > > LGTM! Thank for the review! Pushed as 39510d5a5e4e0e38cd3d3bc944d5bf6d96242493, adjusted from the initi= al patch to update to 0.21.10.24 and use new inputs style. Cheers, - Brice ------------=_1642492803-17889-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 28 Aug 2021 07:48:50 +0000 Received: from localhost ([127.0.0.1]:53349 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJt58-0002XP-2A for submit@debbugs.gnu.org; Sat, 28 Aug 2021 03:48:50 -0400 Received: from lists.gnu.org ([209.51.188.17]:51984) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJt54-0002XG-Dj for submit@debbugs.gnu.org; Sat, 28 Aug 2021 03:48:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32904) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mJt54-0008Dl-5B for guix-patches@gnu.org; Sat, 28 Aug 2021 03:48:46 -0400 Received: from relay12.mail.gandi.net ([217.70.178.232]:37493) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mJt51-00016j-TI for guix-patches@gnu.org; Sat, 28 Aug 2021 03:48:45 -0400 Received: (Authenticated sender: brice@waegenei.re) by relay12.mail.gandi.net (Postfix) with ESMTPSA id 40702200003 for ; Sat, 28 Aug 2021 07:48:37 +0000 (UTC) From: Brice Waegeneire To: guix-patches@gnu.org Subject: [PATCH] gnu: trash-cli: Update to 0.21.7.24. Date: Sat, 28 Aug 2021 09:48:30 +0200 Message-Id: <20210828074830.6325-1-brice@waegenei.re> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=217.70.178.232; envelope-from=brice@waegenei.re; helo=relay12.mail.gandi.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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) 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: -2.6 (--) * gnu/packages/shellutils.scm (trash-cli): Update to 0.21.7.24. [source]: Use github repository instead of pypi. [arguments]: Use python 3. : Enable tests. : Add "fix-setup.py" phase. [native-inputs]: Add python-pytest, python-mock and python-six. [propagated-inputs]: Add python-psutil. --- gnu/packages/shellutils.scm | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) The switch from PyPi to Github is to get the "test" directory to be able to run the tests. diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 94b5536df7..7c153cdf25 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -38,11 +38,13 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bison) + #:use-module (gnu packages check) #:use-module (gnu packages flex) #:use-module (gnu packages golang) #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) #:use-module (gnu packages ruby) #:use-module (gnu packages shells) @@ -203,19 +205,20 @@ between various shells or commands.") (define-public trash-cli (package (name "trash-cli") - (version "0.17.1.14") + (version "0.21.7.24") (source (origin - (method url-fetch) - (uri (pypi-uri "trash-cli" version)) - (sha256 - (base32 - "01q0cl04ljf214z6s3g256gsxx3pqsgaf6ac1zh0vrq5bnhnr85h")))) + (method git-fetch) + (uri (git-reference + (url "https://github.com/andreafrancia/trash-cli") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "082mfl4mza4xkm3fdn5aka9rsbd8c149qj3cqqk62idrnszmgzg5")))) (build-system python-build-system) (arguments - `(#:python ,python-2 - #:tests? #f ; no tests - #:phases + `(#:phases (modify-phases %standard-phases (add-before 'build 'patch-path-constants (lambda* (#:key inputs #:allow-other-keys) @@ -225,8 +228,22 @@ between various shells or commands.") (("\"/lib/libc.so.6\".*") (string-append "\"" libc "/lib/libc.so.6\"\n")) (("\"df\"") - (string-append "\"" coreutils "/bin/df\""))))))))) + (string-append "\"" coreutils "/bin/df\"")))))) + (add-before 'build 'fix-setup.py + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (mkdir-p bin) + (substitute* "setup.py" + (("add_script\\('") + (string-append "add_script('" bin "/" ))))))))) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-mock" ,python-mock) + ("python-six" ,python-six))) (inputs `(("coreutils" ,coreutils))) + (propagated-inputs + `(("python-psutil" ,python-psutil))) (home-page "https://github.com/andreafrancia/trash-cli") (synopsis "Trash can management tool") (description base-commit: 4716d544443f25a4cd1397d9f8deb856e28bb515 -- 2.32.0 ------------=_1642492803-17889-1--