Hello community,
here is the log from the commit of package python-ruamel.yaml for
openSUSE:Leap:15.2 checked in at 2020-03-10 17:12:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/python-ruamel.yaml (Old)
and /work/SRC/openSUSE:Leap:15.2/.python-ruamel.yaml.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-ruamel.yaml"
Tue Mar 10 17:12:42 2020 rev:20 rq:783048 version:0.16.10
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/python-ruamel.yaml/python-ruamel.yaml.changes
2020-03-09 18:11:17.181189742 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.python-ruamel.yaml.new.26092/python-ruamel.yaml.changes
2020-03-10 17:12:43.185403399 +0100
@@ -1,0 +2,9 @@
+Fri Feb 21 10:02:08 UTC 2020 - Ondřej Súkup <[email protected]>
+
+- update to 0.16.10 (bsc#1164458, CVE-2019-20478)
+ * fix typchecking issue on TaggedScalar
+ * fix error in dumping literal scalar in sequence with comments before element
+ * fix empty string mapping key roundtripping with preservation of quotes as ?
‘
+ * fix incorrect state setting in class constructor
+
+-------------------------------------------------------------------
Old:
----
ruamel.yaml-0.16.5.tar.gz
New:
----
ruamel.yaml-0.16.10.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-ruamel.yaml.spec ++++++
--- /var/tmp/diff_new_pack.nxmKAC/_old 2020-03-10 17:12:43.597403528 +0100
+++ /var/tmp/diff_new_pack.nxmKAC/_new 2020-03-10 17:12:43.601403528 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-ruamel.yaml
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-ruamel.yaml
-Version: 0.16.5
+Version: 0.16.10
Release: 0
Summary: Python YAML parser
License: MIT
++++++ ruamel.yaml-0.16.5.tar.gz -> ruamel.yaml-0.16.10.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ruamel.yaml-0.16.5/CHANGES
new/ruamel.yaml-0.16.10/CHANGES
--- old/ruamel.yaml-0.16.5/CHANGES 2019-08-18 20:23:30.000000000 +0200
+++ new/ruamel.yaml-0.16.10/CHANGES 2020-02-12 13:29:45.000000000 +0100
@@ -1,3 +1,26 @@
+[0, 16, 10]: 2020-02-12
+ - (auto) updated image references in README to sourceforge
+
+[0, 16, 9]: 2020-02-11
+ - update CHANGES
+
+[0, 16, 8]: 2020-02-11
+ - update requirements so that ruamel.yaml.clib is installed for 3.8,
+ as it has become available (via manylinux builds)
+
+[0, 16, 7]: 2020-01-30
+ - fix typchecking issue on TaggedScalar (reported by Jens Nielsen)
+ - fix error in dumping literal scalar in sequence with comments before
element
+ (reported by `EJ Etherington <https://sourceforge.net/u/ejether/>`__)
+
+[0, 16, 6]: 2020-01-20
+ - fix empty string mapping key roundtripping with preservation of quotes as
`? ''`
+ (reported via email by Tomer Aharoni).
+ - fix incorrect state setting in class constructor (reported by `Douglas
Raillard
+ <https://bitbucket.org/%7Bcf052d92-a278-4339-9aa8-de41923bb556%7D/>`__)
+ - adjust deprecation warning test for Hashable, as that no longer warns
(reported
+ by `Jason Montleon
<https://bitbucket.org/%7B8f377d12-8d5b-4069-a662-00a2674fee4e%7D/>`__)
+
[0, 16, 5]: 2019-08-18
- allow for ``YAML(typ=['unsafe', 'pytypes'])``
@@ -77,13 +100,6 @@
(reported by `Marcel Bollmann
<https://bitbucket.org/%7Bd8850921-9145-4ad0-ac30-64c3bd9b036d%7D/>`__)
-[0, 15, 93]: 2019-04-21
- - fix failure to parse empty implicit flow mapping key
- - in YAML 1.1 plains scalars `y`, 'n', `Y`, and 'N' are now
- correctly recognised as booleans and such strings dumped quoted
- (reported by `Marcel Bollmann
- <https://bitbucket.org/%7Bd8850921-9145-4ad0-ac30-64c3bd9b036d%7D/>`__)
-
[0, 15, 92]: 2019-04-16
- fix failure to parse empty implicit block mapping key (reported by
`Nolan W <https://bitbucket.org/i2labs/>`__)
@@ -92,14 +108,6 @@
- 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/>`__)
@@ -114,14 +122,6 @@
- fix inclusing of python code from the subpackage data (containing extra
tests,
reported by `Florian Apolloner <https://bitbucket.org/apollo13/>`__)
-[0, 15, 88]: 2019-02-12
- - fix inclusing of python code from the subpackage data (containing extra
tests,
- reported by `Florian Apolloner <https://bitbucket.org/apollo13/>`__)
-
-[0, 15, 87]: 2019-01-22
- - fix problem with empty lists and the code to reinsert merge keys (reported
via email
- by Zaloo)
-
[0, 15, 87]: 2019-01-22
- fix problem with empty lists and the code to reinsert merge keys (reported
via email
by Zaloo)
@@ -134,14 +134,6 @@
- fix for issue when parsing flow mapping value starting with colon (in pure
Python only)
(reported by `FichteFoll <https://bitbucket.org/FichteFoll/>`__)
-[0, 15, 86]: 2019-01-15
- - reinsert merge key in its old position (reported by grumbler on
- <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)
- (reported by `FichteFoll <https://bitbucket.org/FichteFoll/>`__)
-
[0, 15, 85]: 2019-01-08
- the types used by `SafeConstructor` for mappings and sequences can
now by set by assigning to `XXXConstructor.yaml_base_dict_type`
@@ -176,10 +168,6 @@
- fix issue with anchors nested deeper than alias (reported by gaFF on
`StackOverflow <https://stackoverflow.com/a/53397781/1307905>`__)
-[0, 15, 79]: 2018-11-21
- - fix issue with anchors nested deeper than alias (reported by gaFF on
- `StackOverflow <https://stackoverflow.com/a/53397781/1307905>`__)
-
[0, 15, 78]: 2018-11-15
- fix setup issue for 3.8 (reported by `Sidney Kuyateh
<https://bitbucket.org/autinerd/>`__)
@@ -204,14 +192,6 @@
`StackOverflow question <https://stackoverflow.com/q/52851168/1307905>`__
by `math <https://stackoverflow.com/users/1355634/math>`__)
-[0, 15, 75]: 2018-10-27
- - fix issue with single '?' scalar (reported by `Terrance
- <https://bitbucket.org/OllieTerrance/>`__)
- - fix issue with duplicate merge keys (prompted by `answering
- <https://stackoverflow.com/a/52852106/1307905>`__ a
- `StackOverflow question <https://stackoverflow.com/q/52851168/1307905>`__
- by `math <https://stackoverflow.com/users/1355634/math>`__)
-
[0, 15, 74]: 2018-10-17
- fix dropping of comment on rt before sequence item that is sequence item
(reported by `Thorsten Kampe <https://bitbucket.org/thorstenkampe/>`__)
@@ -225,10 +205,6 @@
- fix regression on explicit 1.1 loading with the C based scanner/parser
(reported by `Tomas Vavra <https://bitbucket.org/xtomik/>`__)
-[0, 15, 72]: 2018-10-06
- - fix regression on explicit 1.1 loading with the C based scanner/parser
- (reported by `Tomas Vavra <https://bitbucket.org/xtomik/>`__)
-
[0, 15, 71]: 2018-09-26
- fix regression where handcrafted CommentedMaps could not be initiated
(reported by
`Dan Helfman <https://bitbucket.org/dhelfman/>`__)
@@ -303,10 +279,6 @@
- issue with C based loader and leading zeros (reported by
`Tom Hamilton Stubber <https://bitbucket.org/TomHamiltonStubber/>`__)
-[0, 15, 59]: 2018-08-17
- - issue with C based loader and leading zeros (reported by
- `Tom Hamilton Stubber <https://bitbucket.org/TomHamiltonStubber/>`__)
-
[0, 15, 58]: 2018-08-17
- simple mappings can now be used as keys when round-tripping::
@@ -417,29 +389,6 @@
consuming to actually `fix
<https://stackoverflow.com/a/51573205/1307905>`__ the tests.
-[0, 15, 46]: 2018-07-29
- - fixed DeprecationWarning for importing from ``collections`` on 3.7
- (issue 210, reported by `Reinoud Elhorst
- <https://bitbucket.org/reinhrst/>`__). It was `difficult to find
- why tox/pytest did not report
- <https://stackoverflow.com/q/51573204/1307905>`__ and as time
- consuming to actually `fix
- <https://stackoverflow.com/a/51573205/1307905>`__ the tests.
-
-[0, 15, 45]: 2018-07-29
- - fixed DeprecationWarning for importing from ``collections`` on 3.7
- (issue 210, reported by `Reinoud Elhorst
- <https://bitbucket.org/reinhrst/>`__). It was `difficult to find
- why tox/pytest did not report
- <https://stackoverflow.com/q/51573204/1307905>`__ and as time
- consuming to actually `fix
- <https://stackoverflow.com/a/51573205/1307905>`__ the tests.
-
-[0, 15, 45]: 2018-07-26
- - After adding failing test for ``YAML.load_all(Path())``, remove
StopIteration
- (PR provided by `Zachary Buhman <https://bitbucket.org/buhman/>`__,
- also reported by `Steven Hiscocks <https://bitbucket.org/sdhiscocks/>`__.
-
[0, 15, 45]: 2018-07-26
- After adding failing test for ``YAML.load_all(Path())``, remove
StopIteration
(PR provided by `Zachary Buhman <https://bitbucket.org/buhman/>`__,
@@ -616,10 +565,6 @@
- fix for issue 130, regression in nested merge keys (reported by
`David Fee <https://bitbucket.org/dfee/>`_)
-[0, 15, 10]: 2017-06-24
- - fix for issue 130, regression in nested merge keys (reported by
- `David Fee <https://bitbucket.org/dfee/>`_)
-
[0, 15, 10]: 2017-06-23
- top level PreservedScalarString not indented if not explicitly asked to
- remove Makefile (not very useful anyway)
@@ -632,9 +577,6 @@
[0, 15, 8]: 2017-06-15
- allow plug-in install via ``install ruamel.yaml[jinja2]``
-
-[0, 15, 8]: 2017-06-15
- - allow plug-in install via ``install ruamel.yaml[jinja2]``
[0, 15, 7]: 2017-06-14
- add plug-in mechanism for load/dump pre resp. post-processing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ruamel.yaml-0.16.5/LICENSE
new/ruamel.yaml-0.16.10/LICENSE
--- old/ruamel.yaml-0.16.5/LICENSE 2019-08-18 20:27:43.000000000 +0200
+++ new/ruamel.yaml-0.16.10/LICENSE 2020-02-12 13:32:24.000000000 +0100
@@ -1,6 +1,6 @@
The MIT License (MIT)
- Copyright (c) 2014-2019 Anthon van der Neut, Ruamel bvba
+ Copyright (c) 2014-2020 Anthon van der Neut, Ruamel bvba
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ruamel.yaml-0.16.5/PKG-INFO
new/ruamel.yaml-0.16.10/PKG-INFO
--- old/ruamel.yaml-0.16.5/PKG-INFO 2019-08-18 20:27:45.000000000 +0200
+++ new/ruamel.yaml-0.16.10/PKG-INFO 2020-02-12 13:32:24.685746400 +0100
@@ -1,8 +1,8 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
Name: ruamel.yaml
-Version: 0.16.5
+Version: 0.16.10
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
+Home-page: https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree
Author: Anthon van der Neut
Author-email: [email protected]
License: MIT license
@@ -12,8 +12,8 @@
``ruamel.yaml`` is a YAML 1.2 loader/dumper package for Python.
- :version: 0.16.5
- :updated: 2019-08-18
+ :version: 0.16.10
+ :updated: 2020-02-12
:documentation: http://yaml.readthedocs.io
:repository: https://bitbucket.org/ruamel/yaml
:pypi: https://pypi.org/project/ruamel.yaml/
@@ -45,13 +45,13 @@
.. image::
https://bestpractices.coreinfrastructure.org/projects/1128/badge
:target: https://bestpractices.coreinfrastructure.org/projects/1128
- .. image::
https://bitbucket.org/ruamel/yaml/raw/default/_doc/_static/license.svg
+ .. image::
https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree/_doc/_static/license.svg?format=raw
:target: https://opensource.org/licenses/MIT
- .. image::
https://bitbucket.org/ruamel/yaml/raw/default/_doc/_static/pypi.svg
+ .. image::
https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree/_doc/_static/pypi.svg?format=raw
:target: https://pypi.org/project/ruamel.yaml/
- .. image::
https://bitbucket.org/ruamel/oitnb/raw/default/_doc/_static/oitnb.svg
+ .. image::
https://sourceforge.net/p/oitnb/code/ci/default/tree/_doc/_static/oitnb.svg?format=raw
:target: https://pypi.org/project/oitnb/
.. image:: http://www.mypy-lang.org/static/mypy_badge.svg
@@ -62,6 +62,29 @@
.. should insert NEXT: at the beginning of line for next key (with
empty line)
+ 0.16.10 (2020-02-12):
+ - (auto) updated image references in README to sourceforge
+
+ 0.16.9 (2020-02-11):
+ - update CHANGES
+
+ 0.16.8 (2020-02-11):
+ - update requirements so that ruamel.yaml.clib is installed for 3.8,
+ as it has become available (via manylinux builds)
+
+ 0.16.7 (2020-01-30):
+ - fix typchecking issue on TaggedScalar (reported by Jens Nielsen)
+ - fix error in dumping literal scalar in sequence with comments
before element
+ (reported by `EJ Etherington
<https://sourceforge.net/u/ejether/>`__)
+
+ 0.16.6 (2020-01-20):
+ - fix empty string mapping key roundtripping with preservation of
quotes as `? ''`
+ (reported via email by Tomer Aharoni).
+ - fix incorrect state setting in class constructor (reported by
`Douglas Raillard
+
<https://bitbucket.org/%7Bcf052d92-a278-4339-9aa8-de41923bb556%7D/>`__)
+ - adjust deprecation warning test for Hashable, as that no longer
warns (reported
+ by `Jason Montleon
<https://bitbucket.org/%7B8f377d12-8d5b-4069-a662-00a2674fee4e%7D/>`__)
+
0.16.5 (2019-08-18):
- allow for ``YAML(typ=['unsafe', 'pytypes'])``
@@ -747,9 +770,13 @@
Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: Jython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Software Development :: Libraries :: Python Modules
Classifier: Topic :: Text Processing :: Markup
Classifier: Typing :: Typed
+Description-Content-Type: text/x-rst
+Provides-Extra: docs
+Provides-Extra: jinja2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ruamel.yaml-0.16.5/README.rst
new/ruamel.yaml-0.16.10/README.rst
--- old/ruamel.yaml-0.16.5/README.rst 2019-08-18 20:23:30.000000000 +0200
+++ new/ruamel.yaml-0.16.10/README.rst 2020-02-12 13:29:45.000000000 +0100
@@ -4,8 +4,8 @@
``ruamel.yaml`` is a YAML 1.2 loader/dumper package for Python.
-:version: 0.16.5
-:updated: 2019-08-18
+:version: 0.16.10
+:updated: 2020-02-12
:documentation: http://yaml.readthedocs.io
:repository: https://bitbucket.org/ruamel/yaml
:pypi: https://pypi.org/project/ruamel.yaml/
@@ -37,13 +37,13 @@
.. image:: https://bestpractices.coreinfrastructure.org/projects/1128/badge
:target: https://bestpractices.coreinfrastructure.org/projects/1128
-.. image::
https://bitbucket.org/ruamel/yaml/raw/default/_doc/_static/license.svg
+.. image::
https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree/_doc/_static/license.svg?format=raw
:target: https://opensource.org/licenses/MIT
-.. image:: https://bitbucket.org/ruamel/yaml/raw/default/_doc/_static/pypi.svg
+.. image::
https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree/_doc/_static/pypi.svg?format=raw
:target: https://pypi.org/project/ruamel.yaml/
-.. image::
https://bitbucket.org/ruamel/oitnb/raw/default/_doc/_static/oitnb.svg
+.. image::
https://sourceforge.net/p/oitnb/code/ci/default/tree/_doc/_static/oitnb.svg?format=raw
:target: https://pypi.org/project/oitnb/
.. image:: http://www.mypy-lang.org/static/mypy_badge.svg
@@ -54,6 +54,29 @@
.. should insert NEXT: at the beginning of line for next key (with empty line)
+0.16.10 (2020-02-12):
+ - (auto) updated image references in README to sourceforge
+
+0.16.9 (2020-02-11):
+ - update CHANGES
+
+0.16.8 (2020-02-11):
+ - update requirements so that ruamel.yaml.clib is installed for 3.8,
+ as it has become available (via manylinux builds)
+
+0.16.7 (2020-01-30):
+ - fix typchecking issue on TaggedScalar (reported by Jens Nielsen)
+ - fix error in dumping literal scalar in sequence with comments before
element
+ (reported by `EJ Etherington <https://sourceforge.net/u/ejether/>`__)
+
+0.16.6 (2020-01-20):
+ - fix empty string mapping key roundtripping with preservation of quotes as
`? ''`
+ (reported via email by Tomer Aharoni).
+ - fix incorrect state setting in class constructor (reported by `Douglas
Raillard
+ <https://bitbucket.org/%7Bcf052d92-a278-4339-9aa8-de41923bb556%7D/>`__)
+ - adjust deprecation warning test for Hashable, as that no longer warns
(reported
+ by `Jason Montleon
<https://bitbucket.org/%7B8f377d12-8d5b-4069-a662-00a2674fee4e%7D/>`__)
+
0.16.5 (2019-08-18):
- allow for ``YAML(typ=['unsafe', 'pytypes'])``
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ruamel.yaml-0.16.5/__init__.py
new/ruamel.yaml-0.16.10/__init__.py
--- old/ruamel.yaml-0.16.5/__init__.py 2019-08-18 20:24:22.000000000 +0200
+++ new/ruamel.yaml-0.16.10/__init__.py 2020-02-12 13:30:15.000000000 +0100
@@ -7,8 +7,8 @@
_package_data = dict(
full_package_name='ruamel.yaml',
- version_info=(0, 16, 5),
- __version__='0.16.5',
+ version_info=(0, 16, 10),
+ __version__='0.16.10',
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
@@ -16,7 +16,7 @@
since=2014,
extras_require={':platform_python_implementation=="CPython" and
python_version<="2.7"': [
'ruamel.ordereddict',
- ], ':platform_python_implementation=="CPython" and
python_version<"3.8"': [
+ ], ':platform_python_implementation=="CPython" and
python_version<"3.9"': [
'ruamel.yaml.clib>=0.1.2',
], 'jinja2': ['ruamel.yaml.jinja2>=0.2'], 'docs': ['ryd']},
# NOQA
@@ -26,6 +26,7 @@
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Programming Language :: Python :: Implementation :: Jython',
@@ -37,7 +38,7 @@
read_the_docs='yaml',
supported=[(2, 7), (3, 5)], # minimum
tox=dict(
- env='*pn', # also test narrow Python 2.7.15 for unicode patterns
+ env='*', # remove 'pn', no longer test narrow Python 2.7 for unicode
patterns and PyPy
deps='ruamel.std.pathlib',
fl8excl='_test/lib',
),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ruamel.yaml-0.16.5/anchor.py
new/ruamel.yaml-0.16.10/anchor.py
--- old/ruamel.yaml-0.16.5/anchor.py 2019-08-18 20:21:18.000000000 +0200
+++ new/ruamel.yaml-0.16.10/anchor.py 2020-01-25 14:40:31.000000000 +0100
@@ -1,4 +1,6 @@
+if False: # MYPY
+ from typing import Any, Dict, Optional, List, Union, Optional, Iterator #
NOQA
anchor_attrib = '_yaml_anchor'
@@ -13,5 +15,6 @@
self.always_dump = False
def __repr__(self):
- ad = ", (always dump)" if self.always_dump else ""
- return "Anchor({!r}{})".format(self.value, ad)
+ # type: () -> Any
+ ad = ', (always dump)' if self.always_dump else ""
+ return 'Anchor({!r}{})'.format(self.value, ad)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ruamel.yaml-0.16.5/comments.py
new/ruamel.yaml-0.16.10/comments.py
--- old/ruamel.yaml-0.16.5/comments.py 2019-08-15 22:21:45.000000000 +0200
+++ new/ruamel.yaml-0.16.10/comments.py 2020-01-21 14:40:41.000000000 +0100
@@ -1115,10 +1115,12 @@
class TaggedScalar(CommentedBase):
# the value and style attributes are set during roundtrip construction
- def __init__(self):
- # type: () -> None
- self.value = None
- self.style = None
+ def __init__(self, value=None, style=None, tag=None):
+ # type: (Any, Any, Any) -> None
+ self.value = value
+ self.style = style
+ if tag is not None:
+ self.yaml_set_tag(tag)
def __str__(self):
# type: () -> Any
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ruamel.yaml-0.16.5/constructor.py
new/ruamel.yaml-0.16.10/constructor.py
--- old/ruamel.yaml-0.16.5/constructor.py 2019-08-15 22:31:29.000000000
+0200
+++ new/ruamel.yaml-0.16.10/constructor.py 2020-01-30 07:45:46.000000000
+0100
@@ -959,7 +959,7 @@
elif state:
slotstate.update(state)
for key, value in slotstate.items():
- setattr(object, key, value)
+ setattr(instance, key, value)
def construct_python_object(self, suffix, node):
# type: (Any, Any) -> Any
@@ -1311,9 +1311,10 @@
if not templated_id(node.anchor):
seqtyp.yaml_set_anchor(node.anchor)
for idx, child in enumerate(node.value):
- ret_val.append(self.construct_object(child, deep=deep))
if child.comment:
seqtyp._yaml_add_comment(child.comment, key=idx)
+ child.comment = None # if moved to sequence remove from child
+ ret_val.append(self.construct_object(child, deep=deep))
seqtyp._yaml_set_idx_line_col(
idx, [child.start_mark.line, child.start_mark.column]
)
@@ -1467,7 +1468,6 @@
)
value = self.construct_object(value_node, deep=deep)
if self.check_mapping_key(node, key_node, maptyp, key, value):
-
if key_node.comment and len(key_node.comment) > 4 and
key_node.comment[4]:
if last_value is None:
key_node.comment[0] = key_node.comment.pop(4)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ruamel.yaml-0.16.5/emitter.py
new/ruamel.yaml-0.16.10/emitter.py
--- old/ruamel.yaml-0.16.5/emitter.py 2019-08-16 07:18:20.000000000 +0200
+++ new/ruamel.yaml-0.16.10/emitter.py 2020-01-30 10:42:09.000000000 +0100
@@ -769,7 +769,8 @@
or (isinstance(self.event, MappingStartEvent) and
self.event.flow_style is True)
or (
isinstance(self.event, ScalarEvent)
- and not self.analysis.empty
+ # if there is an explicit style for an empty string, it is a
simple key
+ and not (self.analysis.empty and self.style and self.style not
in '\'"')
and not self.analysis.multiline
)
or self.check_empty_sequence()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ruamel.yaml-0.16.5/main.py
new/ruamel.yaml-0.16.10/main.py
--- old/ruamel.yaml-0.16.5/main.py 2019-08-18 18:32:50.000000000 +0200
+++ new/ruamel.yaml-0.16.10/main.py 2020-01-21 14:50:56.000000000 +0100
@@ -92,6 +92,8 @@
self.Resolver = ruamel.yaml.resolver.VersionedResolver # type: Any
self.allow_unicode = True
self.Reader = None # type: Any
+ self.Representer = None # type: Any
+ self.Constructor = None # type: Any
self.Scanner = None # type: Any
self.Serializer = None # type: Any
self.default_flow_style = None # type: Any
@@ -127,14 +129,14 @@
if setup_rt:
self.default_flow_style = False
# no optimized rt-dumper yet
- self.Emitter = ruamel.yaml.emitter.Emitter # type: Any
+ self.Emitter = ruamel.yaml.emitter.Emitter
self.Serializer = ruamel.yaml.serializer.Serializer
- self.Representer = ruamel.yaml.representer.RoundTripRepresenter #
type: Any
+ self.Representer = ruamel.yaml.representer.RoundTripRepresenter
self.Scanner = ruamel.yaml.scanner.RoundTripScanner
# no optimized rt-parser yet
- self.Parser = ruamel.yaml.parser.RoundTripParser # type: Any
- self.Composer = ruamel.yaml.composer.Composer # type: Any
- self.Constructor = ruamel.yaml.constructor.RoundTripConstructor #
type: Any
+ self.Parser = ruamel.yaml.parser.RoundTripParser
+ self.Composer = ruamel.yaml.composer.Composer
+ self.Constructor = ruamel.yaml.constructor.RoundTripConstructor
del setup_rt
self.stream = None
self.canonical = None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ruamel.yaml-0.16.5/representer.py
new/ruamel.yaml-0.16.10/representer.py
--- old/ruamel.yaml-0.16.5/representer.py 2019-08-15 22:28:42.000000000
+0200
+++ new/ruamel.yaml-0.16.10/representer.py 2020-01-30 08:49:57.000000000
+0100
@@ -1243,6 +1243,8 @@
PlainScalarString, RoundTripRepresenter.represent_plain_scalarstring
)
+# RoundTripRepresenter.add_representer(tuple, Representer.represent_tuple)
+
RoundTripRepresenter.add_representer(ScalarInt,
RoundTripRepresenter.represent_scalar_int)
RoundTripRepresenter.add_representer(BinaryInt,
RoundTripRepresenter.represent_binary_int)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ruamel.yaml-0.16.5/ruamel.yaml.egg-info/PKG-INFO
new/ruamel.yaml-0.16.10/ruamel.yaml.egg-info/PKG-INFO
--- old/ruamel.yaml-0.16.5/ruamel.yaml.egg-info/PKG-INFO 2019-08-18
20:27:44.000000000 +0200
+++ new/ruamel.yaml-0.16.10/ruamel.yaml.egg-info/PKG-INFO 2020-02-12
13:32:24.000000000 +0100
@@ -1,8 +1,8 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
Name: ruamel.yaml
-Version: 0.16.5
+Version: 0.16.10
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
+Home-page: https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree
Author: Anthon van der Neut
Author-email: [email protected]
License: MIT license
@@ -12,8 +12,8 @@
``ruamel.yaml`` is a YAML 1.2 loader/dumper package for Python.
- :version: 0.16.5
- :updated: 2019-08-18
+ :version: 0.16.10
+ :updated: 2020-02-12
:documentation: http://yaml.readthedocs.io
:repository: https://bitbucket.org/ruamel/yaml
:pypi: https://pypi.org/project/ruamel.yaml/
@@ -45,13 +45,13 @@
.. image::
https://bestpractices.coreinfrastructure.org/projects/1128/badge
:target: https://bestpractices.coreinfrastructure.org/projects/1128
- .. image::
https://bitbucket.org/ruamel/yaml/raw/default/_doc/_static/license.svg
+ .. image::
https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree/_doc/_static/license.svg?format=raw
:target: https://opensource.org/licenses/MIT
- .. image::
https://bitbucket.org/ruamel/yaml/raw/default/_doc/_static/pypi.svg
+ .. image::
https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree/_doc/_static/pypi.svg?format=raw
:target: https://pypi.org/project/ruamel.yaml/
- .. image::
https://bitbucket.org/ruamel/oitnb/raw/default/_doc/_static/oitnb.svg
+ .. image::
https://sourceforge.net/p/oitnb/code/ci/default/tree/_doc/_static/oitnb.svg?format=raw
:target: https://pypi.org/project/oitnb/
.. image:: http://www.mypy-lang.org/static/mypy_badge.svg
@@ -62,6 +62,29 @@
.. should insert NEXT: at the beginning of line for next key (with
empty line)
+ 0.16.10 (2020-02-12):
+ - (auto) updated image references in README to sourceforge
+
+ 0.16.9 (2020-02-11):
+ - update CHANGES
+
+ 0.16.8 (2020-02-11):
+ - update requirements so that ruamel.yaml.clib is installed for 3.8,
+ as it has become available (via manylinux builds)
+
+ 0.16.7 (2020-01-30):
+ - fix typchecking issue on TaggedScalar (reported by Jens Nielsen)
+ - fix error in dumping literal scalar in sequence with comments
before element
+ (reported by `EJ Etherington
<https://sourceforge.net/u/ejether/>`__)
+
+ 0.16.6 (2020-01-20):
+ - fix empty string mapping key roundtripping with preservation of
quotes as `? ''`
+ (reported via email by Tomer Aharoni).
+ - fix incorrect state setting in class constructor (reported by
`Douglas Raillard
+
<https://bitbucket.org/%7Bcf052d92-a278-4339-9aa8-de41923bb556%7D/>`__)
+ - adjust deprecation warning test for Hashable, as that no longer
warns (reported
+ by `Jason Montleon
<https://bitbucket.org/%7B8f377d12-8d5b-4069-a662-00a2674fee4e%7D/>`__)
+
0.16.5 (2019-08-18):
- allow for ``YAML(typ=['unsafe', 'pytypes'])``
@@ -747,9 +770,13 @@
Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: Jython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Software Development :: Libraries :: Python Modules
Classifier: Topic :: Text Processing :: Markup
Classifier: Typing :: Typed
+Description-Content-Type: text/x-rst
+Provides-Extra: docs
+Provides-Extra: jinja2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ruamel.yaml-0.16.5/ruamel.yaml.egg-info/requires.txt
new/ruamel.yaml-0.16.10/ruamel.yaml.egg-info/requires.txt
--- old/ruamel.yaml-0.16.5/ruamel.yaml.egg-info/requires.txt 2019-08-18
20:27:44.000000000 +0200
+++ new/ruamel.yaml-0.16.10/ruamel.yaml.egg-info/requires.txt 2020-02-12
13:32:24.000000000 +0100
@@ -1,5 +1,5 @@
-[:platform_python_implementation=="CPython" and python_version<"3.8"]
+[:platform_python_implementation=="CPython" and python_version<"3.9"]
ruamel.yaml.clib>=0.1.2
[:platform_python_implementation=="CPython" and python_version<="2.7"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ruamel.yaml-0.16.5/setup.py
new/ruamel.yaml-0.16.10/setup.py
--- old/ruamel.yaml-0.16.5/setup.py 2019-08-18 20:23:24.000000000 +0200
+++ new/ruamel.yaml-0.16.10/setup.py 2020-02-12 13:29:41.000000000 +0100
@@ -1,6 +1,6 @@
# # header
# coding: utf-8
-# dd: 20190815
+# dd: 20200125
from __future__ import print_function, absolute_import, division,
unicode_literals
@@ -51,7 +51,6 @@
if sys.version_info >= (3, 8):
-
from ast import Str, Num, Bytes, NameConstant # NOQA
@@ -540,11 +539,13 @@
@property
def url(self):
- if self.full_package_name.startswith('ruamel.'):
- sp = self.full_package_name.split('.', 1)
- else:
- sp = ['ruamel', self.full_package_name]
- return 'https://bitbucket.org/{0}/{1}'.format(*sp)
+ url = self._pkg_data.get('url')
+ if url:
+ return url
+ sp = self.full_package_name
+ for ch in '_.':
+ sp = sp.replace(ch, '-')
+ return 'https://sourceforge.net/p/{0}/code/ci/default/tree'.format(sp)
@property
def author(self):
@@ -927,6 +928,7 @@
try:
with open('README.rst') as fp:
kw['long_description'] = fp.read()
+ kw['long_description_content_type'] = 'text/x-rst'
except Exception:
pass