summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthon van der Neut <anthon@mnt.org>2022-02-12 09:52:13 +0100
committerAnthon van der Neut <anthon@mnt.org>2022-02-12 09:52:13 +0100
commita9fc2e5d353e5269ee4516945aafebcc8d75c165 (patch)
tree7010986d6eb5db7381e48d2214ea71747bb7a8f6
parent4c1519d446f8d32b1ff34ab8435a32e87ba87b92 (diff)
downloadruamel.yaml-a9fc2e5d353e5269ee4516945aafebcc8d75c165.tar.gz
bug in YAML.compose(Path(...)))0.17.21
-rw-r--r--.hgignore2
-rw-r--r--CHANGES3
-rw-r--r--README.rst22
-rw-r--r--__init__.py6
-rw-r--r--_doc/_static/pypi.svg2
-rw-r--r--main.py2
6 files changed, 20 insertions, 17 deletions
diff --git a/.hgignore b/.hgignore
index 4c733f2..6661784 100644
--- a/.hgignore
+++ b/.hgignore
@@ -14,3 +14,5 @@ try_*
_doc/*.pdf
_doc/*.rst
*.py_alt
+
+ziglib
diff --git a/CHANGES b/CHANGES
index a921b1e..f59a8b8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+[0, 17, 21]: 2022-02-12
+ - fix bug in calling `.compose()` method with `pathlib.Path` instance.
+
[0, 17, 20]: today
- fix error in microseconds while rounding datetime fractions >= 9999995
(reported by `Luis Ferreira <https://sourceforge.net/u/ljmf00/>`__)
diff --git a/README.rst b/README.rst
index e5100b9..204b67d 100644
--- a/README.rst
+++ b/README.rst
@@ -4,23 +4,18 @@ ruamel.yaml
``ruamel.yaml`` is a YAML 1.2 loader/dumper package for Python.
-:version: 0.17.20
-:updated: today
+:version: 0.17.21
+:updated: 2022-02-12
:documentation: http://yaml.readthedocs.io
:repository: https://sourceforge.net/projects/ruamel-yaml/
:pypi: https://pypi.org/project/ruamel.yaml/
*The 0.16.13 release was the last that was tested to be working on Python 2.7.
-The 0.17 series will still be tested on Python 3.5, but the 0.18 will not. The
-0.17 series will also stop support for the old PyYAML functions, so a `YAML()` instance
-will need to be created.*
-
-*The 0.17 series will also see changes in how comments are attached during
-roundtrip. This will result in backwards incompatibilities on the `.ca` data and
-it might even be necessary for documented methods that handle comments.*
-
-*Please adjust your dependencies accordingly if necessary. (`ruamel.yaml<0.17`)*
+The 0.17.21 is the last one tested to be working on Python 3.5,
+that is also the last release supporting old PyYAML functions, you'll have to create a
+`YAML()` instance and use its `.load()` and `.dump()` methods.*
+*Please adjust your dependencies accordingly if necessary. (`ruamel.yaml<0.18`)*
Starting with version 0.15.0 the way YAML files are loaded and dumped
has been changing, see the API doc for details. Currently existing
@@ -72,7 +67,10 @@ ChangeLog
.. should insert NEXT: at the beginning of line for next key (with empty line)
-0.17.20 (today):
+0.17.21 (2022-02-12):
+ - fix bug in calling `.compose()` method with `pathlib.Path` instance.
+
+0.17.20 (2022-01-03):
- fix error in microseconds while rounding datetime fractions >= 9999995
(reported by `Luis Ferreira <https://sourceforge.net/u/ljmf00/>`__)
diff --git a/__init__.py b/__init__.py
index 4e95b86..2a2572c 100644
--- a/__init__.py
+++ b/__init__.py
@@ -5,9 +5,9 @@ if False: # MYPY
_package_data = dict(
full_package_name='ruamel.yaml',
- version_info=(0, 17, 20),
- __version__='0.17.20',
- version_timestamp='2022-01-03 09:19:48',
+ version_info=(0, 17, 21),
+ __version__='0.17.21',
+ version_timestamp='2022-02-12 09:49:22',
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
diff --git a/_doc/_static/pypi.svg b/_doc/_static/pypi.svg
index 85bfab9..315b8c9 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.17.20</text><text x="585" y="140" transform="scale(.1)" textLength="430">0.17.20</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.17.21</text><text x="585" y="140" transform="scale(.1)" textLength="430">0.17.21</text></g> </svg>
diff --git a/main.py b/main.py
index 8a90342..20bd8d3 100644
--- a/main.py
+++ b/main.py
@@ -367,7 +367,7 @@ class YAML:
if not hasattr(stream, 'read') and hasattr(stream, 'open'):
# pathlib.Path() instance
with stream.open('rb') as fp:
- return self.load(fp)
+ return self.compose(fp)
constructor, parser = self.get_constructor_parser(stream)
try:
return constructor.composer.get_single_node()