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-10-20 20:23:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-ruamel.yaml (Old) and /work/SRC/openSUSE:Factory/.python-ruamel.yaml.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-ruamel.yaml" Wed Oct 20 20:23:38 2021 rev:27 rq:925767 version:0.17.16 Changes: -------- --- /work/SRC/openSUSE:Factory/python-ruamel.yaml/python-ruamel.yaml.changes 2021-07-29 21:31:22.812814199 +0200 +++ /work/SRC/openSUSE:Factory/.python-ruamel.yaml.new.1890/python-ruamel.yaml.changes 2021-10-20 20:24:24.737382816 +0200 @@ -1,0 +2,13 @@ +Sat Oct 16 22:32:20 UTC 2021 - Dirk M??ller <dmuel...@suse.com> + +- update to 0.17.16: + - also handle issue 397 when comment is newline + - fix issue 397, insert comment before key when a comment between key and value exists + - fix issue 396, inserting key/val in merged-in dictionary + - minor fix in attr handling + - fix issue with anchor on registered class not preserved and those classes using package + attrs with `@attr.s()` + - fix error baseclass for ``DuplicateKeyErorr`` (reported by `??ukasz Rogalski + - fix typo in reader error message, causing `KeyError` during reader error + +------------------------------------------------------------------- Old: ---- ruamel.yaml-0.17.10.tar.gz New: ---- ruamel.yaml-0.17.16.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-ruamel.yaml.spec ++++++ --- /var/tmp/diff_new_pack.borG0W/_old 2021-10-20 20:24:25.137383062 +0200 +++ /var/tmp/diff_new_pack.borG0W/_new 2021-10-20 20:24:25.141383065 +0200 @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-ruamel.yaml -Version: 0.17.10 +Version: 0.17.16 Release: 0 Summary: Python YAML parser License: MIT ++++++ ruamel.yaml-0.17.10.tar.gz -> ruamel.yaml-0.17.16.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.17.10/CHANGES new/ruamel.yaml-0.17.16/CHANGES --- old/ruamel.yaml-0.17.10/CHANGES 2021-06-24 10:32:05.000000000 +0200 +++ new/ruamel.yaml-0.17.16/CHANGES 2021-08-28 20:57:50.000000000 +0200 @@ -1,3 +1,27 @@ +[0, 17, 16]: 2021-08-28 + - also handle issue 397 when comment is newline + +[0, 17, 15]: 2021-08-28 + - fix issue 397, insert comment before key when a comment between key and value exists + (reported by `Bastien gerard <https://sourceforge.net/u/bagerard/>`__) + +[0, 17, 14]: 2021-08-25 + - fix issue 396, inserting key/val in merged-in dictionary (reported by `Bastien gerard + <https://sourceforge.net/u/bagerard/>`__) + +[0, 17, 13]: 2021-08-21 + - minor fix in attr handling + +[0, 17, 12]: 2021-08-21 + - fix issue with anchor on registered class not preserved and those classes using package + attrs with `@attr.s()` (both reported by `ssph <https://sourceforge.net/u/sph/>`__) + +[0, 17, 11]: 2021-08-19 + - fix error baseclass for ``DuplicateKeyErorr`` (reported by `??ukasz Rogalski + <https://sourceforge.net/u/lrogalski/>`__) + - fix typo in reader error message, causing `KeyError` during reader error + (reported by `MTU <https://sourceforge.net/u/mtu/>`__) + [0, 17, 10]: 2021-06-24 - fix issue 388, token with old comment structure != two elements (reported by `Dimitrios Bariamis <https://sourceforge.net/u/dbdbc/>`__) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.17.10/PKG-INFO new/ruamel.yaml-0.17.16/PKG-INFO --- old/ruamel.yaml-0.17.10/PKG-INFO 2021-06-24 10:35:25.513823000 +0200 +++ new/ruamel.yaml-0.17.16/PKG-INFO 2021-08-28 21:00:15.345840700 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: ruamel.yaml -Version: 0.17.10 +Version: 0.17.16 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.10 - :updated: 2021-06-24 + :version: 0.17.16 + :updated: 2021-08-28 :documentation: http://yaml.readthedocs.io :repository: https://sourceforge.net/projects/ruamel-yaml/ :pypi: https://pypi.org/project/ruamel.yaml/ @@ -31,11 +31,18 @@ Starting with version 0.15.0 the way YAML files are loaded and dumped - is changing. See the API doc for details. Currently existing + has been changing, see the API doc for details. Currently existing functionality will throw a warning before being changed/removed. - **For production systems you should pin the version being used with - ``ruamel.yaml<=0.15``**. There might be bug fixes in the 0.14 series, - but new functionality is likely only to be available via the new API. + **For production systems already using a pre 0.16 version, you should + pin the version being used with ``ruamel.yaml<=0.15``** if you cannot + fully test upgrading to a newer version. For new usage + pin to the minor version tested ( ``ruamel.yaml<=0.17``) or even to the + exact version used. + + New functionality is usually only available via the new API, so + make sure you use it and stop using the `ruamel.yaml.safe_load()`, + `ruamel.yaml.round_trip_load()` and `ruamel.yaml.load()` functions + (and their `....dump()` counterparts). If your package uses ``ruamel.yaml`` and is not listed on PyPI, drop me an email, preferably with some information on how you use the @@ -73,13 +80,37 @@ .. should insert NEXT: at the beginning of line for next key (with empty line) + 0.17.16 (2021-08-28): + - also handle issue 397 when comment is newline + + 0.17.15 (2021-08-28): + - fix issue 397, insert comment before key when a comment between key and value exists + (reported by `Bastien gerard <https://sourceforge.net/u/bagerard/>`__) + + 0.17.14 (2021-08-25): + - fix issue 396, inserting key/val in merged-in dictionary (reported by `Bastien gerard + <https://sourceforge.net/u/bagerard/>`__) + + 0.17.13 (2021-08-21): + - minor fix in attr handling + + 0.17.12 (2021-08-21): + - fix issue with anchor on registered class not preserved and those classes using package + attrs with `@attr.s()` (both reported by `ssph <https://sourceforge.net/u/sph/>`__) + + 0.17.11 (2021-08-19): + - fix error baseclass for ``DuplicateKeyErorr`` (reported by `??ukasz Rogalski + <https://sourceforge.net/u/lrogalski/>`__) + - fix typo in reader error message, causing `KeyError` during reader error + (reported by `MTU <https://sourceforge.net/u/mtu/>`__) + 0.17.10 (2021-06-24): - fix issue 388, token with old comment structure != two elements (reported by `Dimitrios Bariamis <https://sourceforge.net/u/dbdbc/>`__) 0.17.9 (2021-06-10): - fix issue with updating CommentedMap (reported by sri on - `StackOverlow <https://stackoverflow.com/q/67911659/1307905>`__) + `StackOverflow <https://stackoverflow.com/q/67911659/1307905>`__) 0.17.8 (2021-06-09): - fix for issue 387 where templated anchors on tagged object did get set @@ -152,7 +183,7 @@ (reported by `eulores <https://sourceforge.net/u/eulores/>`__) - a None value in a flow-style sequence is now dumped as `null` instead of `!!null ''` (reported by mcarans on - `StackOverlow <https://stackoverflow.com/a/66489600/1307905>`__) + `StackOverflow <https://stackoverflow.com/a/66489600/1307905>`__) 0.16.12 (2020-09-04): - update links in doc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.17.10/README.rst new/ruamel.yaml-0.17.16/README.rst --- old/ruamel.yaml-0.17.10/README.rst 2021-06-24 10:32:05.000000000 +0200 +++ new/ruamel.yaml-0.17.16/README.rst 2021-08-28 20:57:50.000000000 +0200 @@ -4,8 +4,8 @@ ``ruamel.yaml`` is a YAML 1.2 loader/dumper package for Python. -:version: 0.17.10 -:updated: 2021-06-24 +:version: 0.17.16 +:updated: 2021-08-28 :documentation: http://yaml.readthedocs.io :repository: https://sourceforge.net/projects/ruamel-yaml/ :pypi: https://pypi.org/project/ruamel.yaml/ @@ -23,11 +23,18 @@ Starting with version 0.15.0 the way YAML files are loaded and dumped -is changing. See the API doc for details. Currently existing +has been changing, see the API doc for details. Currently existing functionality will throw a warning before being changed/removed. -**For production systems you should pin the version being used with -``ruamel.yaml<=0.15``**. There might be bug fixes in the 0.14 series, -but new functionality is likely only to be available via the new API. +**For production systems already using a pre 0.16 version, you should +pin the version being used with ``ruamel.yaml<=0.15``** if you cannot +fully test upgrading to a newer version. For new usage +pin to the minor version tested ( ``ruamel.yaml<=0.17``) or even to the +exact version used. + +New functionality is usually only available via the new API, so +make sure you use it and stop using the `ruamel.yaml.safe_load()`, +`ruamel.yaml.round_trip_load()` and `ruamel.yaml.load()` functions +(and their `....dump()` counterparts). If your package uses ``ruamel.yaml`` and is not listed on PyPI, drop me an email, preferably with some information on how you use the @@ -65,13 +72,37 @@ .. should insert NEXT: at the beginning of line for next key (with empty line) +0.17.16 (2021-08-28): + - also handle issue 397 when comment is newline + +0.17.15 (2021-08-28): + - fix issue 397, insert comment before key when a comment between key and value exists + (reported by `Bastien gerard <https://sourceforge.net/u/bagerard/>`__) + +0.17.14 (2021-08-25): + - fix issue 396, inserting key/val in merged-in dictionary (reported by `Bastien gerard + <https://sourceforge.net/u/bagerard/>`__) + +0.17.13 (2021-08-21): + - minor fix in attr handling + +0.17.12 (2021-08-21): + - fix issue with anchor on registered class not preserved and those classes using package + attrs with `@attr.s()` (both reported by `ssph <https://sourceforge.net/u/sph/>`__) + +0.17.11 (2021-08-19): + - fix error baseclass for ``DuplicateKeyErorr`` (reported by `??ukasz Rogalski + <https://sourceforge.net/u/lrogalski/>`__) + - fix typo in reader error message, causing `KeyError` during reader error + (reported by `MTU <https://sourceforge.net/u/mtu/>`__) + 0.17.10 (2021-06-24): - fix issue 388, token with old comment structure != two elements (reported by `Dimitrios Bariamis <https://sourceforge.net/u/dbdbc/>`__) 0.17.9 (2021-06-10): - fix issue with updating CommentedMap (reported by sri on - `StackOverlow <https://stackoverflow.com/q/67911659/1307905>`__) + `StackOverflow <https://stackoverflow.com/q/67911659/1307905>`__) 0.17.8 (2021-06-09): - fix for issue 387 where templated anchors on tagged object did get set @@ -144,7 +175,7 @@ (reported by `eulores <https://sourceforge.net/u/eulores/>`__) - a None value in a flow-style sequence is now dumped as `null` instead of `!!null ''` (reported by mcarans on - `StackOverlow <https://stackoverflow.com/a/66489600/1307905>`__) + `StackOverflow <https://stackoverflow.com/a/66489600/1307905>`__) 0.16.12 (2020-09-04): - update links in doc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.17.10/__init__.py new/ruamel.yaml-0.17.16/__init__.py --- old/ruamel.yaml-0.17.10/__init__.py 2021-06-24 10:32:49.000000000 +0200 +++ new/ruamel.yaml-0.17.16/__init__.py 2021-08-28 20:58:00.000000000 +0200 @@ -5,8 +5,8 @@ _package_data = dict( full_package_name='ruamel.yaml', - version_info=(0, 17, 10), - __version__='0.17.10', + version_info=(0, 17, 16), + __version__='0.17.16', 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.10/comments.py new/ruamel.yaml-0.17.16/comments.py --- old/ruamel.yaml-0.17.10/comments.py 2021-06-10 08:07:41.000000000 +0200 +++ new/ruamel.yaml-0.17.16/comments.py 2021-08-28 20:55:26.000000000 +0200 @@ -391,11 +391,14 @@ after = after[:-1] # strip final newline if there start_mark = CommentMark(indent) c = self.ca.items.setdefault(key, [None, [], None, None]) - if before == '\n': - c[1].append(comment_token("", start_mark)) - elif before: - for com in before.split('\n'): - c[1].append(comment_token(com, start_mark)) + if before is not None: + if c[1] is None: + c[1] = [] + if before == '\n': + c[1].append(comment_token("", start_mark)) + else: + for com in before.split('\n'): + c[1].append(comment_token(com, start_mark)) if after: start_mark = CommentMark(after_indent) if c[3] is None: @@ -881,8 +884,13 @@ """insert key value into given position attach comment if provided """ + keys = list(self.keys()) + [key] ordereddict.insert(self, pos, key, value) - self._ok.add(key) + for keytmp in keys: + self._ok.add(keytmp) + for referer in self._ref: + for keytmp in keys: + referer.update_key_value(keytmp) if comment is not None: self.yaml_add_eol_comment(comment, key=key) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.17.10/constructor.py new/ruamel.yaml-0.17.16/constructor.py --- old/ruamel.yaml-0.17.10/constructor.py 2021-06-09 15:23:55.000000000 +0200 +++ new/ruamel.yaml-0.17.16/constructor.py 2021-08-21 15:24:05.000000000 +0200 @@ -51,7 +51,7 @@ pass -class DuplicateKeyError(MarkedYAMLFutureWarning): +class DuplicateKeyError(MarkedYAMLError): pass @@ -1635,7 +1635,21 @@ data.__setstate__(state) else: state = SafeConstructor.construct_mapping(self, node) - data.__dict__.update(state) + if hasattr(data, '__attrs_attrs__'): # issue 394 + data.__init__(**state) + else: + data.__dict__.update(state) + if node.anchor: + from ruamel.yaml.serializer import templated_id + from ruamel.yaml.anchor import Anchor + + if not templated_id(node.anchor): + if not hasattr(data, Anchor.attrib): + a = Anchor() + setattr(data, Anchor.attrib, a) + else: + a = getattr(data, Anchor.attrib) + a.value = node.anchor def construct_yaml_omap(self, node): # type: (Any) -> Any diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.17.10/reader.py new/ruamel.yaml-0.17.16/reader.py --- old/ruamel.yaml-0.17.10/reader.py 2021-06-02 11:55:03.000000000 +0200 +++ new/ruamel.yaml-0.17.16/reader.py 2021-08-19 07:03:09.000000000 +0200 @@ -56,7 +56,7 @@ ) else: return _F( - 'unacceptable character #x{self_character:04x}: {self._reason!s}\n' + 'unacceptable character #x{self_character:04x}: {self_reason!s}\n' ' in "{self_name!s}", position {self_position:d}', self_character=self.character, self_reason=self.reason, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.17.10/representer.py new/ruamel.yaml-0.17.16/representer.py --- old/ruamel.yaml-0.17.10/representer.py 2021-06-02 11:54:46.000000000 +0200 +++ new/ruamel.yaml-0.17.16/representer.py 2021-08-21 14:14:03.000000000 +0200 @@ -26,6 +26,7 @@ from ruamel.yaml.scalarfloat import ScalarFloat from ruamel.yaml.scalarbool import ScalarBoolean from ruamel.yaml.timestamp import TimeStamp +from ruamel.yaml.anchor import Anchor import datetime import sys @@ -1080,6 +1081,17 @@ anchor = None return SafeRepresenter.represent_bool(self, data, anchor=anchor) + def represent_yaml_object(self, tag, data, cls, flow_style=None): + if hasattr(data, '__getstate__'): + state = data.__getstate__() + else: + state = data.__dict__.copy() + anchor = state.pop(Anchor.attrib, None) + res = self.represent_mapping(tag, state, flow_style=flow_style) + if anchor is not None: + res.anchor = anchor + return res + RoundTripRepresenter.add_representer(type(None), RoundTripRepresenter.represent_none) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.17.10/ruamel.yaml.egg-info/PKG-INFO new/ruamel.yaml-0.17.16/ruamel.yaml.egg-info/PKG-INFO --- old/ruamel.yaml-0.17.10/ruamel.yaml.egg-info/PKG-INFO 2021-06-24 10:35:25.000000000 +0200 +++ new/ruamel.yaml-0.17.16/ruamel.yaml.egg-info/PKG-INFO 2021-08-28 21:00:15.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: ruamel.yaml -Version: 0.17.10 +Version: 0.17.16 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.10 - :updated: 2021-06-24 + :version: 0.17.16 + :updated: 2021-08-28 :documentation: http://yaml.readthedocs.io :repository: https://sourceforge.net/projects/ruamel-yaml/ :pypi: https://pypi.org/project/ruamel.yaml/ @@ -31,11 +31,18 @@ Starting with version 0.15.0 the way YAML files are loaded and dumped - is changing. See the API doc for details. Currently existing + has been changing, see the API doc for details. Currently existing functionality will throw a warning before being changed/removed. - **For production systems you should pin the version being used with - ``ruamel.yaml<=0.15``**. There might be bug fixes in the 0.14 series, - but new functionality is likely only to be available via the new API. + **For production systems already using a pre 0.16 version, you should + pin the version being used with ``ruamel.yaml<=0.15``** if you cannot + fully test upgrading to a newer version. For new usage + pin to the minor version tested ( ``ruamel.yaml<=0.17``) or even to the + exact version used. + + New functionality is usually only available via the new API, so + make sure you use it and stop using the `ruamel.yaml.safe_load()`, + `ruamel.yaml.round_trip_load()` and `ruamel.yaml.load()` functions + (and their `....dump()` counterparts). If your package uses ``ruamel.yaml`` and is not listed on PyPI, drop me an email, preferably with some information on how you use the @@ -73,13 +80,37 @@ .. should insert NEXT: at the beginning of line for next key (with empty line) + 0.17.16 (2021-08-28): + - also handle issue 397 when comment is newline + + 0.17.15 (2021-08-28): + - fix issue 397, insert comment before key when a comment between key and value exists + (reported by `Bastien gerard <https://sourceforge.net/u/bagerard/>`__) + + 0.17.14 (2021-08-25): + - fix issue 396, inserting key/val in merged-in dictionary (reported by `Bastien gerard + <https://sourceforge.net/u/bagerard/>`__) + + 0.17.13 (2021-08-21): + - minor fix in attr handling + + 0.17.12 (2021-08-21): + - fix issue with anchor on registered class not preserved and those classes using package + attrs with `@attr.s()` (both reported by `ssph <https://sourceforge.net/u/sph/>`__) + + 0.17.11 (2021-08-19): + - fix error baseclass for ``DuplicateKeyErorr`` (reported by `??ukasz Rogalski + <https://sourceforge.net/u/lrogalski/>`__) + - fix typo in reader error message, causing `KeyError` during reader error + (reported by `MTU <https://sourceforge.net/u/mtu/>`__) + 0.17.10 (2021-06-24): - fix issue 388, token with old comment structure != two elements (reported by `Dimitrios Bariamis <https://sourceforge.net/u/dbdbc/>`__) 0.17.9 (2021-06-10): - fix issue with updating CommentedMap (reported by sri on - `StackOverlow <https://stackoverflow.com/q/67911659/1307905>`__) + `StackOverflow <https://stackoverflow.com/q/67911659/1307905>`__) 0.17.8 (2021-06-09): - fix for issue 387 where templated anchors on tagged object did get set @@ -152,7 +183,7 @@ (reported by `eulores <https://sourceforge.net/u/eulores/>`__) - a None value in a flow-style sequence is now dumped as `null` instead of `!!null ''` (reported by mcarans on - `StackOverlow <https://stackoverflow.com/a/66489600/1307905>`__) + `StackOverflow <https://stackoverflow.com/a/66489600/1307905>`__) 0.16.12 (2020-09-04): - update links in doc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.17.10/setup.py new/ruamel.yaml-0.17.16/setup.py --- old/ruamel.yaml-0.17.10/setup.py 2021-05-06 09:06:53.000000000 +0200 +++ new/ruamel.yaml-0.17.16/setup.py 2021-08-28 20:57:44.000000000 +0200 @@ -50,10 +50,6 @@ pass -if sys.version_info >= (3, 8): - from ast import Str, Num, Bytes, NameConstant # NOQA - - if sys.version_info < (3,): open_kw = dict() else: @@ -81,6 +77,9 @@ print('{:%Y-%d-%mT%H:%M:%S}'.format(datetime.datetime.now()), file=fp, end=' ') print(*args, **kw1) +if sys.version_info >= (3, 8): + from ast import Str, Num, Bytes, NameConstant # NOQA + def literal_eval(node_or_string): """ @@ -856,7 +855,7 @@ return False with open(file_name, 'w') as fp: if os.path.exists('LICENSE'): - fp.write('[metadata]\nlicense-file = LICENSE\n') + fp.write('[metadata]\nlicense_file = LICENSE\n') else: print('\n\n>>>>>> LICENSE file not found <<<<<\n\n') if self._pkg_data.get('universal'):