Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-guessit for openSUSE:Factory checked in at 2025-01-12 11:22:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-guessit (Old) and /work/SRC/openSUSE:Factory/.python-guessit.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-guessit" Sun Jan 12 11:22:10 2025 rev:26 rq:1236985 version:3.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-guessit/python-guessit.changes 2024-06-24 20:57:45.498074719 +0200 +++ /work/SRC/openSUSE:Factory/.python-guessit.new.1881/python-guessit.changes 2025-01-12 11:28:51.110703455 +0100 @@ -1,0 +2,6 @@ +Fri Jan 10 15:47:50 UTC 2025 - Nico Krapp <[email protected]> + +- migrate to pyproject macros +- add remove-six.patch to drop dependency on python-six + +------------------------------------------------------------------- New: ---- remove-six.patch BETA DEBUG BEGIN: New:- migrate to pyproject macros - add remove-six.patch to drop dependency on python-six BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-guessit.spec ++++++ --- /var/tmp/diff_new_pack.jGFDJJ/_old 2025-01-12 11:28:51.606723866 +0100 +++ /var/tmp/diff_new_pack.jGFDJJ/_new 2025-01-12 11:28:51.606723866 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-guessit # -# 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 @@ -27,6 +27,8 @@ Group: Development/Languages/Python URL: https://github.com/wackou/guessit Source0: https://files.pythonhosted.org/packages/source/g/guessit/guessit-%{version}.tar.gz +# PATCH-FIX-UPSTREAM remove-six.patch +Patch0: remove-six.patch BuildRequires: %{python_module PyYAML} BuildRequires: %{python_module babelfish >= 0.6.0} BuildRequires: %{python_module importlib_resources} @@ -35,13 +37,14 @@ BuildRequires: %{python_module pytest-benchmark} BuildRequires: %{python_module pytest-mock >= 3.3.1} %endif +BuildRequires: %{python_module pip} BuildRequires: %{python_module python-dateutil} BuildRequires: %{python_module rebulk >= 3.2.0} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-babelfish >= 0.6.0 -Requires: python-importlib-resources Requires: python-python-dateutil Requires: python-rebulk >= 3.2.0 Requires(post): update-alternatives @@ -57,7 +60,7 @@ and TV shows episodes. %prep -%autosetup -n guessit-%{version} +%autosetup -p1 -n guessit-%{version} # Remove shebang from non-executable files for i in {'audio_codec','bit_rate','bonus','cd','container','country','crc','date','edition','episodes','episode_title','film','__init__','language','mimetype','other','part','release_group','screen_size','size','source','streaming_service','title','type','video_codec','website'}; do sed -i -e "1d" "guessit/rules/properties/$i.py" @@ -72,10 +75,10 @@ sed -i 's:.pytest-runner.::' setup.py %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_clone -a %{buildroot}%{_bindir}/guessit %python_expand %fdupes %{buildroot}%{$python_sitelib} @@ -95,5 +98,5 @@ %license LICENSE %python_alternative %{_bindir}/guessit %{python_sitelib}/guessit -%{python_sitelib}/guessit-%{version}-py%{python_version}.egg-info +%{python_sitelib}/guessit-%{version}.dist-info ++++++ remove-six.patch ++++++ Index: guessit-3.8.0/guessit/jsonutils.py =================================================================== --- guessit-3.8.0.orig/guessit/jsonutils.py +++ guessit-3.8.0/guessit/jsonutils.py @@ -4,7 +4,6 @@ JSON Utils """ import json -from six import text_type from rebulk.match import Match class GuessitEncoder(json.JSONEncoder): @@ -16,6 +15,6 @@ class GuessitEncoder(json.JSONEncoder): if isinstance(o, Match): return o.advanced if hasattr(o, 'name'): # Babelfish languages/countries long name - return text_type(o.name) + return str(o.name) # pragma: no cover - return text_type(o) + return str(o)
