Hello community, here is the log from the commit of package python-rebulk for openSUSE:Factory checked in at 2018-10-15 09:43:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-rebulk (Old) and /work/SRC/openSUSE:Factory/.python-rebulk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-rebulk" Mon Oct 15 09:43:44 2018 rev:4 rq:641808 version:1.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-rebulk/python-rebulk.changes 2018-09-13 12:10:47.938342368 +0200 +++ /work/SRC/openSUSE:Factory/.python-rebulk.new/python-rebulk.changes 2018-10-15 09:44:06.363326949 +0200 @@ -1,0 +2,6 @@ +Sat Oct 13 05:58:00 UTC 2018 - [email protected] + +- Update to version 1.0.0 + * Add python 3.7 support + +------------------------------------------------------------------- Old: ---- rebulk-0.9.0.tar.gz New: ---- rebulk-1.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-rebulk.spec ++++++ --- /var/tmp/diff_new_pack.39Mzwn/_old 2018-10-15 09:44:10.307322526 +0200 +++ /var/tmp/diff_new_pack.39Mzwn/_new 2018-10-15 09:44:10.311322522 +0200 @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-rebulk -Version: 0.9.0 +Version: 1.0.0 Release: 0 Summary: Library for defining bulk search patterns to perform advanced string matching License: MIT ++++++ rebulk-0.9.0.tar.gz -> rebulk-1.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebulk-0.9.0/PKG-INFO new/rebulk-1.0.0/PKG-INFO --- old/rebulk-0.9.0/PKG-INFO 2017-05-31 15:41:53.000000000 +0200 +++ new/rebulk-1.0.0/PKG-INFO 2018-10-12 23:06:53.000000000 +0200 @@ -1,12 +1,12 @@ -Metadata-Version: 1.1 +Metadata-Version: 2.1 Name: rebulk -Version: 0.9.0 +Version: 1.0.0 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-0.9.0.tar.gz +Download-URL: https://pypi.python.org/packages/source/r/rebulk/rebulk-1.0.0.tar.gz Description: ReBulk ======= @@ -105,7 +105,7 @@ .. code-block:: python - >>> Rebulk().regex(r'Wint\wr', 'com\w{3}').matches("Winter is coming...") + >>> Rebulk().regex(r'Wint\wr', r'com\w{3}').matches("Winter is coming...") [<Winter:(0, 6)>, <coming:(10, 16)>] All keyword arguments from `re.compile`_ are supported. @@ -145,7 +145,7 @@ Defined as a list of 2-tuple, each tuple is an abbreviation. It simply replace ``tuple[0]`` with ``tuple[1]`` in the expression. - >>> Rebulk().regex(r'Custom-separators', abbreviations=[("-", "[\W_]+")])\ + >>> Rebulk().regex(r'Custom-separators', abbreviations=[("-", r"[\W_]+")])\ ... .matches("Custom_separators using-abbreviations") [<Custom_separators:(0, 17)>] @@ -526,10 +526,13 @@ Classifier: Operating System :: OS Independent Classifier: Intended Audience :: Developers Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.6 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.3 Classifier: Programming Language :: Python :: 3.4 Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 Classifier: Topic :: Software Development :: Libraries :: Python Modules +Provides-Extra: dev +Provides-Extra: test +Provides-Extra: native diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebulk-0.9.0/README.rst new/rebulk-1.0.0/README.rst --- old/rebulk-0.9.0/README.rst 2017-05-31 15:41:51.000000000 +0200 +++ new/rebulk-1.0.0/README.rst 2018-10-12 23:06:52.000000000 +0200 @@ -96,7 +96,7 @@ .. code-block:: python - >>> Rebulk().regex(r'Wint\wr', 'com\w{3}').matches("Winter is coming...") + >>> Rebulk().regex(r'Wint\wr', r'com\w{3}').matches("Winter is coming...") [<Winter:(0, 6)>, <coming:(10, 16)>] All keyword arguments from `re.compile`_ are supported. @@ -136,7 +136,7 @@ Defined as a list of 2-tuple, each tuple is an abbreviation. It simply replace ``tuple[0]`` with ``tuple[1]`` in the expression. - >>> Rebulk().regex(r'Custom-separators', abbreviations=[("-", "[\W_]+")])\ + >>> Rebulk().regex(r'Custom-separators', abbreviations=[("-", r"[\W_]+")])\ ... .matches("Custom_separators using-abbreviations") [<Custom_separators:(0, 17)>] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebulk-0.9.0/pylintrc new/rebulk-1.0.0/pylintrc --- old/rebulk-0.9.0/pylintrc 2017-05-31 15:41:51.000000000 +0200 +++ new/rebulk-1.0.0/pylintrc 2018-10-12 23:06:52.000000000 +0200 @@ -68,7 +68,8 @@ map-builtin-not-iterating,old-ne-operator,long-builtin,intern-builtin,zip-builtin-not-iterating,reduce-builtin, unicode-builtin,old-division,xrange-builtin,old-octal-literal,coerce-method, too-few-public-methods,too-many-arguments,too-many-instance-attributes,bad-builtin,too-many-ancestors, - too-few-format-args,fixme,duplicate-code,deprecated-lambda,cyclic-import, + too-few-format-args,fixme,duplicate-code,deprecated-lambda,cyclic-import,useless-object-inheritance, + inconsistent-return-statements, I [REPORTS] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebulk-0.9.0/rebulk/__version__.py new/rebulk-1.0.0/rebulk/__version__.py --- old/rebulk-0.9.0/rebulk/__version__.py 2017-05-31 15:41:51.000000000 +0200 +++ new/rebulk-1.0.0/rebulk/__version__.py 2018-10-12 23:06:52.000000000 +0200 @@ -4,4 +4,4 @@ Version module """ # pragma: no cover -__version__ = '0.9.0' +__version__ = '1.0.0' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebulk-0.9.0/rebulk/loose.py new/rebulk-1.0.0/rebulk/loose.py --- old/rebulk-0.9.0/rebulk/loose.py 2017-05-31 15:41:51.000000000 +0200 +++ new/rebulk-1.0.0/rebulk/loose.py 2018-10-12 23:06:52.000000000 +0200 @@ -3,8 +3,18 @@ """ Various utilities functions """ -import inspect + + import sys +import inspect + +try: + from inspect import getfullargspec as getargspec + _fullargspec_supported = True +except ImportError: + _fullargspec_supported = False + from inspect import getargspec + from .utils import is_iterable if sys.version_info < (3, 4, 0): # pragma: no cover @@ -63,7 +73,7 @@ :return: (args, kwargs) matching the function signature :rtype: tuple """ - argspec = inspect.getargspec(callable_) # pylint:disable=deprecated-method + argspec = getargspec(callable_) # pylint:disable=deprecated-method return argspec_args(argspec, False, *args, **kwargs) @@ -80,7 +90,7 @@ :return: (args, kwargs) matching the function signature :rtype: tuple """ - argspec = inspect.getargspec(_constructor(class_)) # pylint:disable=deprecated-method + argspec = getargspec(_constructor(class_)) # pylint:disable=deprecated-method return argspec_args(argspec, True, *args, **kwargs) @@ -99,7 +109,7 @@ :return: (args, kwargs) matching the function signature :rtype: tuple """ - if argspec.keywords: + if argspec.varkw: call_kwarg = kwargs else: call_kwarg = dict((k, kwargs[k]) for k in kwargs if k in argspec.args) # Python 2.6 dict comprehension @@ -110,6 +120,34 @@ return call_args, call_kwarg +if not _fullargspec_supported: + def argspec_args_legacy(argspec, constructor, *args, **kwargs): + """ + Return (args, kwargs) matching the argspec object + + :param argspec: argspec to use + :type argspec: argspec + :param constructor: is it a constructor ? + :type constructor: bool + :param args: + :type args: + :param kwargs: + :type kwargs: + :return: (args, kwargs) matching the function signature + :rtype: tuple + """ + if argspec.keywords: + call_kwarg = kwargs + else: + call_kwarg = dict((k, kwargs[k]) for k in kwargs if k in argspec.args) # Python 2.6 dict comprehension + if argspec.varargs: + call_args = args + else: + call_args = args[:len(argspec.args) - (1 if constructor else 0)] + return call_args, call_kwarg + argspec_args = argspec_args_legacy + + def ensure_list(param): """ Retrieves a list from given parameter. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebulk-0.9.0/rebulk/match.py new/rebulk-1.0.0/rebulk/match.py --- old/rebulk-0.9.0/rebulk/match.py 2017-05-31 15:41:51.000000000 +0200 +++ new/rebulk-1.0.0/rebulk/match.py 2018-10-12 23:06:52.000000000 +0200 @@ -5,7 +5,11 @@ """ import copy import itertools -from collections import defaultdict, MutableSequence +from collections import defaultdict +try: + from collections.abc import MutableSequence +except ImportError: + from collections import MutableSequence try: from collections import OrderedDict # pylint:disable=ungrouped-imports @@ -778,9 +782,9 @@ right.start = end if right: ret.append(right) - elif end <= current.end and end > current.start: + elif current.end >= end > current.start: current.start = end - elif start >= current.start and start < current.end: + elif current.start <= start < current.end: current.end = start return filter_index(ret, predicate, index) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebulk-0.9.0/rebulk/processors.py new/rebulk-1.0.0/rebulk/processors.py --- old/rebulk-0.9.0/rebulk/processors.py 2017-05-31 15:41:51.000000000 +0200 +++ new/rebulk-1.0.0/rebulk/processors.py 2018-10-12 23:06:52.000000000 +0200 @@ -30,7 +30,7 @@ """ if len(conflicting_match.initiator) < len(match.initiator): return conflicting_match - elif len(match.initiator) < len(conflicting_match.initiator): + if len(match.initiator) < len(conflicting_match.initiator): return match return None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebulk-0.9.0/rebulk/rules.py new/rebulk-1.0.0/rebulk/rules.py --- old/rebulk-0.9.0/rebulk/rules.py 2017-05-31 15:41:51.000000000 +0200 +++ new/rebulk-1.0.0/rebulk/rules.py 2018-10-12 23:06:52.000000000 +0200 @@ -140,10 +140,9 @@ matches.remove(match) ret.append(match) return ret - else: - if when_response in matches: - matches.remove(when_response) - return when_response + if when_response in matches: + matches.remove(when_response) + return when_response class AppendMatch(Consequence): # pylint: disable=abstract-method @@ -164,12 +163,11 @@ matches.append(match) ret.append(match) return ret - else: - if self.match_name: - when_response.name = self.match_name - if when_response not in matches: - matches.append(when_response) - return when_response + if self.match_name: + when_response.name = self.match_name + if when_response not in matches: + matches.append(when_response) + return when_response class RenameMatch(Consequence): # pylint: disable=abstract-method diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebulk-0.9.0/rebulk/utils.py new/rebulk-1.0.0/rebulk/utils.py --- old/rebulk-0.9.0/rebulk/utils.py 2017-05-31 15:41:51.000000000 +0200 +++ new/rebulk-1.0.0/rebulk/utils.py 2018-10-12 23:06:52.000000000 +0200 @@ -3,7 +3,10 @@ """ Various utilities functions """ -from collections import MutableSet +try: + from collections.abc import MutableSet +except ImportError: + from collections import MutableSet from types import GeneratorType diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebulk-0.9.0/rebulk.egg-info/PKG-INFO new/rebulk-1.0.0/rebulk.egg-info/PKG-INFO --- old/rebulk-0.9.0/rebulk.egg-info/PKG-INFO 2017-05-31 15:41:53.000000000 +0200 +++ new/rebulk-1.0.0/rebulk.egg-info/PKG-INFO 2018-10-12 23:06:53.000000000 +0200 @@ -1,12 +1,12 @@ -Metadata-Version: 1.1 +Metadata-Version: 2.1 Name: rebulk -Version: 0.9.0 +Version: 1.0.0 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-0.9.0.tar.gz +Download-URL: https://pypi.python.org/packages/source/r/rebulk/rebulk-1.0.0.tar.gz Description: ReBulk ======= @@ -105,7 +105,7 @@ .. code-block:: python - >>> Rebulk().regex(r'Wint\wr', 'com\w{3}').matches("Winter is coming...") + >>> Rebulk().regex(r'Wint\wr', r'com\w{3}').matches("Winter is coming...") [<Winter:(0, 6)>, <coming:(10, 16)>] All keyword arguments from `re.compile`_ are supported. @@ -145,7 +145,7 @@ Defined as a list of 2-tuple, each tuple is an abbreviation. It simply replace ``tuple[0]`` with ``tuple[1]`` in the expression. - >>> Rebulk().regex(r'Custom-separators', abbreviations=[("-", "[\W_]+")])\ + >>> Rebulk().regex(r'Custom-separators', abbreviations=[("-", r"[\W_]+")])\ ... .matches("Custom_separators using-abbreviations") [<Custom_separators:(0, 17)>] @@ -526,10 +526,13 @@ Classifier: Operating System :: OS Independent Classifier: Intended Audience :: Developers Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.6 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.3 Classifier: Programming Language :: Python :: 3.4 Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 Classifier: Topic :: Software Development :: Libraries :: Python Modules +Provides-Extra: dev +Provides-Extra: test +Provides-Extra: native diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebulk-0.9.0/rebulk.egg-info/requires.txt new/rebulk-1.0.0/rebulk.egg-info/requires.txt --- old/rebulk-0.9.0/rebulk.egg-info/requires.txt 2017-05-31 15:41:53.000000000 +0200 +++ new/rebulk-1.0.0/rebulk.egg-info/requires.txt 2018-10-12 23:06:53.000000000 +0200 @@ -1,8 +1,7 @@ six [dev] -pytest>=2.7.3 -pytest-capturelog +pytest zest.releaser[recommended] pylint tox diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebulk-0.9.0/setup.cfg new/rebulk-1.0.0/setup.cfg --- old/rebulk-0.9.0/setup.cfg 2017-05-31 15:41:53.000000000 +0200 +++ new/rebulk-1.0.0/setup.cfg 2018-10-12 23:06:53.000000000 +0200 @@ -7,5 +7,4 @@ [egg_info] tag_build = tag_date = 0 -tag_svn_revision = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebulk-0.9.0/setup.py new/rebulk-1.0.0/setup.py --- old/rebulk-0.9.0/setup.py 2017-05-31 15:41:51.000000000 +0200 +++ new/rebulk-1.0.0/setup.py 2018-10-12 23:06:52.000000000 +0200 @@ -3,21 +3,18 @@ import io import re -import sys from setuptools import setup, find_packages with io.open('README.rst', 'r', encoding='utf-8') as f: readme = f.read() install_requires = ['six'] -if sys.version_info < (2, 7): - install_requires.extend(['ordereddict']) native_requires = ['regex'] setup_requires = ['pytest-runner'] -dev_require = ['pytest>=2.7.3', 'pytest-capturelog', 'zest.releaser[recommended]', 'pylint', 'tox'] +dev_require = ['pytest', 'zest.releaser[recommended]', 'pylint', 'tox'] tests_require = ['pytest'] @@ -34,12 +31,12 @@ 'Operating System :: OS Independent', 'Intended Audience :: Developers', 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', 'Topic :: Software Development :: Libraries :: Python Modules' ], keywords='re regexp regular expression search pattern string match', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebulk-0.9.0/tox.ini new/rebulk-1.0.0/tox.ini --- old/rebulk-0.9.0/tox.ini 2017-05-31 15:41:51.000000000 +0200 +++ new/rebulk-1.0.0/tox.ini 2018-10-12 23:06:52.000000000 +0200 @@ -1,15 +1,10 @@ [tox] -envlist = py26,py27,py33,py34,py35,pypy +envlist = py27,py34,py35,py36,py37,pypy [testenv:py26] commands = {envbindir}/pip install -e .[dev] {envpython} setup.py test - -[testenv:py35] -commands = - {envbindir}/pip install -e .[dev] - {envpython} setup.py test [testenv] commands =
