Hello community, here is the log from the commit of package python-rebulk for openSUSE:Leap:15.2 checked in at 2020-05-13 13:47:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/python-rebulk (Old) and /work/SRC/openSUSE:Leap:15.2/.python-rebulk.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-rebulk" Wed May 13 13:47:01 2020 rev:14 rq:799897 version:2.0.1 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/python-rebulk/python-rebulk.changes 2020-04-25 19:07:58.935969488 +0200 +++ /work/SRC/openSUSE:Leap:15.2/.python-rebulk.new.2738/python-rebulk.changes 2020-05-13 13:47:02.189269087 +0200 @@ -1,0 +2,9 @@ +Sat May 2 07:49:27 UTC 2020 - Luigi Baldoni <[email protected]> + +- Update to version 2.0.1 + * Drop python 3.4 support + * Fix errors when regex module is available + * Cleanup chain matching code +- Drop fix-for-regex-2020.1.7.patch (merged upstream) + +------------------------------------------------------------------- Old: ---- fix-for-regex-2020.1.7.patch rebulk-2.0.0.tar.gz New: ---- rebulk-2.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-rebulk.spec ++++++ --- /var/tmp/diff_new_pack.IkDZXw/_old 2020-05-13 13:47:03.029270895 +0200 +++ /var/tmp/diff_new_pack.IkDZXw/_new 2020-05-13 13:47:03.033270903 +0200 @@ -18,13 +18,12 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-rebulk -Version: 2.0.0 +Version: 2.0.1 Release: 0 Summary: Library for defining bulk search patterns to perform advanced string matching License: MIT URL: https://github.com/Toilal/rebulk Source0: https://files.pythonhosted.org/packages/source/r/rebulk/rebulk-%{version}.tar.gz -Patch0: fix-for-regex-2020.1.7.patch BuildRequires: %{python_module pytest-runner} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} @@ -43,8 +42,7 @@ allow building a custom and complex string matcher. %prep -%setup -q -n rebulk-%{version} -%patch0 -p1 +%autosetup -n rebulk-%{version} # Remove shebang from non-executable files for i in {'builder','chain','debug','formatters','__init__','introspector','loose','match','pattern','processors','rebulk','remodule','rules','toposort','utils','validators','__version__'}; do ++++++ rebulk-2.0.0.tar.gz -> rebulk-2.0.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebulk-2.0.0/PKG-INFO new/rebulk-2.0.1/PKG-INFO --- old/rebulk-2.0.0/PKG-INFO 2019-08-30 00:21:28.000000000 +0200 +++ new/rebulk-2.0.1/PKG-INFO 2020-05-01 23:32:59.909084600 +0200 @@ -1,12 +1,12 @@ Metadata-Version: 2.1 Name: rebulk -Version: 2.0.0 +Version: 2.0.1 Summary: Rebulk - Define simple search patterns in bulk to perform advanced matching on any string. Home-page: https://github.com/Toilal/rebulk/ Author: Rémi Alvergnat Author-email: [email protected] License: MIT -Download-URL: https://pypi.python.org/packages/source/r/rebulk/rebulk-2.0.0.tar.gz +Download-URL: https://pypi.python.org/packages/source/r/rebulk/rebulk-2.0.1.tar.gz Description: ReBulk ======= @@ -543,6 +543,6 @@ Classifier: Programming Language :: Python :: 3.6 Classifier: Programming Language :: Python :: 3.7 Classifier: Topic :: Software Development :: Libraries :: Python Modules -Provides-Extra: test Provides-Extra: native +Provides-Extra: test Provides-Extra: dev diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebulk-2.0.0/rebulk/__version__.py new/rebulk-2.0.1/rebulk/__version__.py --- old/rebulk-2.0.0/rebulk/__version__.py 2019-08-30 00:21:27.000000000 +0200 +++ new/rebulk-2.0.1/rebulk/__version__.py 2020-05-01 23:32:59.000000000 +0200 @@ -4,4 +4,4 @@ Version module """ # pragma: no cover -__version__ = '2.0.0' +__version__ = '2.0.1' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebulk-2.0.0/rebulk/chain.py new/rebulk-2.0.1/rebulk/chain.py --- old/rebulk-2.0.0/rebulk/chain.py 2019-08-30 00:21:27.000000000 +0200 +++ new/rebulk-2.0.1/rebulk/chain.py 2020-05-01 23:32:59.000000000 +0200 @@ -119,34 +119,39 @@ :type match: :param match_index: :type match_index: - :param yield_: - :type yield_: + :param child: + :type child: :return: :rtype: """ # pylint: disable=too-many-locals ret = super(Chain, self)._process_match(match, match_index, child=child) - original_children = Matches(match.children) - original_end = match.end - while not ret and match.children: + if ret: + return True + + if match.children: last_pattern = match.children[-1].pattern - last_pattern_children = [child_ for child_ in match.children if child_.pattern == last_pattern] - last_pattern_groups_iter = itertools.groupby(last_pattern_children, lambda child_: child_.match_index) - last_pattern_groups = {} - for index, matches in last_pattern_groups_iter: - last_pattern_groups[index] = list(matches) - - for index in reversed(list(last_pattern_groups)): - last_matches = list(last_pattern_groups[index]) - for last_match in last_matches: - match.children.remove(last_match) - match.end = match.children[-1].end if match.children else match.start - ret = super(Chain, self)._process_match(match, match_index, child=child) - if ret: - return True - match.children = original_children - match.end = original_end - return ret + last_pattern_groups = self._group_by_match_index( + [child_ for child_ in match.children if child_.pattern == last_pattern] + ) + + if last_pattern_groups: + original_children = Matches(match.children) + original_end = match.end + + for index in reversed(list(last_pattern_groups)): + last_matches = last_pattern_groups[index] + for last_match in last_matches: + match.children.remove(last_match) + match.end = match.children[-1].end if match.children else match.start + ret = super(Chain, self)._process_match(match, match_index, child=child) + if ret: + return True + + match.children = original_children + match.end = original_end + + return False def _build_chain_match(self, current_chain_matches, input_string): start = None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebulk-2.0.0/rebulk/loose.py new/rebulk-2.0.1/rebulk/loose.py --- old/rebulk-2.0.0/rebulk/loose.py 2019-08-30 00:21:27.000000000 +0200 +++ new/rebulk-2.0.1/rebulk/loose.py 2020-05-01 23:32:59.000000000 +0200 @@ -56,7 +56,7 @@ :rtype: object """ func = constructor_args if isclass(function) else function_args - call_args, call_kwargs = func(function, *args, **kwargs) + call_args, call_kwargs = func(function, *args, ignore_unused=True, **kwargs) # @see #20 return function(*call_args, **call_kwargs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebulk-2.0.0/rebulk.egg-info/PKG-INFO new/rebulk-2.0.1/rebulk.egg-info/PKG-INFO --- old/rebulk-2.0.0/rebulk.egg-info/PKG-INFO 2019-08-30 00:21:28.000000000 +0200 +++ new/rebulk-2.0.1/rebulk.egg-info/PKG-INFO 2020-05-01 23:32:59.000000000 +0200 @@ -1,12 +1,12 @@ Metadata-Version: 2.1 Name: rebulk -Version: 2.0.0 +Version: 2.0.1 Summary: Rebulk - Define simple search patterns in bulk to perform advanced matching on any string. Home-page: https://github.com/Toilal/rebulk/ Author: Rémi Alvergnat Author-email: [email protected] License: MIT -Download-URL: https://pypi.python.org/packages/source/r/rebulk/rebulk-2.0.0.tar.gz +Download-URL: https://pypi.python.org/packages/source/r/rebulk/rebulk-2.0.1.tar.gz Description: ReBulk ======= @@ -543,6 +543,6 @@ Classifier: Programming Language :: Python :: 3.6 Classifier: Programming Language :: Python :: 3.7 Classifier: Topic :: Software Development :: Libraries :: Python Modules -Provides-Extra: test Provides-Extra: native +Provides-Extra: test Provides-Extra: dev
