Hello community, here is the log from the commit of package python-ruamel.yaml for openSUSE:Factory checked in at 2019-05-22 11:16:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-ruamel.yaml (Old) and /work/SRC/openSUSE:Factory/.python-ruamel.yaml.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-ruamel.yaml" Wed May 22 11:16:58 2019 rev:16 rq:704433 version:0.15.96 Changes: -------- --- /work/SRC/openSUSE:Factory/python-ruamel.yaml/python-ruamel.yaml.changes 2019-05-14 13:43:56.828713632 +0200 +++ /work/SRC/openSUSE:Factory/.python-ruamel.yaml.new.5148/python-ruamel.yaml.changes 2019-05-22 11:17:00.474489967 +0200 @@ -1,0 +2,8 @@ +Tue May 21 11:20:51 UTC 2019 - Ondřej Súkup <[email protected]> + +- update to 0.15.96 + * fix failure to round-trip anchored scalars in block sequence + * fix failure to indent comments on round-trip anchored block style + scalars in block sequence + +------------------------------------------------------------------- Old: ---- ruamel.yaml-0.15.94.tar.gz New: ---- ruamel.yaml-0.15.96.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-ruamel.yaml.spec ++++++ --- /var/tmp/diff_new_pack.eAwKhT/_old 2019-05-22 11:17:01.514489239 +0200 +++ /var/tmp/diff_new_pack.eAwKhT/_new 2019-05-22 11:17:01.518489237 +0200 @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-ruamel.yaml -Version: 0.15.94 +Version: 0.15.96 Release: 0 Summary: Python YAML parser License: MIT ++++++ ruamel.yaml-0.15.94.tar.gz -> ruamel.yaml-0.15.96.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.15.94/CHANGES new/ruamel.yaml-0.15.96/CHANGES --- old/ruamel.yaml-0.15.94/CHANGES 2019-04-23 08:30:29.000000000 +0200 +++ new/ruamel.yaml-0.15.96/CHANGES 2019-05-16 22:50:45.000000000 +0200 @@ -1,3 +1,15 @@ +[0, 15, 96]: 2019-05-16 + - fix failure to indent comments on round-trip anchored block style + scalars in block sequence (reported by `William Kimball + <https://bitbucket.org/%7Bba35ed20-4bb0-46f8-bb5d-c29871e86a22%7D/>`__) + +[0, 15, 95]: 2019-05-16 + - fix failure to round-trip anchored scalars in block sequence + (reported by `William Kimball + <https://bitbucket.org/%7Bba35ed20-4bb0-46f8-bb5d-c29871e86a22%7D/>`__) + - wheel files for Python 3.4 no longer provided (`Python 3.4 EOL 2019-03-18 + <https://www.python.org/dev/peps/pep-0429/>`__) + [0, 15, 94]: 2019-04-23 - fix missing line-break after end-of-file comments not ending in line-break (reported by `Philip Thompson diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.15.94/PKG-INFO new/ruamel.yaml-0.15.96/PKG-INFO --- old/ruamel.yaml-0.15.94/PKG-INFO 2019-04-23 08:33:54.000000000 +0200 +++ new/ruamel.yaml-0.15.96/PKG-INFO 2019-05-16 22:53:32.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: ruamel.yaml -Version: 0.15.94 +Version: 0.15.96 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.94 - :updated: 2019-04-23 + :version: 0.15.96 + :updated: 2019-05-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.96 (2019-05-16): + - fix failure to indent comments on round-trip anchored block style + scalars in block sequence (reported by `William Kimball + <https://bitbucket.org/%7Bba35ed20-4bb0-46f8-bb5d-c29871e86a22%7D/>`__) + + 0.15.95 (2019-05-16): + - fix failure to round-trip anchored scalars in block sequence + (reported by `William Kimball + <https://bitbucket.org/%7Bba35ed20-4bb0-46f8-bb5d-c29871e86a22%7D/>`__) + - wheel files for Python 3.4 no longer provided (`Python 3.4 EOL 2019-03-18 + <https://www.python.org/dev/peps/pep-0429/>`__) + 0.15.94 (2019-04-23): - fix missing line-break after end-of-file comments not ending in line-break (reported by `Philip Thompson @@ -675,7 +687,6 @@ Classifier: Operating System :: OS Independent Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 2.7 -Classifier: Programming Language :: Python :: 3.4 Classifier: Programming Language :: Python :: 3.5 Classifier: Programming Language :: Python :: 3.6 Classifier: Programming Language :: Python :: 3.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.15.94/README.rst new/ruamel.yaml-0.15.96/README.rst --- old/ruamel.yaml-0.15.94/README.rst 2019-04-23 08:30:29.000000000 +0200 +++ new/ruamel.yaml-0.15.96/README.rst 2019-05-16 22:50:45.000000000 +0200 @@ -4,8 +4,8 @@ ``ruamel.yaml`` is a YAML 1.2 loader/dumper package for Python. -:version: 0.15.94 -:updated: 2019-04-23 +:version: 0.15.96 +:updated: 2019-05-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.96 (2019-05-16): + - fix failure to indent comments on round-trip anchored block style + scalars in block sequence (reported by `William Kimball + <https://bitbucket.org/%7Bba35ed20-4bb0-46f8-bb5d-c29871e86a22%7D/>`__) + +0.15.95 (2019-05-16): + - fix failure to round-trip anchored scalars in block sequence + (reported by `William Kimball + <https://bitbucket.org/%7Bba35ed20-4bb0-46f8-bb5d-c29871e86a22%7D/>`__) + - wheel files for Python 3.4 no longer provided (`Python 3.4 EOL 2019-03-18 + <https://www.python.org/dev/peps/pep-0429/>`__) + 0.15.94 (2019-04-23): - fix missing line-break after end-of-file comments not ending in line-break (reported by `Philip Thompson diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.15.94/__init__.py new/ruamel.yaml-0.15.96/__init__.py --- old/ruamel.yaml-0.15.94/__init__.py 2019-04-23 08:31:18.000000000 +0200 +++ new/ruamel.yaml-0.15.96/__init__.py 2019-05-16 22:51:57.000000000 +0200 @@ -7,62 +7,61 @@ _package_data = dict( full_package_name='ruamel.yaml', - version_info=(0, 15, 94), - __version__='0.15.94', + version_info=(0, 15, 96), + __version__='0.15.96', 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 entry_points=None, since=2014, - extras_require={ - ':platform_python_implementation=="CPython" and python_version<="2.7"': [ - 'ruamel.ordereddict' - ], - 'jinja2': ['ruamel.yaml.jinja2>=0.2'], - 'docs': ['ryd'], - }, + extras_require={':platform_python_implementation=="CPython" and python_version<="2.7"': [ + 'ruamel.ordereddict', + ], 'jinja2': ['ruamel.yaml.jinja2>=0.2'], 'docs': ['ryd']}, ext_modules=[ - dict( - name='_ruamel_yaml', - src=[ - 'ext/_ruamel_yaml.c', - 'ext/api.c', - 'ext/writer.c', - 'ext/dumper.c', - 'ext/loader.c', - 'ext/reader.c', - 'ext/scanner.c', - 'ext/parser.c', - 'ext/emitter.c', - ], - lib=[], - test=""" + dict( + name='_ruamel_yaml', + src=[ + 'ext/_ruamel_yaml.c', + 'ext/api.c', + 'ext/writer.c', + 'ext/dumper.c', + 'ext/loader.c', + 'ext/reader.c', + 'ext/scanner.c', + 'ext/parser.c', + 'ext/emitter.c', + ], + lib=[], + test=""" int main(int argc, char* argv[]) { /* prevent warning */ return 0; } """, - ) + ), ], # NOQA # test='#include "ext/yaml.h"\n\nint main(int argc, char* argv[])\n{\nyaml_parser_t parser;\nparser = parser; /* prevent warning */\nreturn 0;\n}\n', # NOQA classifiers=[ - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.4', - 'Programming Language :: Python :: 3.5', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: Implementation :: CPython', - 'Programming Language :: Python :: Implementation :: PyPy', - 'Programming Language :: Python :: Implementation :: Jython', - 'Topic :: Software Development :: Libraries :: Python Modules', - 'Topic :: Text Processing :: Markup', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: Implementation :: CPython', + 'Programming Language :: Python :: Implementation :: PyPy', + 'Programming Language :: Python :: Implementation :: Jython', + 'Topic :: Software Development :: Libraries :: Python Modules', + 'Topic :: Text Processing :: Markup', ], keywords='yaml 1.2 parser round-trip preserve quotes order config', - wheels=dict(windows='appveyor', linux='libyaml-devel', macos='builder@macos'), + wheels=dict( + windows='appveyor', + linux='libyaml-devel', + macos='builder@macos', + ), read_the_docs='yaml', - supported=[(2, 7), (3, 4)], # minimum + supported=[(2, 7), (3, 5)], # minimum tox=dict( env='*pn', # also test narrow Python 2.7.15 for unicode patterns deps='ruamel.std.pathlib', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.15.94/emitter.py new/ruamel.yaml-0.15.96/emitter.py --- old/ruamel.yaml-0.15.94/emitter.py 2019-02-27 22:43:41.000000000 +0100 +++ new/ruamel.yaml-0.15.96/emitter.py 2019-05-16 00:22:01.000000000 +0200 @@ -421,7 +421,6 @@ self.indention = False self.no_newline = True if self.write_pre_comment(self.event): - pass self.indention = i2 self.no_newline = not self.indention if ( @@ -780,6 +779,8 @@ self.prepared_anchor = self.prepare_anchor(self.event.anchor) if self.prepared_anchor: self.write_indicator(indicator + self.prepared_anchor, True) + # issue 288 + self.no_newline = False self.prepared_anchor = None return True @@ -1631,7 +1632,7 @@ # at least one space if the current column >= the start column of the comment # but not at the start of a line nr_spaces = col - self.column - if self.column and value.strip() and nr_spaces < 1: + if self.column and value.strip() and nr_spaces < 1 and value[0] != '\n': nr_spaces = 1 value = ' ' * nr_spaces + value try: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.15.94/ruamel.yaml.egg-info/PKG-INFO new/ruamel.yaml-0.15.96/ruamel.yaml.egg-info/PKG-INFO --- old/ruamel.yaml-0.15.94/ruamel.yaml.egg-info/PKG-INFO 2019-04-23 08:33:52.000000000 +0200 +++ new/ruamel.yaml-0.15.96/ruamel.yaml.egg-info/PKG-INFO 2019-05-16 22:53:31.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: ruamel.yaml -Version: 0.15.94 +Version: 0.15.96 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.94 - :updated: 2019-04-23 + :version: 0.15.96 + :updated: 2019-05-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.96 (2019-05-16): + - fix failure to indent comments on round-trip anchored block style + scalars in block sequence (reported by `William Kimball + <https://bitbucket.org/%7Bba35ed20-4bb0-46f8-bb5d-c29871e86a22%7D/>`__) + + 0.15.95 (2019-05-16): + - fix failure to round-trip anchored scalars in block sequence + (reported by `William Kimball + <https://bitbucket.org/%7Bba35ed20-4bb0-46f8-bb5d-c29871e86a22%7D/>`__) + - wheel files for Python 3.4 no longer provided (`Python 3.4 EOL 2019-03-18 + <https://www.python.org/dev/peps/pep-0429/>`__) + 0.15.94 (2019-04-23): - fix missing line-break after end-of-file comments not ending in line-break (reported by `Philip Thompson @@ -675,7 +687,6 @@ Classifier: Operating System :: OS Independent Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 2.7 -Classifier: Programming Language :: Python :: 3.4 Classifier: Programming Language :: Python :: 3.5 Classifier: Programming Language :: Python :: 3.6 Classifier: Programming Language :: Python :: 3.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.15.94/scanner.py new/ruamel.yaml-0.15.96/scanner.py --- old/ruamel.yaml-0.15.94/scanner.py 2019-04-23 08:30:17.000000000 +0200 +++ new/ruamel.yaml-0.15.96/scanner.py 2019-05-16 22:49:42.000000000 +0200 @@ -1237,7 +1237,7 @@ # Eat whitespaces and comments until we reach the next token. comment = self.scan_to_next_token() while comment: - trailing.append(comment[0]) + trailing.append(' ' * comment[1].column + comment[0]) comment = self.scan_to_next_token() # Keep track of the trailing whitespace and following comments @@ -1794,7 +1794,7 @@ if isinstance(self.tokens[0], CommentToken): self.tokens_taken += 1 comment = self.tokens.pop(0) - # print 'dropping2', comment + # nprint('dropping2', comment) comments.append(comment) if len(comments) >= 1: self.tokens[0].add_pre_comments(comments) @@ -1824,7 +1824,34 @@ and self.tokens[0].end_mark.line == self.tokens[1].start_mark.line ): self.tokens_taken += 1 - self.tokens[0].add_post_comment(self.tokens.pop(1)) + c = self.tokens.pop(1) + self.fetch_more_tokens() + while len(self.tokens) > 1 and isinstance(self.tokens[1], CommentToken): + self.tokens_taken += 1 + c1 = self.tokens.pop(1) + c.value = c.value + (' ' * c1.start_mark.column) + c1.value + self.fetch_more_tokens() + self.tokens[0].add_post_comment(c) + elif ( + len(self.tokens) > 1 + and isinstance(self.tokens[0], ScalarToken) + and isinstance(self.tokens[1], CommentToken) + and self.tokens[0].end_mark.line != self.tokens[1].start_mark.line + ): + self.tokens_taken += 1 + c = self.tokens.pop(1) + c.value = ( + '\n' * (c.start_mark.line - self.tokens[0].end_mark.line) + + (' ' * c.start_mark.column) + + c.value + ) + self.tokens[0].add_post_comment(c) + self.fetch_more_tokens() + while len(self.tokens) > 1 and isinstance(self.tokens[1], CommentToken): + self.tokens_taken += 1 + c1 = self.tokens.pop(1) + c.value = c.value + (' ' * c1.start_mark.column) + c1.value + self.fetch_more_tokens() self.tokens_taken += 1 return self.tokens.pop(0) return None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruamel.yaml-0.15.94/tokens.py new/ruamel.yaml-0.15.96/tokens.py --- old/ruamel.yaml-0.15.94/tokens.py 2018-11-15 15:46:06.000000000 +0100 +++ new/ruamel.yaml-0.15.96/tokens.py 2019-05-16 21:16:49.000000000 +0200 @@ -266,6 +266,7 @@ if SHOWLINES: try: v += ', line: ' + str(self.start_mark.line) + v += ', col: ' + str(self.start_mark.column) except: # NOQA pass return 'CommentToken({})'.format(v)
