Hello community, here is the log from the commit of package python-ruamel.yaml for openSUSE:Factory checked in at 2019-04-19 18:39:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-ruamel.yaml (Old) and /work/SRC/openSUSE:Factory/.python-ruamel.yaml.new.5536 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-ruamel.yaml" Fri Apr 19 18:39:18 2019 rev:14 rq:695731 version:0.15.92 Changes: -------- --- /work/SRC/openSUSE:Factory/python-ruamel.yaml/python-ruamel.yaml.changes 2019-03-01 16:50:30.457729316 +0100 +++ /work/SRC/openSUSE:Factory/.python-ruamel.yaml.new.5536/python-ruamel.yaml.changes 2019-04-19 18:39:35.695277064 +0200 @@ -1,0 +2,8 @@ +Thu Apr 18 13:10:02 UTC 2019 - Ondřej Súkup <[email protected]> + +- update to 0.15.92 + * fix failure to parse empty implicit block mapping key + * allowing duplicate keys would not work for merge keys + * fix issue with updating CommentedMap from list of tuples + +------------------------------------------------------------------- Old: ---- ruamel.yaml-0.15.89.tar.gz New: ---- ruamel.yaml-0.15.92.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-ruamel.yaml.spec ++++++ --- /var/tmp/diff_new_pack.l8OmHA/_old 2019-04-19 18:39:38.371280462 +0200 +++ /var/tmp/diff_new_pack.l8OmHA/_new 2019-04-19 18:39:38.375280467 +0200 @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-ruamel.yaml -Version: 0.15.89 +Version: 0.15.92 Release: 0 Summary: Python YAML parser License: MIT ++++++ ruamel.yaml-0.15.89.tar.gz -> ruamel.yaml-0.15.92.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.15.89/CHANGES new/ruamel.yaml-0.15.92/CHANGES --- old/ruamel.yaml-0.15.89/CHANGES 2019-02-27 22:55:01.000000000 +0100 +++ new/ruamel.yaml-0.15.92/CHANGES 2019-04-16 08:45:03.000000000 +0200 @@ -1,3 +1,23 @@ +[0, 15, 92]: 2019-04-16 + - fix failure to parse empty implicit block mapping key (reported by + `Nolan W <https://bitbucket.org/i2labs/>`__) + +[0, 15, 91]: 2019-04-05 + - allowing duplicate keys would not work for merge keys (reported by mamacdon on + `StackOverflow <https://stackoverflow.com/questions/55540686/>`__ + +[0, 15, 91]: 2019-04-05 + - allowing duplicate keys would not work for merge keys (reported by mamacdon on + `StackOverflow <https://stackoverflow.com/questions/55540686/>`__ + +[0, 15, 90]: 2019-04-04 + - fix issue with updating `CommentedMap` from list of tuples (reported by + `Peter Henry <https://bitbucket.org/mosbasik/>`__) + +[0, 15, 90]: 2019-04-04 + - fix issue with updating `CommentedMap` from list of tuples (reported by + `Peter Henry <https://bitbucket.org/mosbasik/>`__) + [0, 15, 89]: 2019-02-27 - fix for items with flow-mapping in block sequence output on single line (reported by `Zahari Dim <https://bitbucket.org/zahari_dim/>`__) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.15.89/PKG-INFO new/ruamel.yaml-0.15.92/PKG-INFO --- old/ruamel.yaml-0.15.89/PKG-INFO 2019-02-27 22:58:06.000000000 +0100 +++ new/ruamel.yaml-0.15.92/PKG-INFO 2019-04-16 08:46:40.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: ruamel.yaml -Version: 0.15.89 +Version: 0.15.92 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://bitbucket.org/ruamel/yaml Author: Anthon van der Neut @@ -12,8 +12,8 @@ ``ruamel.yaml`` is a YAML 1.2 loader/dumper package for Python. - :version: 0.15.89 - :updated: 2019-02-27 + :version: 0.15.92 + :updated: 2019-04-16 :documentation: http://yaml.readthedocs.io :repository: https://bitbucket.org/ruamel/ :pypi: https://pypi.org/project/ruamel.yaml/ @@ -62,6 +62,18 @@ .. should insert NEXT: at the beginning of line for next key (with empty line) + 0.15.92 (2019-04-16): + - fix failure to parse empty implicit block mapping key (reported by + `Nolan W <https://bitbucket.org/i2labs/>`__) + + 0.15.91 (2019-04-05): + - allowing duplicate keys would not work for merge keys (reported by mamacdon on + `StackOverflow <https://stackoverflow.com/questions/55540686/>`__ + + 0.15.90 (2019-04-04): + - fix issue with updating `CommentedMap` from list of tuples (reported by + `Peter Henry <https://bitbucket.org/mosbasik/>`__) + 0.15.89 (2019-02-27): - fix for items with flow-mapping in block sequence output on single line (reported by `Zahari Dim <https://bitbucket.org/zahari_dim/>`__) @@ -78,7 +90,7 @@ 0.15.86 (2019-01-16): - reinsert merge key in its old position (reported by grumbler on - <Stackoverflow <https://stackoverflow.com/a/54206512/1307905>`__) + `StackOverflow <https://stackoverflow.com/a/54206512/1307905>`__) - fix for issue with non-ASCII anchor names (reported and fix provided by Dandaleon Flux via email) - fix for issue when parsing flow mapping value starting with colon (in pure Python only) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.15.89/README.rst new/ruamel.yaml-0.15.92/README.rst --- old/ruamel.yaml-0.15.89/README.rst 2019-02-27 22:55:01.000000000 +0100 +++ new/ruamel.yaml-0.15.92/README.rst 2019-04-16 08:45:03.000000000 +0200 @@ -4,8 +4,8 @@ ``ruamel.yaml`` is a YAML 1.2 loader/dumper package for Python. -:version: 0.15.89 -:updated: 2019-02-27 +:version: 0.15.92 +:updated: 2019-04-16 :documentation: http://yaml.readthedocs.io :repository: https://bitbucket.org/ruamel/ :pypi: https://pypi.org/project/ruamel.yaml/ @@ -54,6 +54,18 @@ .. should insert NEXT: at the beginning of line for next key (with empty line) +0.15.92 (2019-04-16): + - fix failure to parse empty implicit block mapping key (reported by + `Nolan W <https://bitbucket.org/i2labs/>`__) + +0.15.91 (2019-04-05): + - allowing duplicate keys would not work for merge keys (reported by mamacdon on + `StackOverflow <https://stackoverflow.com/questions/55540686/>`__ + +0.15.90 (2019-04-04): + - fix issue with updating `CommentedMap` from list of tuples (reported by + `Peter Henry <https://bitbucket.org/mosbasik/>`__) + 0.15.89 (2019-02-27): - fix for items with flow-mapping in block sequence output on single line (reported by `Zahari Dim <https://bitbucket.org/zahari_dim/>`__) @@ -70,7 +82,7 @@ 0.15.86 (2019-01-16): - reinsert merge key in its old position (reported by grumbler on - <Stackoverflow <https://stackoverflow.com/a/54206512/1307905>`__) + `StackOverflow <https://stackoverflow.com/a/54206512/1307905>`__) - fix for issue with non-ASCII anchor names (reported and fix provided by Dandaleon Flux via email) - fix for issue when parsing flow mapping value starting with colon (in pure Python only) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.15.89/__init__.py new/ruamel.yaml-0.15.92/__init__.py --- old/ruamel.yaml-0.15.89/__init__.py 2019-02-27 22:55:40.000000000 +0100 +++ new/ruamel.yaml-0.15.92/__init__.py 2019-04-16 08:46:24.000000000 +0200 @@ -7,8 +7,8 @@ _package_data = dict( full_package_name='ruamel.yaml', - version_info=(0, 15, 89), - __version__='0.15.89', + version_info=(0, 15, 92), + __version__='0.15.92', author='Anthon van der Neut', author_email='[email protected]', 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.15.89/comments.py new/ruamel.yaml-0.15.92/comments.py --- old/ruamel.yaml-0.15.89/comments.py 2019-01-07 13:09:59.000000000 +0100 +++ new/ruamel.yaml-0.15.92/comments.py 2019-04-04 08:23:59.000000000 +0200 @@ -699,11 +699,16 @@ # type: (Any) -> None try: ordereddict.update(self, vals) - self._ok.update(vals.keys()) # type: ignore except TypeError: # probably a dict that is used for x in vals: self[x] = vals[x] + try: + self._ok.update(vals.keys()) # type: ignore + except AttributeError: + # assume a list/tuple of two element lists/tuples + for x in vals: + self._ok.add(x[0]) def insert(self, pos, key, value, comment=None): # type: (Any, Any, Any, Optional[Any]) -> None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.15.89/constructor.py new/ruamel.yaml-0.15.92/constructor.py --- old/ruamel.yaml-0.15.89/constructor.py 2019-01-15 21:57:42.000000000 +0100 +++ new/ruamel.yaml-0.15.92/constructor.py 2019-04-05 21:43:33.000000000 +0200 @@ -362,6 +362,10 @@ key_node, value_node = node.value[index] if key_node.tag == u'tag:yaml.org,2002:merge': if merge: # double << key + if self.allow_duplicate_keys: + del node.value[index] + index += 1 + continue args = [ 'while constructing a mapping', node.start_mark, @@ -1330,6 +1334,10 @@ key_node, value_node = node.value[index] if key_node.tag == u'tag:yaml.org,2002:merge': if merge_map_list: # double << key + if self.allow_duplicate_keys: + del node.value[index] + index += 1 + continue args = [ 'while constructing a mapping', node.start_mark, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.15.89/parser.py new/ruamel.yaml-0.15.92/parser.py --- old/ruamel.yaml-0.15.89/parser.py 2019-01-08 16:31:07.000000000 +0100 +++ new/ruamel.yaml-0.15.92/parser.py 2019-04-16 08:02:44.000000000 +0200 @@ -71,7 +71,7 @@ # flow_mapping_entry: { ALIAS ANCHOR TAG SCALAR FLOW-SEQUENCE-START # FLOW-MAPPING-START KEY } -# need to have full path, as pkg_resources tries to load parser.py in __init__.py +# need to have full path with import, as pkg_resources tries to load parser.py in __init__.py # only to not do anything with the package afterwards # and for Jython too @@ -569,6 +569,9 @@ else: self.state = self.parse_block_mapping_value return self.process_empty_scalar(token.end_mark) + if self.resolver.processing_version > (1, 1) and self.scanner.check_token(ValueToken): + self.state = self.parse_block_mapping_value + return self.process_empty_scalar(self.scanner.peek_token().start_mark) if not self.scanner.check_token(BlockEndToken): token = self.scanner.peek_token() raise ParserError( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.15.89/ruamel.yaml.egg-info/PKG-INFO new/ruamel.yaml-0.15.92/ruamel.yaml.egg-info/PKG-INFO --- old/ruamel.yaml-0.15.89/ruamel.yaml.egg-info/PKG-INFO 2019-02-27 22:58:03.000000000 +0100 +++ new/ruamel.yaml-0.15.92/ruamel.yaml.egg-info/PKG-INFO 2019-04-16 08:46:40.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: ruamel.yaml -Version: 0.15.89 +Version: 0.15.92 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://bitbucket.org/ruamel/yaml Author: Anthon van der Neut @@ -12,8 +12,8 @@ ``ruamel.yaml`` is a YAML 1.2 loader/dumper package for Python. - :version: 0.15.89 - :updated: 2019-02-27 + :version: 0.15.92 + :updated: 2019-04-16 :documentation: http://yaml.readthedocs.io :repository: https://bitbucket.org/ruamel/ :pypi: https://pypi.org/project/ruamel.yaml/ @@ -62,6 +62,18 @@ .. should insert NEXT: at the beginning of line for next key (with empty line) + 0.15.92 (2019-04-16): + - fix failure to parse empty implicit block mapping key (reported by + `Nolan W <https://bitbucket.org/i2labs/>`__) + + 0.15.91 (2019-04-05): + - allowing duplicate keys would not work for merge keys (reported by mamacdon on + `StackOverflow <https://stackoverflow.com/questions/55540686/>`__ + + 0.15.90 (2019-04-04): + - fix issue with updating `CommentedMap` from list of tuples (reported by + `Peter Henry <https://bitbucket.org/mosbasik/>`__) + 0.15.89 (2019-02-27): - fix for items with flow-mapping in block sequence output on single line (reported by `Zahari Dim <https://bitbucket.org/zahari_dim/>`__) @@ -78,7 +90,7 @@ 0.15.86 (2019-01-16): - reinsert merge key in its old position (reported by grumbler on - <Stackoverflow <https://stackoverflow.com/a/54206512/1307905>`__) + `StackOverflow <https://stackoverflow.com/a/54206512/1307905>`__) - fix for issue with non-ASCII anchor names (reported and fix provided by Dandaleon Flux via email) - fix for issue when parsing flow mapping value starting with colon (in pure Python only)
