From 4a4a8c9d2621d4871c4b9c8857bfb0e6e53d7e56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wiktor=20=C5=BBelazny?= Date: Thu, 26 Dec 2024 10:41:07 +0100 Subject: [PATCH] gnu: csvkit: Fix tests. * 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 Signed-off-by: Guillaume Le Vaillant --- gnu/local.mk | 1 + .../patches/csvkit-set-locale-for-tests.patch | 13 +++++++++++++ gnu/packages/wireservice.scm | 10 ++++++---- 3 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/csvkit-set-locale-for-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 84160f407a3f745db0c43686c7008116d5a2175b..838c2a06b37c60a6332ae59dfc0588354953ac0d 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 0000000000000000000000000000000000000000..52f6a5d5179a589190c1ba8a94bcb8825f02ca92 --- /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 df630023cfda1c85f34c04fa2d0e139bf322c3fd..c99bcd45240d51570bd787f902db794f72a297d1 100644 --- a/gnu/packages/wireservice.scm +++ b/gnu/packages/wireservice.scm @@ -217,10 +217,13 @@ for xls and xlsx files support to all @code{agate.Table} instances."))) (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 @@ -234,8 +237,7 @@ for xls and xlsx files support to all @code{agate.Table} instances."))) (man1 (string-append out "/share/man/man1"))) (with-directory-excursion "docs" (invoke "make" "man") - (copy-recursively "_build/man" man1)) - #t)))))) + (copy-recursively "_build/man" man1)))))))) (home-page "https://csvkit.rtfd.org") (synopsis "Command-line tools for working with CSV") (description "csvkit is a suite of command-line tools for converting to