diff --git a/python-ftfy.changes b/python-ftfy.changes index e0dba7c..21278be 100644 --- a/python-ftfy.changes +++ b/python-ftfy.changes @@ -1,3 +1,58 @@ +------------------------------------------------------------------- +Wed Apr 23 20:26:25 UTC 2025 - Matej Cepl + +- Add python-ftfy.rpmlintrc properly. +- Remove upstreamed update-wcwidth.patch + +------------------------------------------------------------------- +Wed Apr 23 15:11:54 UTC 2025 - Felix Stegmeier + +- update to 6.3.1 + * Fixed license metadata field in pyproject.toml. + * Removed extraneous files from the hatchling sdist output. +- Version 6.3.0 (October 8, 2024) + * Switched packaging from poetry to uv. + * Uses modern Python packaging exclusively (no setup.py). + * Added support for mojibake in Windows-1257 (Baltic). + * Detects mojibake for "Ü" in an uppercase word, such as "ZURÜCK". + * Expanded a heuristic that notices improbable punctuation. + * Fixed a false positive involving two concatenated strings, one of + which began with the § sign. + * Rewrote chardata.py to be more human-readable and debuggable, + instead of being full of keysmash-like character sets. +- Version 6.2.3 (August 5, 2024) + * Updated PyPI metadata. +- Version 6.2.2 (August 5, 2024) + * Updated Read the Docs config so that docs might build again. +- Version 6.2.1 (August 5, 2024) + * Updated setup.py and tox.ini to indicate support for Python 3.8 + through 3.13. + * Replaced the text file used in CLI tests with a better one that + tests the same issue. + * Lints and auto-formatting using ruff. + * Packaging and test fixes by Michał Górny. +- Version 6.2.0 (March 15, 2024) + * Fixed a case where an en-dash and a space near other mojibake + would be interpreted (probably incorrectly) as MacRoman mojibake. + * Added [project.urls] metadata to pyproject.toml. + * README contains license clarifications for entitled jerks. +- Version 6.1.3 (November 21, 2023) + * Updated wcwidth. + * Switched to the Apache 2.0 license. + * Dropped support for Python 3.7. +- Version 6.1.2 (February 17, 2022) + * Added type information for guess_bytes. +- Version 6.1.1 (February 9, 2022) + * Updated the heuristic to fix the letter ß in UTF-8/MacRoman mojibake, + which had regressed since version 5.6. + * Packaging fixes to pyproject.toml. +- Version 6.1 (February 9, 2022) + * Updated the heuristic to fix the letter Ñ with more confidence. + * Fixed type annotations and added py.typed. + * ftfy is packaged using Poetry now, and wheels are created and uploaded + to PyPI. + + ------------------------------------------------------------------- Mon Oct 7 16:44:39 UTC 2024 - Meera Belur diff --git a/python-ftfy.rpmlintrc b/python-ftfy.rpmlintrc new file mode 100644 index 0000000..f1b3d5d --- /dev/null +++ b/python-ftfy.rpmlintrc @@ -0,0 +1 @@ +addFilter("python-bytecode-inconsistent-mtime") diff --git a/python-ftfy.spec b/python-ftfy.spec index 6eebaa7..35cff21 100644 --- a/python-ftfy.spec +++ b/python-ftfy.spec @@ -1,7 +1,7 @@ # # spec file for package python-ftfy # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,17 +15,18 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %{?sle15_python_module_pythons} %define skip_python2 1 Name: python-ftfy -Version: 6.0.3 +Version: 6.3.1 Release: 0 Summary: Python module for repairing mis-decoded Unicode text License: MIT URL: https://github.com/rspeer/python-ftfy -Source: https://github.com/rspeer/python-ftfy/archive/refs/tags/v%{version}.tar.gz -# PATCH-FIX-UPSTREAM update-wcwidth.patch gh#rspeer/python-ftfy@5d975c6bb183 -Patch1: update-wcwidth.patch +Source0: https://github.com/rspeer/python-ftfy/archive/refs/tags/v%{version}.tar.gz +Source99: python-ftfy.rpmlintrc +BuildRequires: %{python_module hatchling} BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wheel} @@ -33,7 +34,7 @@ BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-wcwidth Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives BuildArch: noarch # SECTION test requirements BuildRequires: %{python_module pytest} diff --git a/update-wcwidth.patch b/update-wcwidth.patch deleted file mode 100644 index 05e44ba..0000000 --- a/update-wcwidth.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 5d975c6bb1836d4a1abf0e44675a08f1a9321be9 Mon Sep 17 00:00:00 2001 -From: Elia Robyn Lake -Date: Tue, 21 Nov 2023 18:40:17 -0500 -Subject: [PATCH] update wcwidth - ---- - ftfy/formatting.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -Index: python-ftfy-6.0.3/ftfy/formatting.py -=================================================================== ---- python-ftfy-6.0.3.orig/ftfy/formatting.py -+++ python-ftfy-6.0.3/ftfy/formatting.py -@@ -28,7 +28,7 @@ def character_width(char: str) -> int: - >>> character_width('\n') - -1 - """ -- return wcwidth(char) -+ return int(wcwidth(char)) - - - def monospaced_width(text: str) -> int: -@@ -47,7 +47,7 @@ def monospaced_width(text: str) -> int: - >>> len('ちゃぶ台返し') - 6 - >>> monospaced_width('owl\N{SOFT HYPHEN}flavored') -- 12 -+ 11 - >>> monospaced_width('example\x80') - -1 - -@@ -70,7 +70,7 @@ def monospaced_width(text: str) -> int: - # - # Remove terminal escapes before calculating width, because if they are - # displayed as intended, they will have zero width. -- return wcswidth(remove_terminal_escapes(normalize('NFC', text))) -+ return int(wcswidth(remove_terminal_escapes(normalize("NFC", text)))) - - - def display_ljust(text, width, fillchar=' '): diff --git a/v6.0.3.tar.gz b/v6.0.3.tar.gz deleted file mode 100644 index 9d5b2e4..0000000 --- a/v6.0.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74befdb0ac765e6f73fa00aa71094d35ddbd8ebec0e401250bb23bed09f88f83 -size 331508 diff --git a/v6.3.1.tar.gz b/v6.3.1.tar.gz new file mode 100644 index 0000000..f8a138a --- /dev/null +++ b/v6.3.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c3879706cd22ec5666523b65f2a00d0414888f45412bb41dc732d5c7ee4d35d0 +size 361505