From a298abc0b4b1f19fd8c05c16f605ee2e038f84e922ae3c6f5b257f5655475c6a Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 18 May 2023 09:33:57 +0000 Subject: [PATCH 1/3] Accepting request 1087670 from home:ojkastl_buildservice:Branch_devel_languages_python - adapt patch 0000-fix-big-endian-issues.patch - update to 0.17.26 OBS-URL: https://build.opensuse.org/request/show/1087670 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ruamel.yaml?expand=0&rev=67 --- 0000-fix-big-endian-issues.patch | 18 ++++---- python-ruamel.yaml.changes | 70 ++++++++++++++++++++++++++++++++ python-ruamel.yaml.spec | 4 +- ruamel.yaml-0.17.21.tar.gz | 3 -- ruamel.yaml-0.17.26.tar.gz | 3 ++ 5 files changed, 83 insertions(+), 15 deletions(-) delete mode 100644 ruamel.yaml-0.17.21.tar.gz create mode 100644 ruamel.yaml-0.17.26.tar.gz diff --git a/0000-fix-big-endian-issues.patch b/0000-fix-big-endian-issues.patch index 7f11c4f..7b1e947 100644 --- a/0000-fix-big-endian-issues.patch +++ b/0000-fix-big-endian-issues.patch @@ -10,15 +10,15 @@ Index: ruamel.yaml/main.py =================================================================== --- ruamel.yaml.orig/main.py 2021-10-14 00:10:27.265523204 +0200 +++ ruamel.yaml/main.py 2021-10-14 00:11:02.469504291 +0200 -@@ -51,7 +51,7 @@ - - - class YAML: -- def __init__(self, *, typ=None, pure=False, output=None, plug_ins=None): # input=None, -+ def __init__(self, *, typ=None, pure=None, output=None, plug_ins=None): # input=None, - # type: (Any, Optional[Text], Any, Any, Any) -> None - """ - typ: 'rt'/None -> RoundTripLoader/RoundTripDumper, (default) +@@ -55,7 +55,7 @@ + self: Any, + *, + typ: Optional[Union[List[Text], Text]] = None, +- pure: Any = False, ++ pure: Any = None, + output: Any = None, + plug_ins: Any = None, + ) -> None: # input=None, @@ -64,6 +64,11 @@ """ diff --git a/python-ruamel.yaml.changes b/python-ruamel.yaml.changes index 93379f7..4d19fee 100644 --- a/python-ruamel.yaml.changes +++ b/python-ruamel.yaml.changes @@ -1,3 +1,73 @@ +------------------------------------------------------------------- +Wed May 17 09:07:31 UTC 2023 - Johannes Kastl + +- adapt patch 0000-fix-big-endian-issues.patch +- update to 0.17.26: + - Fix for error on edge cage for issue 459 +- update to 0.17.25: + - fix for regression while dumping wrapped strings with too many + backslashes removed (issue 459, reported by `Lele Gaifax + `__) +- update to 0.17.24: + - rewrite of ``CommentedMap.insert()``. If you have a merge key + in the YAML document for the mapping you insert to, the + position value should be the one as you look at the YAML input. + This fixes issue 453 where other keys of a merged in mapping + would show up after an insert (reported by `Alex Miller + `__). It also + fixes a call to `.insert()` resulting into the merge key to + move to be the first key if it wasn't already and it is also + now possible to insert a key before a merge key (even if the + fist key in the mapping). + - fix (in the pure Python implementation including default) for + issue 447. (reported by `Jack Cherng + `__, also brought + up by brent on `StackOverflow + `__) +- update to 0.17.23: + - fix 458, error on plain scalars starting with word longer than + width. (reported by `Kyle Larose + `__) + - fix for ``.update()`` no longer correctly handling keyword + arguments (reported by John Lin on `__) + - fix issue 454: high Unicode (emojis) in quoted strings always + escaped (reported by `Michal Čihař + `__ based on a + question on StackOverflow). + - fix issue with emitter conservatively inserting extra + backslashes in wrapped quoted strings (reported by thebenman on + `StackOverflow + `__) +- update to 0.17.22: + - fix issue 449 where the second exclamation marks got URL + encoded (reported and fixing PR provided by `John Stark + `__) + - fix issue with indent != 2 and literal scalars with empty first + line (reported by wrdis on `StackOverflow + `__) + - updated __repr__ of CommentedMap, now that Python's dict is + ordered -> no more ordereddict(list-of-tuples) + - merge MR 4, handling OctalInt in YAML 1.1 (provided by `Jacob + Floyd `_) + - fix loading of `!!float 42` (reported by Eric on `Stack + overflow `_) + - line numbers are now set on `CommentedKeySeq` and + `CommentedKeyMap` (which are created if you have a sequence + resp. mapping as the key in a mapping) + - plain scalars: put single words longer than width on a line of + their own, instead of after the previous line (issue 427, + reported by `Antoine Cotten + `_). Caveat: this + currently results in a space ending the previous line. + - fix for folded scalar part of 421: comments after ">" on first + line of folded scalars are now preserved (as were those in the + same position on literal scalars). Issue reported by Jacob + Floyd. + - added stacklevel to warnings + - typing changed from Py2 compatible comments to Py3, removed + various Py2-isms + ------------------------------------------------------------------- Fri Apr 21 12:33:35 UTC 2023 - Dirk Müller diff --git a/python-ruamel.yaml.spec b/python-ruamel.yaml.spec index 8a247ce..cef9cdf 100644 --- a/python-ruamel.yaml.spec +++ b/python-ruamel.yaml.spec @@ -16,10 +16,9 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} %{?sle15_python_module_pythons} Name: python-ruamel.yaml -Version: 0.17.21 +Version: 0.17.26 Release: 0 Summary: Python YAML parser License: MIT @@ -54,7 +53,6 @@ rm -rf *egg-info %license LICENSE %doc CHANGES README.rst %{python_sitelib}/ruamel -%{python_sitelib}/ruamel.yaml-%{version}-py%{python_version}-nspkg.pth %{python_sitelib}/ruamel.yaml-%{version}-py%{python_version}.egg-info %changelog diff --git a/ruamel.yaml-0.17.21.tar.gz b/ruamel.yaml-0.17.21.tar.gz deleted file mode 100644 index b3133dd..0000000 --- a/ruamel.yaml-0.17.21.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af -size 128123 diff --git a/ruamel.yaml-0.17.26.tar.gz b/ruamel.yaml-0.17.26.tar.gz new file mode 100644 index 0000000..ca15cf1 --- /dev/null +++ b/ruamel.yaml-0.17.26.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:baa2d0a5aad2034826c439ce61c142c07082b76f4791d54145e131206e998059 +size 130976 From d35132571cf55cfae0251034b561286d3a01eba1517c22c46ce1134bc0495f6e Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 18 May 2023 09:38:17 +0000 Subject: [PATCH 2/3] Clean up the SPEC file OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ruamel.yaml?expand=0&rev=68 --- python-ruamel.yaml.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-ruamel.yaml.spec b/python-ruamel.yaml.spec index cef9cdf..34142f1 100644 --- a/python-ruamel.yaml.spec +++ b/python-ruamel.yaml.spec @@ -53,6 +53,6 @@ rm -rf *egg-info %license LICENSE %doc CHANGES README.rst %{python_sitelib}/ruamel -%{python_sitelib}/ruamel.yaml-%{version}-py%{python_version}.egg-info +%{python_sitelib}/ruamel.yaml-%{version}*-info %changelog From e37f164a17def3dab6df40168226945569517777ca56aa1f48b208e21a142358 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 18 May 2023 09:38:46 +0000 Subject: [PATCH 3/3] Clean up the SPEC file OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ruamel.yaml?expand=0&rev=69 --- python-ruamel.yaml.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python-ruamel.yaml.spec b/python-ruamel.yaml.spec index 34142f1..bed526b 100644 --- a/python-ruamel.yaml.spec +++ b/python-ruamel.yaml.spec @@ -38,8 +38,7 @@ ruamel.yaml is a YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order. %prep -%setup -q -n ruamel.yaml-%{version} -%patch0 -p1 +%autosetup -p1 -n ruamel.yaml-%{version} rm -rf *egg-info %build