Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-ruamel.yaml for openSUSE:Factory checked in at 2021-05-05 20:39:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-ruamel.yaml (Old) and /work/SRC/openSUSE:Factory/.python-ruamel.yaml.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-ruamel.yaml" Wed May 5 20:39:23 2021 rev:25 rq:889864 version:0.17.4 Changes: -------- --- /work/SRC/openSUSE:Factory/python-ruamel.yaml/python-ruamel.yaml.changes 2021-04-01 14:16:25.331906106 +0200 +++ /work/SRC/openSUSE:Factory/.python-ruamel.yaml.new.2988/python-ruamel.yaml.changes 2021-05-05 20:39:24.383069356 +0200 @@ -1,0 +2,11 @@ +Sun May 2 14:52:46 UTC 2021 - Matthias Fehring <buschman...@opensuse.org> + +- update to 0.17.4 + * prevent (empty) comments from throwing assertion error comments + (or empty line) will be dropped +- update to 0.17.3 + * fix for issue 382 caused by an error in a format string + * allow expansion of aliases by setting + yaml.composer.return_alias = lambda s: copy.deepcopy(s) + +------------------------------------------------------------------- Old: ---- ruamel.yaml-0.17.2.tar.gz New: ---- ruamel.yaml-0.17.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-ruamel.yaml.spec ++++++ --- /var/tmp/diff_new_pack.LUuztO/_old 2021-05-05 20:39:24.835067416 +0200 +++ /var/tmp/diff_new_pack.LUuztO/_new 2021-05-05 20:39:24.839067399 +0200 @@ -18,12 +18,12 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-ruamel.yaml -Version: 0.17.2 +Version: 0.17.4 Release: 0 Summary: Python YAML parser License: MIT Group: Development/Languages/Python -URL: https://bitbucket.org/ruamel/yaml +URL: https://sourceforge.net/p/ruamel-yaml Source: https://files.pythonhosted.org/packages/source/r/ruamel.yaml/ruamel.yaml-%{version}.tar.gz BuildRequires: %{python_module setuptools} BuildRequires: fdupes ++++++ ruamel.yaml-0.17.2.tar.gz -> ruamel.yaml-0.17.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.17.2/CHANGES new/ruamel.yaml-0.17.4/CHANGES --- old/ruamel.yaml-0.17.2/CHANGES 2021-03-29 12:32:46.000000000 +0200 +++ new/ruamel.yaml-0.17.4/CHANGES 2021-04-07 21:44:24.000000000 +0200 @@ -1,3 +1,14 @@ +[0, 17, 4]: 2021-04-07 + - prevent (empty) comments from throwing assertion error (issue 351 + reported by `William Kimball <https://sourceforge.net/u/william303/>`__) + comments (or empty line) will be dropped + +[0, 17, 3]: 2021-04-07 + - fix for issue 382 caused by an error in a format string (reported by + `William Kimball <https://sourceforge.net/u/william303/>`__) + - allow expansion of aliases by setting ``yaml.composer.return_alias = lambda s: copy.deepcopy(s)`` + (as per `Stackoverflow answer <https://stackoverflow.com/a/66983530/1307905>`__) + [0, 17, 2]: 2021-03-29 - change -py2.py3-none-any.whl to -py3-none-any.whl, and remove 0.17.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.17.2/PKG-INFO new/ruamel.yaml-0.17.4/PKG-INFO --- old/ruamel.yaml-0.17.2/PKG-INFO 2021-03-29 12:33:28.959155300 +0200 +++ new/ruamel.yaml-0.17.4/PKG-INFO 2021-04-07 21:50:02.946514100 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: ruamel.yaml -Version: 0.17.2 +Version: 0.17.4 Summary: ruamel.yaml is a YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order Home-page: https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree Author: Anthon van der Neut @@ -12,8 +12,8 @@ ``ruamel.yaml`` is a YAML 1.2 loader/dumper package for Python. - :version: 0.17.2 - :updated: 2021-03-29 + :version: 0.17.4 + :updated: 2021-04-07 :documentation: http://yaml.readthedocs.io :repository: https://sourceforge.net/projects/ruamel-yaml/ :pypi: https://pypi.org/project/ruamel.yaml/ @@ -73,6 +73,17 @@ .. should insert NEXT: at the beginning of line for next key (with empty line) + 0.17.4 (2021-04-07): + - prevent (empty) comments from throwing assertion error (issue 351 + reported by `William Kimball <https://sourceforge.net/u/william303/>`__) + comments (or empty line) will be dropped + + 0.17.3 (2021-04-07): + - fix for issue 382 caused by an error in a format string (reported by + `William Kimball <https://sourceforge.net/u/william303/>`__) + - allow expansion of aliases by setting ``yaml.composer.return_alias = lambda s: copy.deepcopy(s)`` + (as per `Stackoverflow answer <https://stackoverflow.com/a/66983530/1307905>`__) + 0.17.2 (2021-03-29): - change -py2.py3-none-any.whl to -py3-none-any.whl, and remove 0.17.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.17.2/README.rst new/ruamel.yaml-0.17.4/README.rst --- old/ruamel.yaml-0.17.2/README.rst 2021-03-29 12:32:46.000000000 +0200 +++ new/ruamel.yaml-0.17.4/README.rst 2021-04-07 21:44:24.000000000 +0200 @@ -4,8 +4,8 @@ ``ruamel.yaml`` is a YAML 1.2 loader/dumper package for Python. -:version: 0.17.2 -:updated: 2021-03-29 +:version: 0.17.4 +:updated: 2021-04-07 :documentation: http://yaml.readthedocs.io :repository: https://sourceforge.net/projects/ruamel-yaml/ :pypi: https://pypi.org/project/ruamel.yaml/ @@ -65,6 +65,17 @@ .. should insert NEXT: at the beginning of line for next key (with empty line) +0.17.4 (2021-04-07): + - prevent (empty) comments from throwing assertion error (issue 351 + reported by `William Kimball <https://sourceforge.net/u/william303/>`__) + comments (or empty line) will be dropped + +0.17.3 (2021-04-07): + - fix for issue 382 caused by an error in a format string (reported by + `William Kimball <https://sourceforge.net/u/william303/>`__) + - allow expansion of aliases by setting ``yaml.composer.return_alias = lambda s: copy.deepcopy(s)`` + (as per `Stackoverflow answer <https://stackoverflow.com/a/66983530/1307905>`__) + 0.17.2 (2021-03-29): - change -py2.py3-none-any.whl to -py3-none-any.whl, and remove 0.17.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.17.2/__init__.py new/ruamel.yaml-0.17.4/__init__.py --- old/ruamel.yaml-0.17.2/__init__.py 2021-03-29 12:33:01.000000000 +0200 +++ new/ruamel.yaml-0.17.4/__init__.py 2021-04-07 21:44:56.000000000 +0200 @@ -5,8 +5,8 @@ _package_data = dict( full_package_name='ruamel.yaml', - version_info=(0, 17, 2), - __version__='0.17.2', + version_info=(0, 17, 4), + __version__='0.17.4', author='Anthon van der Neut', author_email='a.van.der.n...@ruamel.eu', description='ruamel.yaml is a YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order', # NOQA diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.17.2/composer.py new/ruamel.yaml-0.17.4/composer.py --- old/ruamel.yaml-0.17.2/composer.py 2021-03-08 08:25:28.000000000 +0100 +++ new/ruamel.yaml-0.17.4/composer.py 2021-04-07 11:11:07.000000000 +0200 @@ -104,6 +104,9 @@ self.anchors = {} return node + def return_alias(self, a): + return a + def compose_node(self, parent, index): # type: (Any, Any) -> Any if self.parser.check_event(AliasEvent): @@ -116,7 +119,7 @@ _F('found undefined alias {alias!r}', alias=alias), event.start_mark, ) - return self.anchors[alias] + return self.return_alias(self.anchors[alias]) event = self.parser.peek_event() anchor = event.anchor if anchor is not None: # have an anchor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.17.2/error.py new/ruamel.yaml-0.17.4/error.py --- old/ruamel.yaml-0.17.2/error.py 2021-03-20 11:46:35.000000000 +0100 +++ new/ruamel.yaml-0.17.4/error.py 2021-04-07 20:51:01.000000000 +0200 @@ -114,6 +114,19 @@ where += ':\n' + snippet return where + def __repr__(self): + # type: () -> Any + snippet = self.get_snippet() + where = _F( + ' in "{sname!s}", line {sline1:d}, column {scolumn1:d}', + sname=self.name, + sline1=self.line + 1, + scolumn1=self.column + 1, + ) + if snippet is not None: + where += ':\n' + snippet + return where + class CommentMark(object): __slots__ = ('column',) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.17.2/main.py new/ruamel.yaml-0.17.4/main.py --- old/ruamel.yaml-0.17.2/main.py 2021-03-25 14:01:39.000000000 +0100 +++ new/ruamel.yaml-0.17.4/main.py 2021-04-07 10:29:54.000000000 +0200 @@ -150,6 +150,7 @@ self.scalar_after_indicator = None # [a, b: 1, c: {d: 2}] vs. [a, {b: 1}, {c: {d: 2}}] self.brace_single_entry_mapping_in_flow_sequence = False + self.comment_handling = None for module in self.plug_ins: if getattr(module, 'typ', None) in self.typ: typ_found += 1 @@ -1614,7 +1615,7 @@ def __init__(cls, name, bases, kwds): # type: (Any, Any, Any) -> None - super(YAMLObjectMetaclass, cls).__init__(name, bases, kwds) + super().__init__(name, bases, kwds) if 'yaml_tag' in kwds and kwds['yaml_tag'] is not None: cls.yaml_constructor.add_constructor(cls.yaml_tag, cls.from_yaml) # type: ignore cls.yaml_representer.add_representer(cls, cls.to_yaml) # type: ignore diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.17.2/parser.py new/ruamel.yaml-0.17.4/parser.py --- old/ruamel.yaml-0.17.2/parser.py 2021-03-08 08:31:18.000000000 +0100 +++ new/ruamel.yaml-0.17.4/parser.py 2021-04-07 20:45:02.000000000 +0200 @@ -357,6 +357,7 @@ start_mark = end_mark = tag_mark = None if self.scanner.check_token(AnchorToken): token = self.scanner.get_token() + token.move_comment(self.scanner.peek_token()) start_mark = token.start_mark end_mark = token.end_mark anchor = token.value @@ -730,7 +731,7 @@ raise ParserError( 'while parsing a flow mapping', self.marks[-1], - _F("expected ',' or '}', but got {token_id!r}", token_id=token.id), + _F("expected ',' or '}}', but got {token_id!r}", token_id=token.id), token.start_mark, ) if self.scanner.check_token(KeyToken): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.17.2/representer.py new/ruamel.yaml-0.17.4/representer.py --- old/ruamel.yaml-0.17.2/representer.py 2021-03-25 14:01:54.000000000 +0100 +++ new/ruamel.yaml-0.17.4/representer.py 2021-04-07 21:44:05.000000000 +0200 @@ -863,7 +863,9 @@ node_value = self.represent_data(item_value) item_comment = item_comments.get(item_key) if item_comment: - assert getattr(node_key, 'comment', None) is None + # assert getattr(node_key, 'comment', None) is None + # issue 351 did throw this because the comment from the list item was + # moved to the dict node_key.comment = item_comment[:2] nvc = getattr(node_value, 'comment', None) if nvc is not None: # end comment already there diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.17.2/ruamel.yaml.egg-info/PKG-INFO new/ruamel.yaml-0.17.4/ruamel.yaml.egg-info/PKG-INFO --- old/ruamel.yaml-0.17.2/ruamel.yaml.egg-info/PKG-INFO 2021-03-29 12:33:28.000000000 +0200 +++ new/ruamel.yaml-0.17.4/ruamel.yaml.egg-info/PKG-INFO 2021-04-07 21:50:02.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: ruamel.yaml -Version: 0.17.2 +Version: 0.17.4 Summary: ruamel.yaml is a YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order Home-page: https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree Author: Anthon van der Neut @@ -12,8 +12,8 @@ ``ruamel.yaml`` is a YAML 1.2 loader/dumper package for Python. - :version: 0.17.2 - :updated: 2021-03-29 + :version: 0.17.4 + :updated: 2021-04-07 :documentation: http://yaml.readthedocs.io :repository: https://sourceforge.net/projects/ruamel-yaml/ :pypi: https://pypi.org/project/ruamel.yaml/ @@ -73,6 +73,17 @@ .. should insert NEXT: at the beginning of line for next key (with empty line) + 0.17.4 (2021-04-07): + - prevent (empty) comments from throwing assertion error (issue 351 + reported by `William Kimball <https://sourceforge.net/u/william303/>`__) + comments (or empty line) will be dropped + + 0.17.3 (2021-04-07): + - fix for issue 382 caused by an error in a format string (reported by + `William Kimball <https://sourceforge.net/u/william303/>`__) + - allow expansion of aliases by setting ``yaml.composer.return_alias = lambda s: copy.deepcopy(s)`` + (as per `Stackoverflow answer <https://stackoverflow.com/a/66983530/1307905>`__) + 0.17.2 (2021-03-29): - change -py2.py3-none-any.whl to -py3-none-any.whl, and remove 0.17.1