Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-unify for openSUSE:Factory checked in at 2024-12-12 21:19:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-unify (Old) and /work/SRC/openSUSE:Factory/.python-unify.new.29675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-unify" Thu Dec 12 21:19:30 2024 rev:7 rq:1230268 version:0.5 Changes: -------- --- /work/SRC/openSUSE:Factory/python-unify/python-unify.changes 2024-04-02 16:46:38.282089591 +0200 +++ /work/SRC/openSUSE:Factory/.python-unify.new.29675/python-unify.changes 2024-12-12 21:19:32.240081977 +0100 @@ -1,0 +2,7 @@ +Thu Dec 12 05:44:15 UTC 2024 - Steve Kowalik <[email protected]> + +- Switch to autosetup and pyproject macros. +- Add patch no-more-lib2to3.patch: + * Don't use lib2to3, use the tokenize module. + +------------------------------------------------------------------- New: ---- no-more-lib2to3.patch BETA DEBUG BEGIN: New:- Switch to autosetup and pyproject macros. - Add patch no-more-lib2to3.patch: * Don't use lib2to3, use the tokenize module. BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-unify.spec ++++++ --- /var/tmp/diff_new_pack.GhJZMa/_old 2024-12-12 21:19:33.348128147 +0100 +++ /var/tmp/diff_new_pack.GhJZMa/_new 2024-12-12 21:19:33.352128314 +0100 @@ -21,11 +21,14 @@ Release: 0 Summary: Tool to modify strings to use the same quotes License: MIT -Group: Development/Languages/Python URL: https://github.com/myint/unify Source: https://github.com/myint/unify/archive/v%{version}.tar.gz Source9: README.suse +# PATCH-FIX-OPENSUSE Do not use lib2to3 +Patch0: no-more-lib2to3.patch +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-untokenize @@ -45,21 +48,22 @@ avoid conflicts with the wdiff package. %prep -%setup -q -n unify-%{version} +%autosetup -p1 -n unify-%{version} sed -i -e '/^#!\//, 1d' unify.py cp %{SOURCE9} . %build -%python_build +%pyproject_wheel %check # https://github.com/myint/unify/issues/22 donttest="DUMMY" python312_donttest="or (TestUnitsWithFstrings and test_format_code)" +python313_donttest=$python312_donttest %pytest -k "not ($donttest ${$python_donttest})" %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} mv %{buildroot}%{_bindir}/unify %{buildroot}%{_bindir}/unify_quotes %python_clone -a %{buildroot}%{_bindir}/unify_quotes @@ -75,6 +79,6 @@ %doc README.rst README.suse %python_alternative %{_bindir}/unify_quotes %{python_sitelib}/unify.py -%pycache_only %{python_sitelib}/__pycache__/unify* -%{python_sitelib}/unify-%{version}*info +%pycache_only %{python_sitelib}/__pycache__/unify*pyc +%{python_sitelib}/unify-%{version}.dist-info ++++++ no-more-lib2to3.patch ++++++ Index: unify-0.5/unify.py =================================================================== --- unify-0.5.orig/unify.py +++ unify-0.5/unify.py @@ -122,8 +122,8 @@ def detect_encoding(filename): """Return file encoding.""" try: with open(filename, 'rb') as input_file: - from lib2to3.pgen2 import tokenize as lib2to3_tokenize - encoding = lib2to3_tokenize.detect_encoding(input_file.readline)[0] + import tokenize + encoding = tokenize.detect_encoding(input_file.readline)[0] # Check for correctness of encoding. with open_with_encoding(filename, encoding) as input_file:
