Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-wcwidth for openSUSE:Factory checked in at 2022-08-04 13:23:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-wcwidth (Old) and /work/SRC/openSUSE:Factory/.python-wcwidth.new.1521 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-wcwidth" Thu Aug 4 13:23:11 2022 rev:14 rq:989970 version:0.2.5 Changes: -------- --- /work/SRC/openSUSE:Factory/python-wcwidth/python-wcwidth.changes 2021-06-04 22:42:56.843088489 +0200 +++ /work/SRC/openSUSE:Factory/.python-wcwidth.new.1521/python-wcwidth.changes 2022-08-04 13:23:22.444483444 +0200 @@ -1,0 +2,8 @@ +Mon Jul 18 13:40:16 UTC 2022 - Steve Kowalik <[email protected]> + +- Add patch remove-pkg_resources.patch: + * Use importlib.metadata rather than pkg_resources. +- Since importlib.metadata is not as a stickler as pkg_resources is, remove + multibuild. + +------------------------------------------------------------------- Old: ---- _multibuild New: ---- remove-pkg_resources.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-wcwidth.spec ++++++ --- /var/tmp/diff_new_pack.u5otuL/_old 2022-08-04 13:23:22.868484647 +0200 +++ /var/tmp/diff_new_pack.u5otuL/_new 2022-08-04 13:23:22.876484669 +0200 @@ -1,7 +1,7 @@ # -# spec file for package python +# spec file for package python-wcwidth # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,33 +17,24 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%global flavor @BUILD_FLAVOR@%{nil} -%if "%{flavor}" == "test" -%define psuffix -%{flavor} -%bcond_without test -%else -%define psuffix %{nil} -%bcond_with test -%endif %bcond_without python2 -Name: python-wcwidth%{psuffix} +Name: python-wcwidth Version: 0.2.5 Release: 0 Summary: Number of Terminal column cells of wide-character codes License: MIT URL: https://github.com/jquast/wcwidth Source: https://github.com/jquast/wcwidth/archive/%{version}.tar.gz#/wcwidth-%{version}.tar.gz +# PATCH-FIX-UPSTREAM gh#jquast/wcwidth#62 +Patch0: remove-pkg_resources.patch +BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildArch: noarch -%if %{with test} -BuildRequires: %{python_module pytest} -BuildRequires: %{python_module wcwidth >= %{version}} %if %{with python2} BuildRequires: python-backports.functools_lru_cache >= 1.2.1 %endif -%endif %ifpython2 Requires: python-backports.functools_lru_cache >= 1.2.1 %endif @@ -63,7 +54,7 @@ release files, which this project aims to track. %prep -%setup -q -n wcwidth-%{version} +%autosetup -p1 -n wcwidth-%{version} sed -i 's/--cov[-=a-z]*//g' tox.ini # this option is nonsense sed -i 's/looponfailroots.*//' tox.ini @@ -72,21 +63,15 @@ %python_build %install -%if ! %{with test} %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} -%endif %check -%if %{with test} %pytest tests -%endif -%if ! %{with test} %files %{python_files} %license LICENSE %doc docs/intro.rst %{python_sitelib}/* -%endif %changelog ++++++ remove-pkg_resources.patch ++++++ Index: wcwidth-0.2.5/tests/test_core.py =================================================================== --- wcwidth-0.2.5.orig/tests/test_core.py +++ wcwidth-0.2.5/tests/test_core.py @@ -1,7 +1,10 @@ # coding: utf-8 """Core tests for wcwidth module.""" # 3rd party -import pkg_resources +try: + import importlib.metadata as importmeta +except ImportError: + import importlib_metadata as importmeta # local import wcwidth @@ -10,7 +13,7 @@ import wcwidth def test_package_version(): """wcwidth.__version__ is expected value.""" # given, - expected = pkg_resources.get_distribution('wcwidth').version + expected = importmeta.version('wcwidth') # exercise, result = wcwidth.__version__ Index: wcwidth-0.2.5/tests/test_ucslevel.py =================================================================== --- wcwidth-0.2.5.orig/tests/test_ucslevel.py +++ wcwidth-0.2.5/tests/test_ucslevel.py @@ -6,7 +6,6 @@ import warnings # 3rd party import pytest -import pkg_resources # local import wcwidth Index: wcwidth-0.2.5/setup.py =================================================================== --- wcwidth-0.2.5.orig/setup.py +++ wcwidth-0.2.5/setup.py @@ -52,7 +52,8 @@ def main(): author='Jeff Quast', author_email='[email protected]', install_requires=('backports.functools-lru-cache>=1.2.1;' - 'python_version < "3.2"'), + 'python_version < "3.2"', + 'importlib_metadata;python_version < "3.8"'), license='MIT', packages=['wcwidth'], url='https://github.com/jquast/wcwidth',
