From: "Wiktor Żelazny" <wz@freeshell.de>
To: 75112@debbugs.gnu.org
Subject: [bug#75112] [PATCH] gnu: csvkit: Fix tests.
Date: Thu, 26 Dec 2024 10:41:07 +0100 [thread overview]
Message-ID: <7c73aa954dc114f107c1159659c847d9c61d4788.1735205925.git.wz@freeshell.de> (raw)
* 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
reply other threads:[~2024-12-26 9:43 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7c73aa954dc114f107c1159659c847d9c61d4788.1735205925.git.wz@freeshell.de \
--to=wz@freeshell.de \
--cc=75112@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).