diff --git a/python-wcwidth.changes b/python-wcwidth.changes index 56639a7..02f9c20 100644 --- a/python-wcwidth.changes +++ b/python-wcwidth.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Jan 17 06:29:30 UTC 2023 - Steve Kowalik + +- Update to 0.2.6: + * Fix example for str.rjust(20, '_') + * Add CodeQL workflow for GitHub code scanning + * Switch to using importlib.metadata + * Use a new jinja2 templating process to update library to latest unicode +- Drop patch remove-pkg_resources.patch. +- Remove Python 2 gubbins. + ------------------------------------------------------------------- Wed Nov 23 10:03:23 UTC 2022 - Johannes Kastl diff --git a/python-wcwidth.spec b/python-wcwidth.spec index 21e16d1..6ed5750 100644 --- a/python-wcwidth.spec +++ b/python-wcwidth.spec @@ -1,7 +1,7 @@ # # spec file for package python-wcwidth # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,28 +16,18 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%bcond_without python2 Name: python-wcwidth -Version: 0.2.5 +Version: 0.2.6 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 python2} -BuildRequires: python-backports.functools_lru_cache >= 1.2.1 -%endif -%ifpython2 -Requires: python-backports.functools_lru_cache >= 1.2.1 -%endif %if %python_version_nodots < 38 Requires: python-importlib_metadata %endif diff --git a/remove-pkg_resources.patch b/remove-pkg_resources.patch deleted file mode 100644 index f62eaf2..0000000 --- a/remove-pkg_resources.patch +++ /dev/null @@ -1,51 +0,0 @@ -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='contact@jeffquast.com', - 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', diff --git a/wcwidth-0.2.5.tar.gz b/wcwidth-0.2.5.tar.gz deleted file mode 100644 index c926408..0000000 --- a/wcwidth-0.2.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b08fa4c7d7be1ba86950c2d746eb0d19de80842ab7457df5b3fcd3bf52e02b08 -size 47514 diff --git a/wcwidth-0.2.6.tar.gz b/wcwidth-0.2.6.tar.gz new file mode 100644 index 0000000..895eddb --- /dev/null +++ b/wcwidth-0.2.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ebcd44c0ba3049d9b813cd8ad1bc7d151674b322a82f99ff09f0e604de1ecf09 +size 51990