diff options
author | Anthon van der Neut <anthon@mnt.org> | 2018-08-08 17:48:10 +0200 |
---|---|---|
committer | Anthon van der Neut <anthon@mnt.org> | 2018-08-08 17:48:10 +0200 |
commit | afdcc1219dc6a78fe21f46319dd0fc73da217c59 (patch) | |
tree | 0fe11260dfc94f06a081ffbceffe4d1e06a75136 | |
parent | d68c914426b826ff9b076eb870aebdfdef5d82aa (diff) | |
download | ruamel.yaml-afdcc1219dc6a78fe21f46319dd0fc73da217c59.tar.gz |
push new version fixing two issues0.15.51
-rw-r--r-- | CHANGES | 9 | ||||
-rw-r--r-- | README.rst | 13 | ||||
-rw-r--r-- | __init__.py | 6 | ||||
-rw-r--r-- | _doc/_static/pypi.svg | 2 | ||||
-rw-r--r-- | _test/test_yamlobject.py | 5 | ||||
-rw-r--r-- | constructor.py | 5 | ||||
-rwxr-xr-x[-rw-r--r--] | tox.ini | 2 |
7 files changed, 29 insertions, 13 deletions
@@ -1,3 +1,12 @@ +[0, 15, 51]: 2018-08-08 + - Fix method name dumps (were not dotted) and loads (reported by `Douglas Raillard + <https://bitbucket.org/DouglasRaillard/>`__) + - Fix spurious trailing white-space caused when the comment start + column was no longer reached and there was no actual EOL comment + (e.g. following empty line) and doing substitutions, or when + quotes around scalars got dropped. (reported by `Thomas Guillet + <https://bitbucket.org/guillett/>`__) + [0, 15, 50]: 2018-08-05 - Allow ``YAML()`` as a context manager for output, thereby making it much easier to generate multi-documents in a stream. @@ -4,8 +4,8 @@ ruamel.yaml ``ruamel.yaml`` is a YAML 1.2 loader/dumper package for Python. -:version: 0.15.50 -:updated: 2018-08-05 +:version: 0.15.51 +:updated: 2018-08-08 :documentation: http://yaml.readthedocs.io :repository: https://bitbucket.org/ruamel/ :pypi: https://pypi.org/project/ruamel.yaml/ @@ -54,6 +54,15 @@ ChangeLog .. should insert NEXT: at the beginning of line for next key (with empty line) +0.15.51 (2018-08-08): + - Fix method name dumps (were not dotted) and loads (reported by `Douglas Raillard + <https://bitbucket.org/DouglasRaillard/>`__) + - Fix spurious trailing white-space caused when the comment start + column was no longer reached and there was no actual EOL comment + (e.g. following empty line) and doing substitutions, or when + quotes around scalars got dropped. (reported by `Thomas Guillet + <https://bitbucket.org/guillett/>`__) + 0.15.50 (2018-08-05): - Allow ``YAML()`` as a context manager for output, thereby making it much easier to generate multi-documents in a stream. diff --git a/__init__.py b/__init__.py index 1e3bf42..07126c3 100644 --- a/__init__.py +++ b/__init__.py @@ -7,8 +7,8 @@ if False: # MYPY _package_data = dict( full_package_name='ruamel.yaml', - version_info=(0, 15, 50), - __version__='0.15.50', + version_info=(0, 15, 51), + __version__='0.15.51', author='Anthon van der Neut', author_email='a.van.der.neut@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 @@ -69,7 +69,7 @@ _package_data = dict( deps=u'ruamel.std.pathlib', fl8excl=u'_test/lib', ), - rtfd=47359, + rtfd='yaml', ) # type: Dict[Any, Any] diff --git a/_doc/_static/pypi.svg b/_doc/_static/pypi.svg index a145534..def9f4b 100644 --- a/_doc/_static/pypi.svg +++ b/_doc/_static/pypi.svg @@ -1 +1 @@ -<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="86" height="20"><linearGradient id="b" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="a"><rect width="86" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#a)"><path fill="#555" d="M0 0h33v20H0z"/><path fill="#007ec6" d="M33 0h53v20H33z"/><path fill="url(#b)" d="M0 0h86v20H0z"/></g><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="110"> <text x="175" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="230">pypi</text><text x="175" y="140" transform="scale(.1)" textLength="230">pypi</text><text x="585" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">0.15.50</text><text x="585" y="140" transform="scale(.1)" textLength="430">0.15.50</text></g> </svg> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="86" height="20"><linearGradient id="b" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="a"><rect width="86" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#a)"><path fill="#555" d="M0 0h33v20H0z"/><path fill="#007ec6" d="M33 0h53v20H33z"/><path fill="url(#b)" d="M0 0h86v20H0z"/></g><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="110"> <text x="175" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="230">pypi</text><text x="175" y="140" transform="scale(.1)" textLength="230">pypi</text><text x="585" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">0.15.51</text><text x="585" y="140" transform="scale(.1)" textLength="430">0.15.51</text></g> </svg> diff --git a/_test/test_yamlobject.py b/_test/test_yamlobject.py index 2cb7b11..376d4f8 100644 --- a/_test/test_yamlobject.py +++ b/_test/test_yamlobject.py @@ -45,11 +45,10 @@ def test_monster(tmpdir): assert save_and_run(program_src, tmpdir) == 0 - @pytest.mark.skipif(sys.version_info < (3, 0), reason='no __qualname__') def test_qualified_name00(tmpdir): """issue 214""" - program_src = u'''\ + program_src = u"""\ from ruamel.yaml import YAML from ruamel.yaml.compat import StringIO @@ -64,7 +63,7 @@ def test_qualified_name00(tmpdir): assert res == '!!python/name:__main__.A.f \\n...\\n' x = yaml.load(res) assert x == A.f - ''' + """ assert save_and_run(program_src, tmpdir) == 0 diff --git a/constructor.py b/constructor.py index ab3ebf5..450a3d4 100644 --- a/constructor.py +++ b/constructor.py @@ -801,12 +801,11 @@ class Constructor(SafeConstructor): obj = module while lobject_name: if not hasattr(obj, lobject_name[0]): - + raise ConstructorError( 'while constructing a Python object', mark, - 'cannot find %r in the module %r' % ( - utf8(object_name), module.__name__), + 'cannot find %r in the module %r' % (utf8(object_name), module.__name__), mark, ) obj = getattr(obj, lobject_name.pop(0)) @@ -1,5 +1,5 @@ [tox] -# toworkdir = /data1/DATA/tox/ruamel.yaml +# toxworkdir = /data1/DATA/tox/ruamel.yaml envlist = cs,py37,py27,py36,py35,py34,pypy,py27m [testenv] |