[bug#77836,emacs-team] gnu: emacs-ws-butler: Update to 1.3.

Message ID 6a4c3d1a2e7f3123de3bc37e9768b5939358adb8.1744786200.git.csantosb@inventati.org
State New
Headers
Series [bug#77836,emacs-team] gnu: emacs-ws-butler: Update to 1.3. |

Commit Message

Cayetano Santos April 16, 2025, 6:50 a.m. UTC
  * gnu/packages/emacs-xyz.scm (emacs-ws-butler): Update to 1.3.

Change-Id: Ibee124269d8fe54029f9dea902991ba7d86cab89
---
 gnu/packages/emacs-xyz.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)


base-commit: 373545dc9efbae6589f502773aa49e26e42c585e
  

Comments

Liliana Marie Prikler April 16, 2025, 7:49 p.m. UTC | #1
Am Mittwoch, dem 16.04.2025 um 08:50 +0200 schrieb Cayetano Santos:
> * gnu/packages/emacs-xyz.scm (emacs-ws-butler): Update to 1.3.
> 
> Change-Id: Ibee124269d8fe54029f9dea902991ba7d86cab89
> ---
>  gnu/packages/emacs-xyz.scm | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
> index 82831f0595..4504ecae6e 100644
> --- a/gnu/packages/emacs-xyz.scm
> +++ b/gnu/packages/emacs-xyz.scm
> @@ -23123,15 +23123,19 @@ (define-public emacs-hercules
>  (define-public emacs-ws-butler
>    (package
>      (name "emacs-ws-butler")
> -    (version "1.1")
> +    (version "1.3")
>      (source
>       (origin
>         (method url-fetch)
>         (uri (string-append
> "https://elpa.nongnu.org/nongnu/ws-butler-" version
>                             ".tar"))
>         (sha256
> -        (base32
> "1vy7g2ryg1drcz9zpn011d36zcd9a5b5yny5hwpjrllqj5dg73jx"))))
> +        (base32
> "14q19rvps5jcshyls3aa55pxmqbbkhhbdlchnl7ybxwkvvmig9zh"))))
>      (build-system emacs-build-system)
> +    (arguments
> +     (list
> +      #:tests? #f ; no Makefile in tar file
> +      #:test-command #~(list "make" "test")))
Why do you use "make" for a test command, when there's no Makefile?
>      (home-page "https://elpa.nongnu.org/nongnu/ws-butler.html")
>      (synopsis "Unobtrusively remove trailing whitespace")
>      (description
> 
> base-commit: 373545dc9efbae6589f502773aa49e26e42c585e

Cheers
  
Cayetano Santos April 17, 2025, 8:51 a.m. UTC | #2
>mer. 16 avril 2025 at 21:49, Liliana Marie Prikler <liliana.prikler@gmail.com> wrote:

>>      (source
>>       (origin
>>         (method url-fetch)
>>         (uri (string-append
>> "https://elpa.nongnu.org/nongnu/ws-butler-" version
>>                             ".tar"))
>>         (sha256
>> -        (base32
>> "1vy7g2ryg1drcz9zpn011d36zcd9a5b5yny5hwpjrllqj5dg73jx"))))
>> +        (base32
>> "14q19rvps5jcshyls3aa55pxmqbbkhhbdlchnl7ybxwkvvmig9zh"))))
>>      (build-system emacs-build-system)
>> +    (arguments
>> +     (list
>> +      #:tests? #f ; no Makefile in tar file
>> +      #:test-command #~(list "make" "test")))
> Why do you use "make" for a test command, when there's no Makefile?

There is a Makefile in the repo, including a target for tests:

    https://git.savannah.gnu.org/cgit/emacs/nongnu.git/tree/?h=elpa/ws-butler

Except that the Makefile is removed from elpa .tar file.

Similar to other packages, we disable tests, specifying the reason,
while we provide the recipe to run them, once the issue fixed.

Not sure what is the right option with elpa .tar files, cloning nongnu
instead ? remove test-command ?

C.
  
Liliana Marie Prikler April 17, 2025, 6:19 p.m. UTC | #3
Am Donnerstag, dem 17.04.2025 um 10:51 +0200 schrieb Cayetano Santos:
> 
> > mer. 16 avril 2025 at 21:49, Liliana Marie Prikler
> > <liliana.prikler@gmail.com> wrote:
> 
> > >      (source
> > >       (origin
> > >         (method url-fetch)
> > >         (uri (string-append
> > > "https://elpa.nongnu.org/nongnu/ws-butler-" version
> > >                             ".tar"))
> > >         (sha256
> > > -        (base32
> > > "1vy7g2ryg1drcz9zpn011d36zcd9a5b5yny5hwpjrllqj5dg73jx"))))
> > > +        (base32
> > > "14q19rvps5jcshyls3aa55pxmqbbkhhbdlchnl7ybxwkvvmig9zh"))))
> > >      (build-system emacs-build-system)
> > > +    (arguments
> > > +     (list
> > > +      #:tests? #f ; no Makefile in tar file
> > > +      #:test-command #~(list "make" "test")))
> > Why do you use "make" for a test command, when there's no Makefile?
> 
> There is a Makefile in the repo, including a target for tests:
> 
>    
> https://git.savannah.gnu.org/cgit/emacs/nongnu.git/tree/?h=elpa/ws-butler
> 
> Except that the Makefile is removed from elpa .tar file.
> 
> Similar to other packages, we disable tests, specifying the reason,
> while we provide the recipe to run them, once the issue fixed.
> 
> Not sure what is the right option with elpa .tar files, cloning
> nongnu instead ? remove test-command ?
Looking at the Makefile, I think it's actually preferable to spell out
the Emacs command for testing (including "--batch", which upstream does
not appear to use), in which case we only need the tests themselves
preserved in the archive.

Cheers
  
Cayetano Santos April 17, 2025, 7:42 p.m. UTC | #4
>jeu. 17 avril 2025 at 20:19, Liliana Marie Prikler <liliana.prikler@gmail.com> wrote:

>> > Why do you use "make" for a test command, when there's no Makefile?

>> There is a Makefile in the repo, including a target for tests:

>> https://git.savannah.gnu.org/cgit/emacs/nongnu.git/tree/?h=elpa/ws-butler
>>
>> Except that the Makefile is removed from elpa .tar file.
>>
>> Similar to other packages, we disable tests, specifying the reason,
>> while we provide the recipe to run them, once the issue fixed.
>>
>> Not sure what is the right option with elpa .tar files, cloning
>> nongnu instead ? remove test-command ?

> Looking at the Makefile, I think it's actually preferable to spell out
> the Emacs command for testing (including "--batch", which upstream does
> not appear to use), in which case we only need the tests themselves
> preserved in the archive.

Correct me if I’m wrong, but the tests folder itself is absent from the
tar file, I’m afraid.

At some point, we’d better replace all those limited elpa .tar files by
the real sources.
  
Liliana Marie Prikler April 17, 2025, 8:03 p.m. UTC | #5
Am Donnerstag, dem 17.04.2025 um 21:42 +0200 schrieb Cayetano Santos:
> > Looking at the Makefile, I think it's actually preferable to spell
> > out the Emacs command for testing (including "--batch", which
> > upstream does not appear to use), in which case we only need the
> > tests themselves preserved in the archive.
> 
> Correct me if I’m wrong, but the tests folder itself is absent from
> the tar file, I’m afraid.
> 
> At some point, we’d better replace all those limited elpa .tar files
> by the real sources.
Yeah, we do this for Python packages too and the same logic applies
here.  No tests in ELPA/PyPI? => Use upstream git.

Cheers
  

Patch

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 82831f0595..4504ecae6e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -23123,15 +23123,19 @@  (define-public emacs-hercules
 (define-public emacs-ws-butler
   (package
     (name "emacs-ws-butler")
-    (version "1.1")
+    (version "1.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://elpa.nongnu.org/nongnu/ws-butler-" version
                            ".tar"))
        (sha256
-        (base32 "1vy7g2ryg1drcz9zpn011d36zcd9a5b5yny5hwpjrllqj5dg73jx"))))
+        (base32 "14q19rvps5jcshyls3aa55pxmqbbkhhbdlchnl7ybxwkvvmig9zh"))))
     (build-system emacs-build-system)
+    (arguments
+     (list
+      #:tests? #f ; no Makefile in tar file
+      #:test-command #~(list "make" "test")))
     (home-page "https://elpa.nongnu.org/nongnu/ws-butler.html")
     (synopsis "Unobtrusively remove trailing whitespace")
     (description