GNU bug report logs - #75112
[PATCH] gnu: csvkit: Fix tests.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 75112 in the body.
You can then email your comments to 75112 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Wiktor Żelazny <wz <at> freeshell.de>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: csvkit: Fix tests.
Date: Thu, 26 Dec 2024 10:41:07 +0100

* gnu/packages/wireservice.scm (csvkit): Fix tests
[source]: Apply patch.
[native-inputs]: Add (libc-utf8-locales-for-target).
* gnu/packages/patches/csvkit-set-locale-for-tests.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.

Change-Id: I787c0da270fa4062491efcfa0c55a1b8bbac7b59
---
 gnu/local.mk                                        |  1 +
 .../patches/csvkit-set-locale-for-tests.patch       | 13 +++++++++++++
 gnu/packages/wireservice.scm                        |  7 +++++--
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/csvkit-set-locale-for-tests.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 84160f407a..838c2a06b3 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1131,6 +1131,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/crc32c-unbundle-googletest.patch		\
   %D%/packages/patches/crda-optional-gcrypt.patch		\
   %D%/packages/patches/clucene-contribs-lib.patch               \
+  %D%/packages/patches/csvkit-set-locale-for-tests.patch			\
   %D%/packages/patches/cube-nocheck.patch			\
   %D%/packages/patches/cups-minimal-Address-PPD-injection-issues.patch	\
   %D%/packages/patches/curl-CVE-2024-8096.patch			\
diff --git a/gnu/packages/patches/csvkit-set-locale-for-tests.patch b/gnu/packages/patches/csvkit-set-locale-for-tests.patch
new file mode 100644
index 0000000000..52f6a5d517
--- /dev/null
+++ b/gnu/packages/patches/csvkit-set-locale-for-tests.patch
@@ -0,0 +1,13 @@
+Contents copied from python-agate. See
+https://github.com/wireservice/agate/issues/712 for the source and the
+rationale.
+
+diff --git a/tests/__init__.py b/tests/__init__.py
+index e69de29..ee8beb5 100644
+--- a/tests/__init__.py
++++ b/tests/__init__.py
+@@ -0,0 +1,4 @@
++import locale
++
++# The test fixtures can break if the locale is non-US.
++locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
diff --git a/gnu/packages/wireservice.scm b/gnu/packages/wireservice.scm
index df630023cf..914945cf54 100644
--- a/gnu/packages/wireservice.scm
+++ b/gnu/packages/wireservice.scm
@@ -217,10 +217,13 @@ (define-public csvkit
               (uri (pypi-uri "csvkit" version))
               (sha256
                (base32
-                "08wj0hlmbdmklar12cjzqp91vcxzwifsvmgasszas8kbiyvvgpdy"))))
+                "08wj0hlmbdmklar12cjzqp91vcxzwifsvmgasszas8kbiyvvgpdy"))
+              (patches (search-patches
+                "csvkit-set-locale-for-tests.patch"))))
     (build-system python-build-system)
     (native-inputs
-     (list python-psycopg2 ; to test PostgreSQL support
+     (list (libc-utf8-locales-for-target)
+           python-psycopg2 ; to test PostgreSQL support
            python-sphinx python-sphinx-rtd-theme))
     (inputs
      (list python-agate-dbf python-agate-excel python-agate-sql

base-commit: e16cdcf37d8223b3634ec5e658356c3b7f154859
-- 
2.46.0

Message #10 received at 75112-done <at> debbugs.gnu.org (full text, mbox):

From: Guillaume Le Vaillant <glv <at> posteo.net>
To: Wiktor Żelazny <wz <at> freeshell.de>
Cc: 75112-done <at> debbugs.gnu.org
Subject: Re: [bug#75112] [PATCH] gnu: csvkit: Fix tests.
Date: Sun, 29 Dec 2024 10:50:44 +0000

[Message part 1 (text/plain, inline)]

Patch applied as 4a4a8c9d2621d4871c4b9c8857bfb0e6e53d7e56.
Thanks.

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.