From 81bec5de6f252a704256c438afceb230a31f0bdd0d254c207a4087199bd5e280 Mon Sep 17 00:00:00 2001 From: Daniel Garcia Date: Mon, 8 May 2023 10:04:44 +0000 Subject: [PATCH] - Add fix-tests.patch to make tests work with EST/EDT swap, gh#python-babel/babel#988 - Update to 2.12.1: * Include py.typed file in wheels by @AlexWaygood in #975 * Become 2.12.1 by @akx in #976 - 2.12.0: * docs(changes): Fix broken issue links by @DenverCoder1 in #922 * Update docs build configuration by @akx in #924 * feat: Adds Format.compact_decimal utility by @DenverCoder1 in #921 * Remove vestigial Python 2 long check by @akx in #925 * feat: Support for short compact currency formats by @DenverCoder1 in #926 * Drop support for EOL Python 3.6 by @akx in #919 * Cast number to Decimal in _get_compact_format by @DenverCoder1 in #930 * Replace %/.format/concatenation with f-strings where feasible by @akx in #927 * ci: Fix testing dependencies by @DenverCoder1 in #936 * javascript extract improvements by @johanneswilm in #939 * Fix compact singular formats and patterns with no numbers by @DenverCoder1 in #932 * fix typo by @uniontech-lilinjie in #941 * Enable pre-commit by @akx in #943 * Added inline type annotations to Babel by @DenverCoder1 in #934 * Implement zoneinfo support and make pytz optional by @ds-cbo in #940 * Unify datetime imports by @akx in #945 * Minor cleanups by @akx in #948 * Renovate formatting in test_checkers and test_frontend by @akx in #950 * Add ruff for linting by @akx in #949 * Upgrade to CLDR 42 by @akx in #951 * Update test dependencies (tox v4) by @DenverCoder1 in #953 * Remove redundant tests for babel.support by @akx in #954 * Support for formatting NaN, Infinity by @DenverCoder1 in #955 * Clean up babel.localtime by @akx in #952 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Babel?expand=0&rev=74 --- Babel-2.11.0.tar.gz | 3 --- Babel-2.12.1.tar.gz | 3 +++ fix-tests.patch | 43 +++++++++++++++++++++++++++++++++++++++++ python-Babel.changes | 46 ++++++++++++++++++++++++++++++++++++++++++++ python-Babel.spec | 6 ++++-- 5 files changed, 96 insertions(+), 5 deletions(-) delete mode 100644 Babel-2.11.0.tar.gz create mode 100644 Babel-2.12.1.tar.gz create mode 100644 fix-tests.patch diff --git a/Babel-2.11.0.tar.gz b/Babel-2.11.0.tar.gz deleted file mode 100644 index 0cc933c..0000000 --- a/Babel-2.11.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ef4b3226b0180dedded4229651c8b0e1a3a6a2837d45a073272f313e4cf97f6 -size 9346097 diff --git a/Babel-2.12.1.tar.gz b/Babel-2.12.1.tar.gz new file mode 100644 index 0000000..376c7dc --- /dev/null +++ b/Babel-2.12.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc2d99999cd01d44420ae725a21c9e3711b3aadc7976d6147f622d8581963455 +size 9906735 diff --git a/fix-tests.patch b/fix-tests.patch new file mode 100644 index 0000000..b2912c7 --- /dev/null +++ b/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(-) + +Index: Babel-2.12.1/tests/test_dates.py +=================================================================== +--- Babel-2.12.1.orig/tests/test_dates.py ++++ Babel-2.12.1/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/python-Babel.changes b/python-Babel.changes index fbe365d..5d2e68d 100644 --- a/python-Babel.changes +++ b/python-Babel.changes @@ -1,3 +1,49 @@ +------------------------------------------------------------------- +Mon May 8 10:00:09 UTC 2023 - Daniel Garcia + +- Add fix-tests.patch to make tests work with EST/EDT swap, + gh#python-babel/babel#988 +- Update to 2.12.1: + * Include py.typed file in wheels by @AlexWaygood in #975 + * Become 2.12.1 by @akx in #976 +- 2.12.0: + * docs(changes): Fix broken issue links by @DenverCoder1 in #922 + * Update docs build configuration by @akx in #924 + * feat: Adds Format.compact_decimal utility by @DenverCoder1 in #921 + * Remove vestigial Python 2 long check by @akx in #925 + * feat: Support for short compact currency formats by @DenverCoder1 in #926 + * Drop support for EOL Python 3.6 by @akx in #919 + * Cast number to Decimal in _get_compact_format by @DenverCoder1 in #930 + * Replace %/.format/concatenation with f-strings where feasible by @akx in #927 + * ci: Fix testing dependencies by @DenverCoder1 in #936 + * javascript extract improvements by @johanneswilm in #939 + * Fix compact singular formats and patterns with no numbers by @DenverCoder1 in #932 + * fix typo by @uniontech-lilinjie in #941 + * Enable pre-commit by @akx in #943 + * Added inline type annotations to Babel by @DenverCoder1 in #934 + * Implement zoneinfo support and make pytz optional by @ds-cbo in #940 + * Unify datetime imports by @akx in #945 + * Minor cleanups by @akx in #948 + * Renovate formatting in test_checkers and test_frontend by @akx in #950 + * Add ruff for linting by @akx in #949 + * Upgrade to CLDR 42 by @akx in #951 + * Update test dependencies (tox v4) by @DenverCoder1 in #953 + * Remove redundant tests for babel.support by @akx in #954 + * Support for formatting NaN, Infinity by @DenverCoder1 in #955 + * Clean up babel.localtime by @akx in #952 + * Use standard library UTC by @akx in #957 + * Fix unbound exc in babel.dates by @akx in #959 + * Finally remove get_next_timezone_transition by @akx in #958 + * More fixes and modernization by @akx in #960 + * Keep @modifiers when parsing locales by @madduck in #947 + * Add two new options in cmdline.rst docs by @m-aciek in #963 + * Numbers and core type fixes by @DenverCoder1 in #966 + * Use lru_cache where suitable by @akx in #967 + * Fix two issues with fuzzy matching by @jeanas in #970 + * Renovate CI tools a bit by @akx in #972 + * Tox: also test with pytz installed by @akx in #974 + * Become 2.12.0 by @akx in #973 + ------------------------------------------------------------------- Thu Apr 13 22:40:11 UTC 2023 - Matej Cepl diff --git a/python-Babel.spec b/python-Babel.spec index 19971d1..d98b192 100644 --- a/python-Babel.spec +++ b/python-Babel.spec @@ -26,12 +26,14 @@ %define oldpython python %{?sle15_python_module_pythons} Name: python-Babel -Version: 2.11.0 +Version: 2.12.1 Release: 0 Summary: Internationalization utilities License: BSD-3-Clause URL: http://babel.pocoo.org/ Source: https://files.pythonhosted.org/packages/source/B/Babel/Babel-%{version}.tar.gz +# PATCH-FIX-UPSTREAM: fix-tests.patch, gh#python-babel/babel#998 +Patch0: fix-tests.patch BuildRequires: %{python_module freezegun} BuildRequires: %{python_module py >= 1.4.14} BuildRequires: %{python_module pytest >= 2.3.5} @@ -62,7 +64,7 @@ Obsoletes: python3-babel < %{version} A collection of tools for internationalizing Python applications. %prep -%setup -q -n Babel-%{version} +%autosetup -p1 -n Babel-%{version} %build %python_build