From patchwork Sun May 14 15:17:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Philippe SWARTVAGHER X-Patchwork-Id: 50005 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D3A0E27BBEE; Sun, 14 May 2023 16:19:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C3FF027BBE2 for ; Sun, 14 May 2023 16:19:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pyDV3-0001FG-1W; Sun, 14 May 2023 11:19:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pyDV1-0001F7-1a for guix-patches@gnu.org; Sun, 14 May 2023 11:19:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pyDV0-0003g9-Pz for guix-patches@gnu.org; Sun, 14 May 2023 11:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pyDV0-0006MH-5z for guix-patches@gnu.org; Sun, 14 May 2023 11:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63502] [PATCH] gnu: python-babel: Update to 2.12.1. Resent-From: Philippe SWARTVAGHER Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 May 2023 15:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63502 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63502@debbugs.gnu.org Cc: Philippe SWARTVAGHER X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168407751924405 (code B ref -1); Sun, 14 May 2023 15:19:02 +0000 Received: (at submit) by debbugs.gnu.org; 14 May 2023 15:18:39 +0000 Received: from localhost ([127.0.0.1]:41334 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyDUc-0006LY-Uy for submit@debbugs.gnu.org; Sun, 14 May 2023 11:18:39 -0400 Received: from lists.gnu.org ([209.51.188.17]:36618) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyDUb-0006LQ-DY for submit@debbugs.gnu.org; Sun, 14 May 2023 11:18:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pyDUb-0001DT-6U for guix-patches@gnu.org; Sun, 14 May 2023 11:18:37 -0400 Received: from mout.gmx.net ([212.227.17.20]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pyDUZ-0003eR-2d for guix-patches@gnu.org; Sun, 14 May 2023 11:18:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.fr; s=s31663417; t=1684077512; i=phil.swart@gmx.fr; bh=etzi/CsT4sgN63D5aTcRRN+B/0f4KyHwC64PbrzVKUo=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=dfrVV+5eYnESRZscZWnOxB9gNKWZYfu7lU0EwYXS4rtJLVP9hqJ68voElFUn9Nbq+ 9C7pPeWek7WOH+ZCG7ydEZEI2vJd4yyS1WopqdppvXE/yHbg74J9EfXFUCcn6xiaXt 12iDABgy0LrTjy/bysoVZ6zsDf09Gql1feRPrk3Z3Pgsk1Ka8FnE/lBbLbpHGoSEIo jhP5xKJAQJvKSDPlCLElOlJq7RFShj+Sllb4veMcLPrE0v/dWDz0oM8JcWBZksqd4g PFqOMzHI+Fw1lKYxKnYgKnuPokTAJeXjUUHfmpB+p12zOuPQ7jp+hLQrcRzWEn4Dla KAdd4nv63jqkw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.localdomain ([62.99.135.46]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MK3Rm-1pkOMr2LXC-00LWpV; Sun, 14 May 2023 17:18:32 +0200 From: Philippe SWARTVAGHER Date: Sun, 14 May 2023 17:17:36 +0200 Message-Id: <3227a76d744b9a670555dad4ccd4e6c0743f6de1.1684077403.git.phil.swart@gmx.fr> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:gorV42lu0Bvf7eYBQaLPejwr45dkZSdqFKqsx2j0ZtmscANA1a1 I4gdAjE/ORf7t9+aTkj8vC01B1vR0FpBSdzbY2LGzvPx3/VNyT5UFPDpJct8xFDLZ7OE0l2 wYwUkEu/emQYs28hXPoC72WGHexyW8ShW7s82OJYsZqRgODAP1PPScU/LC84Mh69Q4ZyXGo Ff06Iyy4SwXG2YiULdetw== UI-OutboundReport: notjunk:1;M01:P0:57CcUIhHAaY=;aRykQrWDvIPPjP37W8CpTKcRRPR NNn6wl6t/Lkmhhg9vVve6DJQtaKq851+BXvVHY9KXexaSRom6H0XuS7iUcOpZsl0IZj5dNd52 wXfPBp2NHr1BCIMhA7pVOrmpgqtY/fe00/c5RtrO+oEGG27o616z7Xot4u54y2K6gHaR45V3H eH5/QeADKe0Pnl1y7MtrtLduQA8hSTk8diLvckCUzduZ5rrt4EESeBbWFIywAK0B6t7oA9UWn rOfbEGdXUwcxMx+UjkWYBHizL8SEvnx4w3XKPMgcX1AKvznLMQgMze0Ci7X4cjIkjdUOst5bv ljO9tQEulFyW4kpTHZkwTFkc5AKBz7QTU831kfCAJrBToaGxZioMvagfUFtoDQ97jVyOGA7/7 +Si2sDxVb8Ok9IaKyeTs+3meSReiXM0FoujiDOxHEsZLRK+ehqIJBklP/8CucHxoQzlDA0ltx 9ncH3AM62wDE5w8GHEN7CUHZz0VMBHD3JzHlzxzJPkf18adeHnG4JOl4WNwD6CWgMeiYLS+Nl OsBQN47/rTgXr+UCv/nJv2GbD9qGWXrlG9FvPN7ktPhXtxOh6fyOH/Kxoq2JTXUmkc6XjeopD PpWSrDgMFKaMTUYWi6wF6b2DPnp+J2iNnidBihsLoJil+HtaHkDbHh4CRkS972nM/Yc4HJ1xc b4aOsK1wpmrizA93x9ZKbMlbMOD7sC0wGAqhuUbO+9gv1K5Ivw4petHb134EMJ0x/9ODxjUfS 9GOUw11l9ZOhyrOgjvcoRsLvtkjRlsvn2QjRQDOGwQTp15jf4t+JN5kayzyK/KAjARCc8QSf4 oVRI9GOkeDOn+Z8TpUQfpE/ttjGG/0/lVZVX9Q6Z1cotIqVgUDXrfiJWb5P+5/0uofk3clBI2 dB3EVsu9akHkr6e7WVA6NLr7elLWbpQLF2tjO+NwFsMIzSHpnUEBMQCf2kpQykstD5I4NJnsE lXW/hgp6I84n/Tuljs1KX6KDob4= Received-SPF: pass client-ip=212.227.17.20; envelope-from=phil.swart@gmx.fr; helo=mout.gmx.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/python-babel-fix-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/python-xyz.scm (python-babel): Use it, update to 2.12.1 and apply `guix style'. --- gnu/local.mk | 1 + .../patches/python-babel-fix-tests.patch | 43 +++++++++++++++++++ gnu/packages/python-xyz.scm | 26 ++++++----- 3 files changed, 56 insertions(+), 14 deletions(-) create mode 100644 gnu/packages/patches/python-babel-fix-tests.patch base-commit: eb7312401ea89e634f8d686db71bacda58b2755f -- 2.30.2 diff --git a/gnu/local.mk b/gnu/local.mk index 012ce84d2d..4fa9033427 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1678,6 +1678,7 @@ dist_patch_DATA = \ %D%/packages/patches/prusa-slicer-fix-tests.patch \ %D%/packages/patches/prusa-slicer-with-cereal-1.3.1.patch \ %D%/packages/patches/pthreadpool-system-libraries.patch \ + %D%/packages/patches/python-babel-fix-tests.patch \ %D%/packages/patches/python-chai-drop-python2.patch \ %D%/packages/patches/python-feedparser-missing-import.patch \ %D%/packages/patches/python-louvain-fix-test.patch \ diff --git a/gnu/packages/patches/python-babel-fix-tests.patch b/gnu/packages/patches/python-babel-fix-tests.patch new file mode 100644 index 0000000000..4779f907a9 --- /dev/null +++ b/gnu/packages/patches/python-babel-fix-tests.patch @@ -0,0 +1,43 @@ +From 641f58c9951d9f5746cd63743dd337f1340d7bff Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Fri, 7 Apr 2023 14:51:10 +0000 +Subject: [PATCH] Freeze format_time() tests to a specific date to fix test + failures + +Freeze the date when performing the tests for format_time() with +a timezone specified. Since the time object does not specify a date, +the formatter uses the format string specific to the current date. +As a result, if the current DST state is different than when the test +was last updated, it failed. + +This fix covers only regular tests. I have no idea how to do the same +for doctests. + +Issue #988 +--- + tests/test_dates.py | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/tests/test_dates.py b/tests/test_dates.py +index b94c710f..3f1fc3fc 100644 +--- a/tests/test_dates.py ++++ b/tests/test_dates.py +@@ -601,12 +601,13 @@ def test_format_time(timezone_getter): + custom = dates.format_time(t, "hh 'o''clock' a, zzzz", tzinfo=eastern, locale='en') + assert custom == "09 o'clock AM, Eastern Daylight Time" + +- t = time(15, 30) +- paris = dates.format_time(t, format='full', tzinfo=paris, locale='fr_FR') +- assert paris == '15:30:00 heure normale d’Europe centrale' ++ with freezegun.freeze_time("2023-01-01"): ++ t = time(15, 30) ++ paris = dates.format_time(t, format='full', tzinfo=paris, locale='fr_FR') ++ assert paris == '15:30:00 heure normale d’Europe centrale' + +- us_east = dates.format_time(t, format='full', tzinfo=eastern, locale='en_US') +- assert us_east == '3:30:00\u202fPM Eastern Standard Time' ++ us_east = dates.format_time(t, format='full', tzinfo=eastern, locale='en_US') ++ assert us_east == '3:30:00\u202fPM Eastern Standard Time' + + + def test_format_skeleton(timezone_getter): diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b6527221c4..a8a3c91352 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1797,27 +1797,25 @@ (define-public python-clyent (define-public python-babel (package (name "python-babel") - (version "2.10.3") - (source - (origin - (method url-fetch) - (uri (pypi-uri "Babel" version)) - (sha256 - (base32 - "0l9cvfmsz0hlvcinxaf6xf2f02ldgw3xq9i1fc7lk5zf24vma53n")))) + (version "2.12.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "Babel" version)) + (sha256 + (base32 + "0m9ljs0qabb2gwadcxkrvjmb649pkqfa49g7191487fhkjcrjbfc")) + ;; fix a failing test, see https://github.com/python-babel/babel/pull/998 + (patches (search-patches "python-babel-fix-tests.patch")))) (build-system python-build-system) - (native-inputs - (list python-freezegun python-pytest tzdata-for-tests)) - (propagated-inputs - (list python-pytz)) + (native-inputs (list python-freezegun python-pytest tzdata-for-tests)) + (propagated-inputs (list python-pytz)) (arguments `(#:phases (modify-phases %standard-phases (replace 'check (lambda _ (invoke "pytest" "-vv")))))) (home-page "https://babel.pocoo.org/") - (synopsis - "Tools for internationalizing Python applications") + (synopsis "Tools for internationalizing Python applications") (description "Babel is composed of two major parts: - tools to build and work with gettext message catalogs