[bug#68890] [PATCH] gnu: pspp: Update to 2.0.0

[bug#68890] [PATCH] gnu: pspp: Update to 2.0.0

[Andy Tai]

* gnu/packages/statistics.scm (pspp): Update to 2.0.0

Change-Id: I9feeab72789347033d2df8f23bda9ea27aaa7dd9
---
 gnu/packages/statistics.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 974b51e14e..2e55a1edf9 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -114,7 +114,7 @@ (define-module (gnu packages statistics)
 (define-public pspp
   (package
     (name "pspp")
-    (version "1.4.1")
+    (version "2.0.0")
     (source
      (origin
       (method url-fetch)
@@ -122,7 +122,7 @@ (define-public pspp
                           version ".tar.gz"))
       (sha256
        (base32
-        "0lqrash677b09zxdlxp89z6k02y4i23mbqg83956dwl69wc53dan"))))
+        "1pyqlab9kw65wxc8pilcwb64l18w37xxdg3r6n287c7mda4cpxm8"))))
     (build-system gnu-build-system)
     (arguments
      (list #:phases
@@ -148,7 +148,7 @@ (define-public pspp
            `(,glib "bin") ;for glib-genmarshal
            perl
            pkg-config
-           python-2 ;for tests
+           python-3 ;for tests
            texinfo))
     (home-page "https://www.gnu.org/software/pspp/")
     (synopsis "Statistical analysis")

base-commit: 88e8b807d6af3cf2902909d295cd3194aa7ea684
prerequisite-patch-id: c66f8f7565e88c54c25fe3b0fe42ca5e408609e1
prerequisite-patch-id: c4597470d2ce37f6458ac45f758903fb8083198c
-- 
2.41.0

[bug#68890] [PATCH] gnu: pspp: Update to 2.0.0

[Skyler Ferris via Guix-patches via]

Hi Andy,

I just wanted to check if you have seen the QA status on this patch? It 
looks like it fails to build. From the build log for x86_64 
(https://bordeaux.guix.gnu.org/build/4984d142-a7f3-43da-8dc7-2b32e7781bfd/log), 
there is one test failing:

1596: tex non-ascii                                   FAILED (tex.at:280)
...
## ------------- ##
## Test results. ##
## ------------- ##

ERROR: 1621 tests were run,
1 failed unexpectedly.
8 tests were skipped.

Regards,
Skyler

[bug#68890] [PATCH] gnu: pspp: Update to 2.0.0

[Andy Tai]

yes, I have. Sorry I have not had the time to come back to this.  Will
try to get to it soon


On Thu, Feb 22, 2024 at 3:57 PM Skyler Ferris <skyvine@protonmail.com> wrote:
>
> Hi Andy,
>
> I just wanted to check if you have seen the QA status on this patch? It
> looks like it fails to build. From the build log for x86_64
> (https://bordeaux.guix.gnu.org/build/4984d142-a7f3-43da-8dc7-2b32e7781bfd/log),
> there is one test failing:
>
> 1596: tex non-ascii                                   FAILED (tex.at:280)
> ...
> ## ------------- ##
> ## Test results. ##
> ## ------------- ##
>
> ERROR: 1621 tests were run,
> 1 failed unexpectedly.
> 8 tests were skipped.
>
> Regards,
> Skyler
>

[bug#68890] [PATCH] gnu: pspp: Update to 2.0.0

[Skyler Ferris via Guix-patches via]

On 2/22/24 16:35, Andy Tai wrote:
> yes, I have. Sorry I have not had the time to come back to this.  Will
> try to get to it soon
>
Sounds good. Just to make sure I'm communicating clearl, I sent that 
email because I was looking at the QA dashboard and thought it would be 
useful to make sure you were aware of it to avoid a situation where 
somebody comes along in a month to send essentially the same email, but 
later. I did not mean to communicate that I have a particularly urgent 
need for this patch.

[bug#68890] [PATCH v2] gnu: pspp: Update to 2.0.0

[Andy Tai]

* gnu/packages/statistics.scm (pspp): Update to 2.0.0
  [arguments](phases): Patch test case to skip failed test due to locale

Change-Id: I9feeab72789347033d2df8f23bda9ea27aaa7dd9
---
 gnu/packages/statistics.scm | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 01d5e25a1a..b77f167c03 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -115,7 +115,7 @@ (define-module (gnu packages statistics)
 (define-public pspp
   (package
     (name "pspp")
-    (version "1.4.1")
+    (version "2.0.0")
     (source
      (origin
       (method url-fetch)
@@ -123,12 +123,18 @@ (define-public pspp
                           version ".tar.gz"))
       (sha256
        (base32
-        "0lqrash677b09zxdlxp89z6k02y4i23mbqg83956dwl69wc53dan"))))
+        "1pyqlab9kw65wxc8pilcwb64l18w37xxdg3r6n287c7mda4cpxm8"))))
     (build-system gnu-build-system)
     (arguments
      (list #:phases
            #~(modify-phases %standard-phases
-               (add-before 'check 'prepare-tests
+         (add-after 'unpack 'patch-test-suite
+				 (lambda _
+				   (substitute* "tests/output/tex.at"
+					   (("AT_CHECK\\(\\[LC_ALL=C.UTF-8 pspp")
+						   "dnl AT_CHECK([LC_ALL=C.UTF-8 pspp"))
+					 #t))
+         (add-before 'check 'prepare-tests
                  ;; Prevent irrelevant errors that cause test output mismatches:
                  ;; ‘Fontconfig error: No writable cache directories’
                  (lambda _
@@ -149,7 +155,7 @@ (define-public pspp
            `(,glib "bin") ;for glib-genmarshal
            perl
            pkg-config
-           python-2 ;for tests
+           python-3 ;for tests
            texinfo))
     (home-page "https://www.gnu.org/software/pspp/")
     (synopsis "Statistical analysis")

base-commit: 05bbe9993f687da1fd684a31474c621f2a1c37b2
-- 
2.34.1

[bug#68890] [PATCH v2] gnu: pspp: Update to 2.0.0

[Nicolas Goaziou via Guix-patches via]

Hello,

Andy Tai <atai@atai.org> writes:

> * gnu/packages/statistics.scm (pspp): Update to 2.0.0
>   [arguments](phases): Patch test case to skip failed test due to locale
>
> Change-Id: I9feeab72789347033d2df8f23bda9ea27aaa7dd9
> ---
>  gnu/packages/statistics.scm | 14 ++++++++++----
>  1 file changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
> index 01d5e25a1a..b77f167c03 100644
> --- a/gnu/packages/statistics.scm
> +++ b/gnu/packages/statistics.scm
> @@ -115,7 +115,7 @@ (define-module (gnu packages statistics)
>  (define-public pspp
>    (package
>      (name "pspp")
> -    (version "1.4.1")
> +    (version "2.0.0")
>      (source
>       (origin
>        (method url-fetch)
> @@ -123,12 +123,18 @@ (define-public pspp
>                            version ".tar.gz"))
>        (sha256
>         (base32
> -        "0lqrash677b09zxdlxp89z6k02y4i23mbqg83956dwl69wc53dan"))))
> +        "1pyqlab9kw65wxc8pilcwb64l18w37xxdg3r6n287c7mda4cpxm8"))))
>      (build-system gnu-build-system)
>      (arguments
>       (list #:phases
>             #~(modify-phases %standard-phases
> -               (add-before 'check 'prepare-tests
> +         (add-after 'unpack 'patch-test-suite
> +				 (lambda _
> +				   (substitute* "tests/output/tex.at"
> +					   (("AT_CHECK\\(\\[LC_ALL=C.UTF-8 pspp")
> +						   "dnl AT_CHECK([LC_ALL=C.UTF-8 pspp"))
> +					 #t))

Nitpick: trailing #T are no longer recommended at the end of phases. You
can remove this one.

> +         (add-before 'check 'prepare-tests
>                   ;; Prevent irrelevant errors that cause test output mismatches:
>                   ;; ‘Fontconfig error: No writable cache directories’
>                   (lambda _
> @@ -149,7 +155,7 @@ (define-public pspp
>             `(,glib "bin") ;for glib-genmarshal
>             perl
>             pkg-config
> -           python-2 ;for tests
> +           python-3 ;for tests

This change should appear in the commit message.

Regards,
-- 
Nicolas Goaziou

[bug#68890] [PATCH v3] gnu: pspp: Update to 2.0.0

[Andy Tai]

* gnu/packages/statistics.scm (pspp): Update to 2.0.0
  [arguments](phases): Patch test case to skip failed test due to locale
  [native-inputs]: Switch from Python 2 to Python 3

Change-Id: I9feeab72789347033d2df8f23bda9ea27aaa7dd9
---
 gnu/packages/statistics.scm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 01d5e25a1a..a22a36d18a 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -115,7 +115,7 @@ (define-module (gnu packages statistics)
 (define-public pspp
   (package
     (name "pspp")
-    (version "1.4.1")
+    (version "2.0.0")
     (source
      (origin
       (method url-fetch)
@@ -123,12 +123,17 @@ (define-public pspp
                           version ".tar.gz"))
       (sha256
        (base32
-        "0lqrash677b09zxdlxp89z6k02y4i23mbqg83956dwl69wc53dan"))))
+        "1pyqlab9kw65wxc8pilcwb64l18w37xxdg3r6n287c7mda4cpxm8"))))
     (build-system gnu-build-system)
     (arguments
      (list #:phases
            #~(modify-phases %standard-phases
-               (add-before 'check 'prepare-tests
+         (add-after 'unpack 'patch-test-suite
+				 (lambda _
+				   (substitute* "tests/output/tex.at"
+					   (("AT_CHECK\\(\\[LC_ALL=C.UTF-8 pspp")
+						   "dnl AT_CHECK([LC_ALL=C.UTF-8 pspp"))))
+         (add-before 'check 'prepare-tests
                  ;; Prevent irrelevant errors that cause test output mismatches:
                  ;; ‘Fontconfig error: No writable cache directories’
                  (lambda _
@@ -149,7 +154,7 @@ (define-public pspp
            `(,glib "bin") ;for glib-genmarshal
            perl
            pkg-config
-           python-2 ;for tests
+           python-3 ;for tests
            texinfo))
     (home-page "https://www.gnu.org/software/pspp/")
     (synopsis "Statistical analysis")

base-commit: 05bbe9993f687da1fd684a31474c621f2a1c37b2
-- 
2.34.1

[bug#68890] [PATCH v4] gnu: pspp: Update to 2.0.0

[Andy Tai]

* gnu/packages/statistics.scm (pspp): Update to 2.0.0
  [arguments](phases): Patch test case to make pass due to locale
  [native-inputs]: Switch from Python 2 to Python 3

Change-Id: I9feeab72789347033d2df8f23bda9ea27aaa7dd9
---
 gnu/packages/statistics.scm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 01d5e25a1a..05bdb589f7 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -115,7 +115,7 @@ (define-module (gnu packages statistics)
 (define-public pspp
   (package
     (name "pspp")
-    (version "1.4.1")
+    (version "2.0.0")
     (source
      (origin
       (method url-fetch)
@@ -123,12 +123,17 @@ (define-public pspp
                           version ".tar.gz"))
       (sha256
        (base32
-        "0lqrash677b09zxdlxp89z6k02y4i23mbqg83956dwl69wc53dan"))))
+        "1pyqlab9kw65wxc8pilcwb64l18w37xxdg3r6n287c7mda4cpxm8"))))
     (build-system gnu-build-system)
     (arguments
      (list #:phases
            #~(modify-phases %standard-phases
-               (add-before 'check 'prepare-tests
+         (add-after 'unpack 'patch-test-suite
+				 (lambda _
+				   (substitute* "tests/output/tex.at"
+					   (("AT_CHECK\\(\\[LC_ALL=C.UTF-8 pspp")
+						   "AT_CHECK([LC_ALL=en_US.UTF-8 pspp"))))
+         (add-before 'check 'prepare-tests
                  ;; Prevent irrelevant errors that cause test output mismatches:
                  ;; ‘Fontconfig error: No writable cache directories’
                  (lambda _
@@ -149,7 +154,7 @@ (define-public pspp
            `(,glib "bin") ;for glib-genmarshal
            perl
            pkg-config
-           python-2 ;for tests
+           python-3 ;for tests
            texinfo))
     (home-page "https://www.gnu.org/software/pspp/")
     (synopsis "Statistical analysis")

base-commit: 05bbe9993f687da1fd684a31474c621f2a1c37b2
-- 
2.34.1

[bug#68890] passes QA

[Andy Tai]

[-- Attachment #1: Type: text/plain, Size: 58 bytes --]

patch passes Guix QA: https://qa.guix.gnu.org/issue/68890

[-- Attachment #2: Type: text/html, Size: 229 bytes --]

bug#68890: [PATCH v4] gnu: pspp: Update to 2.0.0

[Ludovic Courtès]

Andy Tai <atai@atai.org> skribis:

> * gnu/packages/statistics.scm (pspp): Update to 2.0.0
>   [arguments](phases): Patch test case to make pass due to locale
>   [native-inputs]: Switch from Python 2 to Python 3
>
> Change-Id: I9feeab72789347033d2df8f23bda9ea27aaa7dd9

[...]

>             #~(modify-phases %standard-phases
> -               (add-before 'check 'prepare-tests
> +         (add-after 'unpack 'patch-test-suite
> +				 (lambda _
> +				   (substitute* "tests/output/tex.at"
> +					   (("AT_CHECK\\(\\[LC_ALL=C.UTF-8 pspp")
> +						   "AT_CHECK([LC_ALL=en_US.UTF-8 pspp"))))

I adjusted indentation here and applied it, thanks!