From afe54c853d319f8bed39ab2ee4829526f3e1eb67 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 22 Jun 2023 15:20:26 +0200 Subject: [PATCH 01/27] Rebuilt for Python 3.12 --- python-ruamel-yaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index e3f3ee7..c6a4e9c 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -5,7 +5,7 @@ Name: python-ruamel-yaml Version: 0.17.32 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML 1.2 loader/dumper package for Python # SPDX @@ -67,6 +67,9 @@ k="${k-}${k+ and }not test_dump_cyaml_1_2" %doc README.rst %changelog +* Thu Jun 22 2023 Python Maint - 0.17.32-2 +- Rebuilt for Python 3.12 + * Mon Jun 19 2023 Joel Capitao - 0.17.32-1 - Update to 0.17.32 (close RHBZ#2210057) From dcd211e000491fdf5a1837f3caf324fc6f752f76 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 13:47:48 +0000 Subject: [PATCH 02/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-ruamel-yaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index c6a4e9c..279a614 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -5,7 +5,7 @@ Name: python-ruamel-yaml Version: 0.17.32 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML 1.2 loader/dumper package for Python # SPDX @@ -67,6 +67,9 @@ k="${k-}${k+ and }not test_dump_cyaml_1_2" %doc README.rst %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 0.17.32-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jun 22 2023 Python Maint - 0.17.32-2 - Rebuilt for Python 3.12 From bd56ac7807a6d5429c1099960b098604761a93b9 Mon Sep 17 00:00:00 2001 From: Joel Capitao Date: Tue, 24 Oct 2023 14:49:11 +0200 Subject: [PATCH 03/27] Update to 0.18.1 (close RHBZ#2241174) --- .gitignore | 1 + python-ruamel-yaml.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 5b9d973..5f16c82 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /ruamel-yaml-code-56b3e2666fb275deab3eec99193c103e4edf93bb.zip /ruamel-yaml-code-4309006902d2453399588f4ddccfb3fc460e1eba.zip /ruamel-yaml-code-829991d24309dd85ef9c066dbfed17eb4e4fd571.zip +/ruamel-yaml-code-c0da0ba934877fdfe63bee77ec12a7d2341f5398.zip diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 279a614..356261b 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -1,11 +1,11 @@ # Breaks the circular dependency with ruamel.yaml.clib. %bcond_with bootstrap -%global commit 829991d24309dd85ef9c066dbfed17eb4e4fd571 +%global commit c0da0ba934877fdfe63bee77ec12a7d2341f5398 Name: python-ruamel-yaml -Version: 0.17.32 -Release: 3%{?dist} +Version: 0.18.1 +Release: 1%{?dist} Summary: YAML 1.2 loader/dumper package for Python # SPDX @@ -64,9 +64,12 @@ k="${k-}${k+ and }not test_dump_cyaml_1_2" %files -n python3-ruamel-yaml -f %{pyproject_files} # pyproject_files handles LICENSE; verify with “rpm -qL -p …” -%doc README.rst +%doc README.md %changelog +* Tue Oct 24 2023 Joel Capitao - 0.18.1-1 +- Update to 0.18.1 (close RHBZ#2241174) + * Fri Jul 21 2023 Fedora Release Engineering - 0.17.32-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 52af4ac..f3ab5ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruamel-yaml-code-829991d24309dd85ef9c066dbfed17eb4e4fd571.zip) = 2a0f63e930e45e12c7fa248a19ef93c749f70fb77f53770c6862bb4a01273d3e470bdf689620b5d947fe8d82170da2c33eacd3213af31c679c6895e751b6d285 +SHA512 (ruamel-yaml-code-c0da0ba934877fdfe63bee77ec12a7d2341f5398.zip) = 39a89a7511da691504c856c620a7feb1fc0ed42c37f8701391b198fa34a0bacf20e4f823390d56e09522ad10d76e4c72b27eed55a562f29876e93568e833660c From ed9b5461524d0a7029e67ed7c1f774ab785b116b Mon Sep 17 00:00:00 2001 From: Joel Capitao Date: Thu, 26 Oct 2023 10:51:09 +0200 Subject: [PATCH 04/27] Update to 0.18.2 (close RHBZ#2245968) --- .gitignore | 1 + python-ruamel-yaml.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5f16c82..b5a005e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /ruamel-yaml-code-4309006902d2453399588f4ddccfb3fc460e1eba.zip /ruamel-yaml-code-829991d24309dd85ef9c066dbfed17eb4e4fd571.zip /ruamel-yaml-code-c0da0ba934877fdfe63bee77ec12a7d2341f5398.zip +/ruamel-yaml-code-a35908655d678b8463ee6198869a0708b3446e06.zip diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 356261b..634c450 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -1,10 +1,10 @@ # Breaks the circular dependency with ruamel.yaml.clib. %bcond_with bootstrap -%global commit c0da0ba934877fdfe63bee77ec12a7d2341f5398 +%global commit a35908655d678b8463ee6198869a0708b3446e06 Name: python-ruamel-yaml -Version: 0.18.1 +Version: 0.18.2 Release: 1%{?dist} Summary: YAML 1.2 loader/dumper package for Python @@ -67,6 +67,9 @@ k="${k-}${k+ and }not test_dump_cyaml_1_2" %doc README.md %changelog +* Thu Oct 26 2023 Joel Capitao - 0.18.2-1 +- Update to 0.18.2 (close RHBZ#2245968) + * Tue Oct 24 2023 Joel Capitao - 0.18.1-1 - Update to 0.18.1 (close RHBZ#2241174) diff --git a/sources b/sources index f3ab5ab..0e17c14 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruamel-yaml-code-c0da0ba934877fdfe63bee77ec12a7d2341f5398.zip) = 39a89a7511da691504c856c620a7feb1fc0ed42c37f8701391b198fa34a0bacf20e4f823390d56e09522ad10d76e4c72b27eed55a562f29876e93568e833660c +SHA512 (ruamel-yaml-code-a35908655d678b8463ee6198869a0708b3446e06.zip) = 447bd14df3675ccdd337e11fb10ddc5b2c87c0d423d54677e4a5c25b82ca7f8064db7aa29a8578c920c5c5a20cfba8aee159c53f84955e4f3f952bfc22e22062 From 25d71c1f4c2caad31342fd8af39f2ebb80017f8b Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Sun, 12 Nov 2023 08:36:44 +0530 Subject: [PATCH 05/27] Update to 0.18.5 --- .gitignore | 1 + python-ruamel-yaml.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b5a005e..ee944e2 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /ruamel-yaml-code-829991d24309dd85ef9c066dbfed17eb4e4fd571.zip /ruamel-yaml-code-c0da0ba934877fdfe63bee77ec12a7d2341f5398.zip /ruamel-yaml-code-a35908655d678b8463ee6198869a0708b3446e06.zip +/ruamel-yaml-code-eb3ecf31085135283908fc8449befebbc1fff4b3.zip diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 634c450..b19e185 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -1,10 +1,10 @@ # Breaks the circular dependency with ruamel.yaml.clib. %bcond_with bootstrap -%global commit a35908655d678b8463ee6198869a0708b3446e06 +%global commit eb3ecf31085135283908fc8449befebbc1fff4b3 Name: python-ruamel-yaml -Version: 0.18.2 +Version: 0.18.5 Release: 1%{?dist} Summary: YAML 1.2 loader/dumper package for Python @@ -67,6 +67,9 @@ k="${k-}${k+ and }not test_dump_cyaml_1_2" %doc README.md %changelog +* Sun Nov 12 2023 Parag Nemade - 0.18.5-1 +- Update to 0.18.5 + * Thu Oct 26 2023 Joel Capitao - 0.18.2-1 - Update to 0.18.2 (close RHBZ#2245968) diff --git a/sources b/sources index 0e17c14..5412e42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruamel-yaml-code-a35908655d678b8463ee6198869a0708b3446e06.zip) = 447bd14df3675ccdd337e11fb10ddc5b2c87c0d423d54677e4a5c25b82ca7f8064db7aa29a8578c920c5c5a20cfba8aee159c53f84955e4f3f952bfc22e22062 +SHA512 (ruamel-yaml-code-eb3ecf31085135283908fc8449befebbc1fff4b3.zip) = 2319ecd339100ec51b060e1fb19d08c3f7603675ce3a17b59c05d11893ca7644d06ececf3950f02eda25cabede6037b5128184823f734f0e66473c5dfdef7cdc From 96ca2a1c554150944180c171e83f3e9c3d13a9ad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 06:47:58 +0000 Subject: [PATCH 06/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- python-ruamel-yaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index b19e185..844c232 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -5,7 +5,7 @@ Name: python-ruamel-yaml Version: 0.18.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML 1.2 loader/dumper package for Python # SPDX @@ -67,6 +67,9 @@ k="${k-}${k+ and }not test_dump_cyaml_1_2" %doc README.md %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 0.18.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Nov 12 2023 Parag Nemade - 0.18.5-1 - Update to 0.18.5 From ebb5fee7bd32ea390fd9a0ef0aefa8ee17932008 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 10:22:38 +0000 Subject: [PATCH 07/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- python-ruamel-yaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 844c232..aad5c62 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -5,7 +5,7 @@ Name: python-ruamel-yaml Version: 0.18.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML 1.2 loader/dumper package for Python # SPDX @@ -67,6 +67,9 @@ k="${k-}${k+ and }not test_dump_cyaml_1_2" %doc README.md %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 0.18.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 0.18.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 4cb5de41acd70538e8fec202f4ad086951eb98f5 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 10:57:57 +0200 Subject: [PATCH 08/27] Bootstrap for Python 3.13 --- python-ruamel-yaml.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index aad5c62..dfce01a 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -1,3 +1,4 @@ +%global _with_bootstrap 1 # Breaks the circular dependency with ruamel.yaml.clib. %bcond_with bootstrap @@ -5,7 +6,7 @@ Name: python-ruamel-yaml Version: 0.18.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: YAML 1.2 loader/dumper package for Python # SPDX @@ -67,6 +68,9 @@ k="${k-}${k+ and }not test_dump_cyaml_1_2" %doc README.md %changelog +* Fri Jun 07 2024 Python Maint - 0.18.5-4 +- Bootstrap for Python 3.13 + * Fri Jan 26 2024 Fedora Release Engineering - 0.18.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From e5698a903c8fb280dfe93f499eefd39cef4528ae Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 11:25:00 +0200 Subject: [PATCH 09/27] Rebuilt for Python 3.13 --- python-ruamel-yaml.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index dfce01a..385ef69 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -1,4 +1,3 @@ -%global _with_bootstrap 1 # Breaks the circular dependency with ruamel.yaml.clib. %bcond_with bootstrap @@ -6,7 +5,7 @@ Name: python-ruamel-yaml Version: 0.18.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: YAML 1.2 loader/dumper package for Python # SPDX @@ -68,6 +67,9 @@ k="${k-}${k+ and }not test_dump_cyaml_1_2" %doc README.md %changelog +* Fri Jun 07 2024 Python Maint - 0.18.5-5 +- Rebuilt for Python 3.13 + * Fri Jun 07 2024 Python Maint - 0.18.5-4 - Bootstrap for Python 3.13 From c1f422175efc64c5679e834ce346ed86e5566cda Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 15:35:02 +0000 Subject: [PATCH 10/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- python-ruamel-yaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 385ef69..c175bcd 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -5,7 +5,7 @@ Name: python-ruamel-yaml Version: 0.18.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: YAML 1.2 loader/dumper package for Python # SPDX @@ -67,6 +67,9 @@ k="${k-}${k+ and }not test_dump_cyaml_1_2" %doc README.md %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 0.18.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jun 07 2024 Python Maint - 0.18.5-5 - Rebuilt for Python 3.13 From 9489df6d011ce31a89739844ac37a956955be035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ondrej=20Mosn=C3=A1=C4=8Dek?= Date: Sun, 24 Nov 2024 17:49:01 +0100 Subject: [PATCH 11/27] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 185 +++++++++++++++++++++++++++++++++++++++ python-ruamel-yaml.spec | 188 +--------------------------------------- 2 files changed, 187 insertions(+), 186 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..2179505 --- /dev/null +++ b/changelog @@ -0,0 +1,185 @@ +* Fri Jul 19 2024 Fedora Release Engineering - 0.18.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jun 07 2024 Python Maint - 0.18.5-5 +- Rebuilt for Python 3.13 + +* Fri Jun 07 2024 Python Maint - 0.18.5-4 +- Bootstrap for Python 3.13 + +* Fri Jan 26 2024 Fedora Release Engineering - 0.18.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 0.18.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Nov 12 2023 Parag Nemade - 0.18.5-1 +- Update to 0.18.5 + +* Thu Oct 26 2023 Joel Capitao - 0.18.2-1 +- Update to 0.18.2 (close RHBZ#2245968) + +* Tue Oct 24 2023 Joel Capitao - 0.18.1-1 +- Update to 0.18.1 (close RHBZ#2241174) + +* Fri Jul 21 2023 Fedora Release Engineering - 0.17.32-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jun 22 2023 Python Maint - 0.17.32-2 +- Rebuilt for Python 3.12 + +* Mon Jun 19 2023 Joel Capitao - 0.17.32-1 +- Update to 0.17.32 (close RHBZ#2210057) + +* Wed Jun 14 2023 Python Maint - 0.17.26-4 +- Rebuilt for Python 3.12 + +* Wed Jun 14 2023 Python Maint - 0.17.26-3 +- Bootstrap for Python 3.12 + +* Wed May 24 2023 Yaakov Selkowitz - 0.17.26-2 +- Avoid tox dependency + +* Tue May 09 2023 Fedora Release Monitoring - 0.17.26-1 +- Update to 0.17.26 (close RHBZ#2196655) + +* Sun May 07 2023 Benjamin A. Beasley - 0.17.24-1 +- Update to 0.17.24 (close RHBZ#2193478) + +* Thu May 04 2023 Benjamin A. Beasley - 0.17.22-2 +- Confirm License is SPDX MIT +- Reduce macro indirection and drop ancient constructs and conditionals +- Update description from upstream +- Make the package noarch (python-ruamel-yaml-clib contains the compiled code) +- Fix upper-bounded Python interpreter version for ruamel.yaml.clib dependency +- Drop unused manual runtime dependency on setuptools +- Port to pyproject-rpm-macros (“new Python guidelines”) +- Stop numbering the source archive +- Add a bootstrap conditional to break the circular dependency with + ruamel.yaml.clib +- Fix an obsolete comment referring to bitbucket + +* Wed May 03 2023 Maxwell G - 0.17.22-1 +- Update to 0.17.22. Fixes rhbz#2192464. + +* Fri Jan 20 2023 Fedora Release Engineering - 0.17.21-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 0.17.21-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 0.17.21-2 +- Rebuilt for Python 3.11 + +* Tue May 10 2022 Jakub Čajka - 0.17.21-1 +- Update to 0.17.21 +- Related: BZ#2042422 + +* Fri Jan 21 2022 Fedora Release Engineering - 0.16.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 0.16.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 0.16.6-7 +- Rebuilt for Python 3.10 + +* Mon Feb 22 2021 Joel Capitao - 0.16.6-6 +- Change upstream URL +- Remove obsolete patch + +* Wed Jan 27 2021 Fedora Release Engineering - 0.16.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.16.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 0.16.6-3 +- Rebuilt for Python 3.9 + +* Thu Jan 30 2020 Fedora Release Engineering - 0.16.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Jan 20 2020 Jason Montleon - 0.16.6-1 +- Update to 0.16.6 + +* Thu Oct 03 2019 Miro Hrončok - 0.16.5-3 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Fri Aug 30 2019 Chandan Kumar - 0.16.5-2 +- Added ruamel-yaml-clib as Requires + +* Tue Aug 27 2019 Chedi Toueiti - 0.16.5-1 +- Update to 0.16.5 + +* Mon Aug 19 2019 Miro Hrončok - 0.15.41-6 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 0.15.41-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 0.15.41-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Jan 14 2019 Miro Hrončok - 0.15.41-3 +- Subpackage python2-ruamel-yaml has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + +* Sat Jul 14 2018 Fedora Release Engineering - 0.15.41-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Jun 29 2018 Miro Hrončok - 0.15.41-1 +- Update to 0.15.41 +- Add patch not to require ruamel.std.pathlib + +* Tue Jun 19 2018 Miro Hrončok - 0.13.14-4 +- Rebuilt for Python 3.7 + +* Fri Feb 09 2018 Iryna Shcherbina - 0.13.14-3 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Fri Feb 09 2018 Fedora Release Engineering - 0.13.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Aug 9 2017 Orion Poplawski - 0.13.14-1 +- Update to 0.13.14 + +* Thu Aug 03 2017 Fedora Release Engineering - 0.13.13-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.13.13-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon Feb 13 2017 Jan Chaloupka - 0.13.13-3 +- The ruamel.yaml needs at least typing >= 3.5.2.2 + related: #1386563 + +* Sat Feb 11 2017 Fedora Release Engineering - 0.13.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jan 31 2017 Orion Poplawski - 0.13.13-1 +- Update to 0.13.13 + +* Tue Jan 31 2017 Orion Poplawski - 0.12.14-7 +- Add patch to support pytest 2.7 in EPEL7 + +* Mon Dec 19 2016 Miro Hrončok - 0.12.14-6 +- Rebuild for Python 3.6 + +* Wed Oct 26 2016 Orion Poplawski - 0.12.14-5 +- Require python34-typing on EPEL +- Ignore python2 test failure due to old pytest on EPEL7 + +* Wed Oct 26 2016 Orion Poplawski - 0.12.14-4 +- Build python3 package +- Run tests + +* Tue Oct 25 2016 Chandan Kumar - 0.12.14-3 +- Disabling python3 as python3-ruamel-ordereddict not available + +* Mon Oct 24 2016 Chandan Kumar - 0.12.14-2 +- Fixed python2-typing runtime dependency issue + +* Fri Oct 14 2016 Chandan Kumar - 0.12.14-1 +- Initial package. diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index c175bcd..5bd59a5 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -5,7 +5,7 @@ Name: python-ruamel-yaml Version: 0.18.5 -Release: 6%{?dist} +Release: %autorelease Summary: YAML 1.2 loader/dumper package for Python # SPDX @@ -67,188 +67,4 @@ k="${k-}${k+ and }not test_dump_cyaml_1_2" %doc README.md %changelog -* Fri Jul 19 2024 Fedora Release Engineering - 0.18.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Jun 07 2024 Python Maint - 0.18.5-5 -- Rebuilt for Python 3.13 - -* Fri Jun 07 2024 Python Maint - 0.18.5-4 -- Bootstrap for Python 3.13 - -* Fri Jan 26 2024 Fedora Release Engineering - 0.18.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Jan 22 2024 Fedora Release Engineering - 0.18.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Nov 12 2023 Parag Nemade - 0.18.5-1 -- Update to 0.18.5 - -* Thu Oct 26 2023 Joel Capitao - 0.18.2-1 -- Update to 0.18.2 (close RHBZ#2245968) - -* Tue Oct 24 2023 Joel Capitao - 0.18.1-1 -- Update to 0.18.1 (close RHBZ#2241174) - -* Fri Jul 21 2023 Fedora Release Engineering - 0.17.32-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jun 22 2023 Python Maint - 0.17.32-2 -- Rebuilt for Python 3.12 - -* Mon Jun 19 2023 Joel Capitao - 0.17.32-1 -- Update to 0.17.32 (close RHBZ#2210057) - -* Wed Jun 14 2023 Python Maint - 0.17.26-4 -- Rebuilt for Python 3.12 - -* Wed Jun 14 2023 Python Maint - 0.17.26-3 -- Bootstrap for Python 3.12 - -* Wed May 24 2023 Yaakov Selkowitz - 0.17.26-2 -- Avoid tox dependency - -* Tue May 09 2023 Fedora Release Monitoring - 0.17.26-1 -- Update to 0.17.26 (close RHBZ#2196655) - -* Sun May 07 2023 Benjamin A. Beasley - 0.17.24-1 -- Update to 0.17.24 (close RHBZ#2193478) - -* Thu May 04 2023 Benjamin A. Beasley - 0.17.22-2 -- Confirm License is SPDX MIT -- Reduce macro indirection and drop ancient constructs and conditionals -- Update description from upstream -- Make the package noarch (python-ruamel-yaml-clib contains the compiled code) -- Fix upper-bounded Python interpreter version for ruamel.yaml.clib dependency -- Drop unused manual runtime dependency on setuptools -- Port to pyproject-rpm-macros (“new Python guidelines”) -- Stop numbering the source archive -- Add a bootstrap conditional to break the circular dependency with - ruamel.yaml.clib -- Fix an obsolete comment referring to bitbucket - -* Wed May 03 2023 Maxwell G - 0.17.22-1 -- Update to 0.17.22. Fixes rhbz#2192464. - -* Fri Jan 20 2023 Fedora Release Engineering - 0.17.21-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 0.17.21-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 13 2022 Python Maint - 0.17.21-2 -- Rebuilt for Python 3.11 - -* Tue May 10 2022 Jakub Čajka - 0.17.21-1 -- Update to 0.17.21 -- Related: BZ#2042422 - -* Fri Jan 21 2022 Fedora Release Engineering - 0.16.6-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 0.16.6-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 0.16.6-7 -- Rebuilt for Python 3.10 - -* Mon Feb 22 2021 Joel Capitao - 0.16.6-6 -- Change upstream URL -- Remove obsolete patch - -* Wed Jan 27 2021 Fedora Release Engineering - 0.16.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 0.16.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue May 26 2020 Miro Hrončok - 0.16.6-3 -- Rebuilt for Python 3.9 - -* Thu Jan 30 2020 Fedora Release Engineering - 0.16.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Jan 20 2020 Jason Montleon - 0.16.6-1 -- Update to 0.16.6 - -* Thu Oct 03 2019 Miro Hrončok - 0.16.5-3 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Fri Aug 30 2019 Chandan Kumar - 0.16.5-2 -- Added ruamel-yaml-clib as Requires - -* Tue Aug 27 2019 Chedi Toueiti - 0.16.5-1 -- Update to 0.16.5 - -* Mon Aug 19 2019 Miro Hrončok - 0.15.41-6 -- Rebuilt for Python 3.8 - -* Fri Jul 26 2019 Fedora Release Engineering - 0.15.41-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 0.15.41-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Jan 14 2019 Miro Hrončok - 0.15.41-3 -- Subpackage python2-ruamel-yaml has been removed - See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal - -* Sat Jul 14 2018 Fedora Release Engineering - 0.15.41-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Jun 29 2018 Miro Hrončok - 0.15.41-1 -- Update to 0.15.41 -- Add patch not to require ruamel.std.pathlib - -* Tue Jun 19 2018 Miro Hrončok - 0.13.14-4 -- Rebuilt for Python 3.7 - -* Fri Feb 09 2018 Iryna Shcherbina - 0.13.14-3 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Fri Feb 09 2018 Fedora Release Engineering - 0.13.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 9 2017 Orion Poplawski - 0.13.14-1 -- Update to 0.13.14 - -* Thu Aug 03 2017 Fedora Release Engineering - 0.13.13-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0.13.13-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon Feb 13 2017 Jan Chaloupka - 0.13.13-3 -- The ruamel.yaml needs at least typing >= 3.5.2.2 - related: #1386563 - -* Sat Feb 11 2017 Fedora Release Engineering - 0.13.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jan 31 2017 Orion Poplawski - 0.13.13-1 -- Update to 0.13.13 - -* Tue Jan 31 2017 Orion Poplawski - 0.12.14-7 -- Add patch to support pytest 2.7 in EPEL7 - -* Mon Dec 19 2016 Miro Hrončok - 0.12.14-6 -- Rebuild for Python 3.6 - -* Wed Oct 26 2016 Orion Poplawski - 0.12.14-5 -- Require python34-typing on EPEL -- Ignore python2 test failure due to old pytest on EPEL7 - -* Wed Oct 26 2016 Orion Poplawski - 0.12.14-4 -- Build python3 package -- Run tests - -* Tue Oct 25 2016 Chandan Kumar - 0.12.14-3 -- Disabling python3 as python3-ruamel-ordereddict not available - -* Mon Oct 24 2016 Chandan Kumar - 0.12.14-2 -- Fixed python2-typing runtime dependency issue - -* Fri Oct 14 2016 Chandan Kumar - 0.12.14-1 -- Initial package. +%autochangelog From 982e0edfa1a05f6d1d3f5a5e7f712189228590d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ondrej=20Mosn=C3=A1=C4=8Dek?= Date: Sun, 24 Nov 2024 18:02:50 +0100 Subject: [PATCH 12/27] Update to version 0.18.6 (fedora#2263147) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ondrej Mosnáček --- .gitignore | 17 ++--------------- python-ruamel-yaml.spec | 7 +++---- sources | 2 +- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index ee944e2..e3fb872 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,2 @@ -/ruamel.yaml-0.12.14.tar.gz -/ruamel-yaml-0.12.14.tar.gz -/ruamel-yaml-0.13.13.tar.gz -/ruamel-yaml-0.13.14.tar.gz -/ruamel-yaml-0.15.41.tar.gz -/ruamel-yaml-0.16.5.tar.gz -/ruamel-yaml-0.16.6.tar.gz -/ruamel-yaml-code-44504659794e463523ff8d0b40bac18dfe3b52f8.zip -/ruamel-yaml-code-c887dfe19e2f01b770a2b4b04163a01e00a33f85.zip -/ruamel-yaml-code-56b3e2666fb275deab3eec99193c103e4edf93bb.zip -/ruamel-yaml-code-4309006902d2453399588f4ddccfb3fc460e1eba.zip -/ruamel-yaml-code-829991d24309dd85ef9c066dbfed17eb4e4fd571.zip -/ruamel-yaml-code-c0da0ba934877fdfe63bee77ec12a7d2341f5398.zip -/ruamel-yaml-code-a35908655d678b8463ee6198869a0708b3446e06.zip -/ruamel-yaml-code-eb3ecf31085135283908fc8449befebbc1fff4b3.zip +/*.tar.gz +/*.zip diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 5bd59a5..4d24128 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -1,10 +1,10 @@ # Breaks the circular dependency with ruamel.yaml.clib. %bcond_with bootstrap -%global commit eb3ecf31085135283908fc8449befebbc1fff4b3 +%global commit 6f41eb6001661917fceb0e88ed0693ae1a7c50f4 Name: python-ruamel-yaml -Version: 0.18.5 +Version: 0.18.6 Release: %autorelease Summary: YAML 1.2 loader/dumper package for Python @@ -52,7 +52,7 @@ sed -r -i 's/^([[:blank:]]*)(.*ruamel\.yaml\.clib)/\1# \2/' __init__.py %pyproject_install # RFE: Add option for namespace packages to %%pyproject_save_files # https://bugzilla.redhat.com/show_bug.cgi?id=1935266 -%pyproject_save_files ruamel +%pyproject_save_files -l ruamel %check %if %{with bootstrap} @@ -63,7 +63,6 @@ k="${k-}${k+ and }not test_dump_cyaml_1_2" %pytest -k "${k-}" _test/test_*.py %files -n python3-ruamel-yaml -f %{pyproject_files} -# pyproject_files handles LICENSE; verify with “rpm -qL -p …” %doc README.md %changelog diff --git a/sources b/sources index 5412e42..f52e86d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruamel-yaml-code-eb3ecf31085135283908fc8449befebbc1fff4b3.zip) = 2319ecd339100ec51b060e1fb19d08c3f7603675ce3a17b59c05d11893ca7644d06ececf3950f02eda25cabede6037b5128184823f734f0e66473c5dfdef7cdc +SHA512 (ruamel-yaml-code-6f41eb6001661917fceb0e88ed0693ae1a7c50f4.zip) = 49fc9ef87e59b723803659300a8dc2c33d596bc2e1effa5235f26cf51fb08c0e6e0d2c386d54c290f97d63dc2a8956802a02c90e4a52881a2cd5d38daf1b0318 From b8c60a3bec7bf46239f5ca9ee8d111aba1756629 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 2 Dec 2024 15:04:04 +0100 Subject: [PATCH 13/27] Fix build with Python 3.14 - Fixes: rhzb#2323169 --- 9.patch | 63 +++++++++++++++++++++++++++++++++++++++++ python-ruamel-yaml.spec | 5 ++++ 2 files changed, 68 insertions(+) create mode 100644 9.patch diff --git a/9.patch b/9.patch new file mode 100644 index 0000000..34e5743 --- /dev/null +++ b/9.patch @@ -0,0 +1,63 @@ +# HG changeset patch +# User Miro Hrončok +# Date 1733146158 -3600 +# Mon Dec 02 14:29:18 2024 +0100 +# Branch python3.14 +# Node ID 677f1d63658f35e43446776e637248d0729405f3 +# Parent 0bef9fa8b3c43637cd90ce3f2e299e81c2122128 +Adjust setup.py for the removal of deprecated ast classes + +Those were deprecated since Python 3.8 and are removed in 3.14+. + +diff -r 0bef9fa8b3c4 -r 677f1d63658f setup.py +--- a/setup.py Thu Mar 14 10:13:16 2024 +0100 ++++ b/setup.py Mon Dec 02 14:29:18 2024 +0100 +@@ -76,7 +76,7 @@ + print(*args, **kw1) + + if sys.version_info >= (3, 8): +- from ast import Str, Num, Bytes, NameConstant # NOQA ++ from ast import Constant # NOQA + + + def literal_eval(node_or_string): +@@ -98,15 +98,21 @@ + raise TypeError('only string or AST nodes supported') + + def _convert(node): +- if isinstance(node, Str): +- if sys.version_info < (3,) and not isinstance(node.s, unicode): +- return node.s.decode('utf-8') +- return node.s +- elif isinstance(node, Bytes): +- return node.s +- elif isinstance(node, Num): +- return node.n +- elif isinstance(node, Tuple): ++ if sys.version_info >= (3, 8): ++ if isinstance(node, Constant): ++ return node.value ++ else: ++ if isinstance(node, Str): ++ if sys.version_info < (3,) and not isinstance(node.s, unicode): ++ return node.s.decode('utf-8') ++ return node.s ++ elif isinstance(node, Bytes): ++ return node.s ++ elif isinstance(node, Num): ++ return node.n ++ elif isinstance(node, NameConstant): ++ return node.value ++ if isinstance(node, Tuple): + return tuple(map(_convert, node.elts)) + elif isinstance(node, List): + return list(map(_convert, node.elts)) +@@ -114,8 +120,6 @@ + return set(map(_convert, node.elts)) + elif isinstance(node, Dict): + return {_convert(k): _convert(v) for k, v in zip(node.keys, node.values)} +- elif isinstance(node, NameConstant): +- return node.value + elif sys.version_info < (3, 4) and isinstance(node, Name): + if node.id in _safe_names: + return _safe_names[node.id] diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 4d24128..c17972b 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -14,6 +14,11 @@ URL: https://sourceforge.net/projects/ruamel-yaml # The PyPI sdist does not contain tests, so we use a snapshot from SourceForge Source: https://sourceforge.net/code-snapshots/hg/r/ru/ruamel-yaml/code/ruamel-yaml-code-%{commit}.zip +# Adjust setup.py for the removal of deprecated ast classes +# Fixes build with Python 3.14 +# https://sourceforge.net/p/ruamel-yaml/code/merge-requests/9/ +Patch: 9.patch + BuildArch: noarch %global _description %{expand: From 7ce90a363885435de491f1c8b7962dd14135394b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 2 Dec 2024 15:04:47 +0100 Subject: [PATCH 14/27] Fix the bootstrap build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Related: rhbz#2323169 The problem this fixes is a bit complex. It goes like this: 1. %pyproject_buildrequires runs for the first time. There is no pyproject.toml, only setup.py, so a dependency on setuptools is generated. A build dependency on wheel is not generated (as it is not needed on Fedora 42+). 2. %pyproject_buildrequires runs again. There is no pyproject.toml, only setup.py, so it is used. A build dependency on wheel is still not generated. A build dependency on ruamel-yaml-clib is generated when building without bootstrap, as it is a runtime dependency. Here it comes: setup.py code creates a pyproject.toml file (with a dependency on wheel) 😱 3a. Without bootstrap, dnf installs ruamel-yaml-clib and %%pyproject_buildrequires runs once more. It uses pyproject.toml (which now exists). A build dependency on wheel is now generated and %pyproject_buildrequires runs once more, dnf install wheel. 3b. With bootstrap, this step is skipped as there was no new dependency (on ruamel-yaml-clib) to trigger it. 4. The final (verification) %pyproject_buildrequires round uses pyproject.toml (which now exists). Without bootstrap, all is fine, no new dependency is generated. With bootstrap, the wheel dependency is generated for the first time, but at this point, it fails rpmbuild (because missing dependencies now fail the build). We see errors like this as a result: error: Failed build dependencies: python3dist(wheel) is needed by python-ruamel-yaml-0.18.6-2.fc42~bootstrap.noarch Considering the wheel dependency is entirely unneeded I proposed removal for upstream. An alternative solution is to rm -f pyproject.toml before calling %pyproject_buildrequires in %generate_buildrequires. But if upstream switches to a proper pyproject.toml, we might not notice that. --- 10.patch | 28 ++++++++++++++++++++++++++++ python-ruamel-yaml.spec | 5 +++++ 2 files changed, 33 insertions(+) create mode 100644 10.patch diff --git a/10.patch b/10.patch new file mode 100644 index 0000000..35a36fd --- /dev/null +++ b/10.patch @@ -0,0 +1,28 @@ +# HG changeset patch +# User Miro Hrončok +# Date 1733147018 -3600 +# Mon Dec 02 14:43:38 2024 +0100 +# Node ID 0c7d924a643f990dd365db57ac3d52baf7db34fb +# Parent 0bef9fa8b3c43637cd90ce3f2e299e81c2122128 +Do not specificity build-system.requires on wheel + +When building from pyproject.toml, setuptools only needed wheel for building wheels. +It was never needed needed to build sdists. +Setuptools knww this and properly generated the dependency on wheel only when needed. + +With the current setuptools version, wheel is not needed at all. + +See also https://github.com/pypa/pip/pull/12728 + +diff -r 0bef9fa8b3c4 -r 0c7d924a643f setup.py +--- a/setup.py Thu Mar 14 10:13:16 2024 +0100 ++++ b/setup.py Mon Dec 02 14:43:38 2024 +0100 +@@ -830,7 +830,7 @@ + with open(file_name, 'w') as fp: + fp.write(dedent("""\ + [build-system] +- requires = ["setuptools", "wheel"] ++ requires = ["setuptools"] + # test + build-backend = "setuptools.build_meta" + """)) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index c17972b..d9f7066 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -19,6 +19,11 @@ Source: https://sourceforge.net/code-snapshots/hg/r/ru/ruamel-yaml/code/ # https://sourceforge.net/p/ruamel-yaml/code/merge-requests/9/ Patch: 9.patch +# Do not specificity build-system.requires on wheel +# Fixes the bootstrap build (see commit message for details) +# https://sourceforge.net/p/ruamel-yaml/code/merge-requests/10/ +Patch: 10.patch + BuildArch: noarch %global _description %{expand: From 6399b356b80955ef8a2ada310eb58bdc43b5497b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ondrej=20Mosn=C3=A1=C4=8Dek?= Date: Sun, 5 Jan 2025 18:36:55 +0100 Subject: [PATCH 15/27] Add TMT test for upstream ticket 534 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ondrej Mosnáček --- .fmf/version | 1 + plans/ci.fmf | 6 ++++++ tests/main.fmf | 1 + tests/sf534/main.fmf | 5 +++++ tests/sf534/test.py | 32 ++++++++++++++++++++++++++++++++ 5 files changed, 45 insertions(+) create mode 100644 .fmf/version create mode 100644 plans/ci.fmf create mode 100644 tests/main.fmf create mode 100644 tests/sf534/main.fmf create mode 100644 tests/sf534/test.py diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/ci.fmf b/plans/ci.fmf new file mode 100644 index 0000000..d890aec --- /dev/null +++ b/plans/ci.fmf @@ -0,0 +1,6 @@ +summary: Run CI tests +discover: + how: fmf +execute: + how: tmt + diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..1cfafe2 --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1 @@ +component: python-ruamel-yaml diff --git a/tests/sf534/main.fmf b/tests/sf534/main.fmf new file mode 100644 index 0000000..5480ac5 --- /dev/null +++ b/tests/sf534/main.fmf @@ -0,0 +1,5 @@ +summary: Regression test for upstream ticket 534 +require: python3-ruamel-yaml +link: + - verifies: https://sourceforge.net/p/ruamel-yaml/tickets/534/ +test: python3 test.py diff --git a/tests/sf534/test.py b/tests/sf534/test.py new file mode 100644 index 0000000..8302605 --- /dev/null +++ b/tests/sf534/test.py @@ -0,0 +1,32 @@ +# Taken from https://sourceforge.net/p/ruamel-yaml/tickets/534/ + +from io import StringIO +from ruamel.yaml import YAML + +original = '0: foo\n' +py_original = {0: 'foo'} +prefix = '%YAML 1.1\n---\n' + +yaml = YAML() +yaml.version = (1, 1) + +loaded = yaml.load(original) +assert loaded == py_original + +print('Fresh') +stream = StringIO() +yaml.dump(py_original, stream) +fresh = stream.getvalue() +print(fresh) +assert fresh.startswith(prefix) +trimmed = fresh[len(prefix):] +assert trimmed == original, f"{trimmed!r} != {original!r}" + +print('Round trip') +stream = StringIO() +yaml.dump(loaded, stream) +round_tripped = stream.getvalue() +print(round_tripped) +assert round_tripped.startswith(prefix) +trimmed = round_tripped[len(prefix):] +assert trimmed == original, f"{trimmed!r} != {original!r}" From f4ffb1b349ecbbd7a05fdb88a6c66c81f14193e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ondrej=20Mosn=C3=A1=C4=8Dek?= Date: Sun, 5 Jan 2025 19:02:06 +0100 Subject: [PATCH 16/27] Update to version 0.18.10 (fedora#2334967) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ondrej Mosnáček --- 10.patch | 28 ------------------ 9.patch | 63 ----------------------------------------- python-ruamel-yaml.spec | 14 ++------- sources | 2 +- 4 files changed, 3 insertions(+), 104 deletions(-) delete mode 100644 10.patch delete mode 100644 9.patch diff --git a/10.patch b/10.patch deleted file mode 100644 index 35a36fd..0000000 --- a/10.patch +++ /dev/null @@ -1,28 +0,0 @@ -# HG changeset patch -# User Miro Hrončok -# Date 1733147018 -3600 -# Mon Dec 02 14:43:38 2024 +0100 -# Node ID 0c7d924a643f990dd365db57ac3d52baf7db34fb -# Parent 0bef9fa8b3c43637cd90ce3f2e299e81c2122128 -Do not specificity build-system.requires on wheel - -When building from pyproject.toml, setuptools only needed wheel for building wheels. -It was never needed needed to build sdists. -Setuptools knww this and properly generated the dependency on wheel only when needed. - -With the current setuptools version, wheel is not needed at all. - -See also https://github.com/pypa/pip/pull/12728 - -diff -r 0bef9fa8b3c4 -r 0c7d924a643f setup.py ---- a/setup.py Thu Mar 14 10:13:16 2024 +0100 -+++ b/setup.py Mon Dec 02 14:43:38 2024 +0100 -@@ -830,7 +830,7 @@ - with open(file_name, 'w') as fp: - fp.write(dedent("""\ - [build-system] -- requires = ["setuptools", "wheel"] -+ requires = ["setuptools"] - # test - build-backend = "setuptools.build_meta" - """)) diff --git a/9.patch b/9.patch deleted file mode 100644 index 34e5743..0000000 --- a/9.patch +++ /dev/null @@ -1,63 +0,0 @@ -# HG changeset patch -# User Miro Hrončok -# Date 1733146158 -3600 -# Mon Dec 02 14:29:18 2024 +0100 -# Branch python3.14 -# Node ID 677f1d63658f35e43446776e637248d0729405f3 -# Parent 0bef9fa8b3c43637cd90ce3f2e299e81c2122128 -Adjust setup.py for the removal of deprecated ast classes - -Those were deprecated since Python 3.8 and are removed in 3.14+. - -diff -r 0bef9fa8b3c4 -r 677f1d63658f setup.py ---- a/setup.py Thu Mar 14 10:13:16 2024 +0100 -+++ b/setup.py Mon Dec 02 14:29:18 2024 +0100 -@@ -76,7 +76,7 @@ - print(*args, **kw1) - - if sys.version_info >= (3, 8): -- from ast import Str, Num, Bytes, NameConstant # NOQA -+ from ast import Constant # NOQA - - - def literal_eval(node_or_string): -@@ -98,15 +98,21 @@ - raise TypeError('only string or AST nodes supported') - - def _convert(node): -- if isinstance(node, Str): -- if sys.version_info < (3,) and not isinstance(node.s, unicode): -- return node.s.decode('utf-8') -- return node.s -- elif isinstance(node, Bytes): -- return node.s -- elif isinstance(node, Num): -- return node.n -- elif isinstance(node, Tuple): -+ if sys.version_info >= (3, 8): -+ if isinstance(node, Constant): -+ return node.value -+ else: -+ if isinstance(node, Str): -+ if sys.version_info < (3,) and not isinstance(node.s, unicode): -+ return node.s.decode('utf-8') -+ return node.s -+ elif isinstance(node, Bytes): -+ return node.s -+ elif isinstance(node, Num): -+ return node.n -+ elif isinstance(node, NameConstant): -+ return node.value -+ if isinstance(node, Tuple): - return tuple(map(_convert, node.elts)) - elif isinstance(node, List): - return list(map(_convert, node.elts)) -@@ -114,8 +120,6 @@ - return set(map(_convert, node.elts)) - elif isinstance(node, Dict): - return {_convert(k): _convert(v) for k, v in zip(node.keys, node.values)} -- elif isinstance(node, NameConstant): -- return node.value - elif sys.version_info < (3, 4) and isinstance(node, Name): - if node.id in _safe_names: - return _safe_names[node.id] diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index d9f7066..9b8de79 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -1,10 +1,10 @@ # Breaks the circular dependency with ruamel.yaml.clib. %bcond_with bootstrap -%global commit 6f41eb6001661917fceb0e88ed0693ae1a7c50f4 +%global commit 04ba5ead9be050430fac2ca1d4e88b8e91f7be02 Name: python-ruamel-yaml -Version: 0.18.6 +Version: 0.18.10 Release: %autorelease Summary: YAML 1.2 loader/dumper package for Python @@ -14,16 +14,6 @@ URL: https://sourceforge.net/projects/ruamel-yaml # The PyPI sdist does not contain tests, so we use a snapshot from SourceForge Source: https://sourceforge.net/code-snapshots/hg/r/ru/ruamel-yaml/code/ruamel-yaml-code-%{commit}.zip -# Adjust setup.py for the removal of deprecated ast classes -# Fixes build with Python 3.14 -# https://sourceforge.net/p/ruamel-yaml/code/merge-requests/9/ -Patch: 9.patch - -# Do not specificity build-system.requires on wheel -# Fixes the bootstrap build (see commit message for details) -# https://sourceforge.net/p/ruamel-yaml/code/merge-requests/10/ -Patch: 10.patch - BuildArch: noarch %global _description %{expand: diff --git a/sources b/sources index f52e86d..898c9bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruamel-yaml-code-6f41eb6001661917fceb0e88ed0693ae1a7c50f4.zip) = 49fc9ef87e59b723803659300a8dc2c33d596bc2e1effa5235f26cf51fb08c0e6e0d2c386d54c290f97d63dc2a8956802a02c90e4a52881a2cd5d38daf1b0318 +SHA512 (ruamel-yaml-code-04ba5ead9be050430fac2ca1d4e88b8e91f7be02.zip) = 2e94f334d5750df28922c2efc58527fca696d6b41be91e70d2897647ac93e946d34bc7c2cce3185c7117b7444552feb19f6b952ba5ca598663549f3048486a80 From 829e0922a366bcb42147237db3bd23f187ce2507 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 19:03:17 +0000 Subject: [PATCH 17/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From c7cb48c9c1bdbaf3a53351505f5d548a2a01ca4d Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 22:53:51 +0200 Subject: [PATCH 18/27] Bootstrap for Python 3.14 --- python-ruamel-yaml.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 9b8de79..951097a 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -1,3 +1,4 @@ +%global _with_bootstrap 1 # Breaks the circular dependency with ruamel.yaml.clib. %bcond_with bootstrap From 4236d32316fc6558bd73a8047f08db9e228857ff Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 23:35:06 +0200 Subject: [PATCH 19/27] Rebuilt for Python 3.14 --- python-ruamel-yaml.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 951097a..9b8de79 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -1,4 +1,3 @@ -%global _with_bootstrap 1 # Breaks the circular dependency with ruamel.yaml.clib. %bcond_with bootstrap From 209e8e8f4ad830260f5ad13eeda11277cc266b96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ondrej=20Mosn=C3=A1=C4=8Dek?= Date: Thu, 5 Jun 2025 09:25:18 +0200 Subject: [PATCH 20/27] Update to version 0.18.14 (fedora#2368448) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also pull tarballs from https://yaml.dev/, which is referenced in CHANGES as an additional official source. Signed-off-by: Ondrej Mosnáček --- .gitignore | 2 +- python-ruamel-yaml.spec | 8 +++----- sources | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index e3fb872..e28cffa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/*.tar.gz +/*.tar.xz /*.zip diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 9b8de79..6394ac8 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -1,10 +1,8 @@ # Breaks the circular dependency with ruamel.yaml.clib. %bcond_with bootstrap -%global commit 04ba5ead9be050430fac2ca1d4e88b8e91f7be02 - Name: python-ruamel-yaml -Version: 0.18.10 +Version: 0.18.14 Release: %autorelease Summary: YAML 1.2 loader/dumper package for Python @@ -12,7 +10,7 @@ Summary: YAML 1.2 loader/dumper package for Python License: MIT URL: https://sourceforge.net/projects/ruamel-yaml # The PyPI sdist does not contain tests, so we use a snapshot from SourceForge -Source: https://sourceforge.net/code-snapshots/hg/r/ru/ruamel-yaml/code/ruamel-yaml-code-%{commit}.zip +Source: https://yaml.dev/ruamel-dl-tagged-releases/ruamel.yaml-%{version}.tar.xz BuildArch: noarch @@ -33,7 +31,7 @@ BuildRequires: python3-pytest %description -n python3-ruamel-yaml %{_description} %prep -%autosetup -n ruamel-yaml-code-%{commit} +%autosetup -n ruamel.yaml-%{version} # Upstream upper-bounds the Python interpeter versions with which the C # implementation (ruamel.yaml.clib dependency) may be used. Patch this out. sed -r -i 's/( and python_version<"[^"]+")(.*ruamel\.yaml\.clib)/\2/' \ diff --git a/sources b/sources index 898c9bb..343d4ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruamel-yaml-code-04ba5ead9be050430fac2ca1d4e88b8e91f7be02.zip) = 2e94f334d5750df28922c2efc58527fca696d6b41be91e70d2897647ac93e946d34bc7c2cce3185c7117b7444552feb19f6b952ba5ca598663549f3048486a80 +SHA512 (ruamel.yaml-0.18.14.tar.xz) = 1245dbaf184cf98257df5d78c32f3775acf4873cb0696b852cf145cdcb7bd0c24c3c4bac5470f18341537a04fa56df4629b554d742341de3774cc78cdd0d1f8a From b9a3871a83e3c6096ad3de727d305f41bcd6bd3f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 10:16:32 +0000 Subject: [PATCH 21/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a45b1d803f99e6ea86cd6936db86ce4998b1f578 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 14:47:54 +0200 Subject: [PATCH 22/27] Rebuilt for Python 3.14.0rc2 bytecode From 7e8dc99058282dcad0e3f6e7804a0084f67162ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ondrej=20Mosn=C3=A1=C4=8Dek?= Date: Tue, 19 Aug 2025 14:55:53 +0200 Subject: [PATCH 23/27] Update to version 0.18.15 (fedora#2389387) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ondrej Mosnáček --- python-ruamel-yaml.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 6394ac8..5b54205 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -2,7 +2,7 @@ %bcond_with bootstrap Name: python-ruamel-yaml -Version: 0.18.14 +Version: 0.18.15 Release: %autorelease Summary: YAML 1.2 loader/dumper package for Python diff --git a/sources b/sources index 343d4ad..33fd911 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruamel.yaml-0.18.14.tar.xz) = 1245dbaf184cf98257df5d78c32f3775acf4873cb0696b852cf145cdcb7bd0c24c3c4bac5470f18341537a04fa56df4629b554d742341de3774cc78cdd0d1f8a +SHA512 (ruamel.yaml-0.18.15.tar.xz) = 1802ae9428078aa580ed7fb0d787e021db142c49d26e89745bf2130af4738c850d0aafb5ae9e091f934b6d20ec7275c3fcd4506591617dbdc396bac377bdf243 From dbfc5f06666a320d0c000df55130fc62be1aafeb Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 14:22:49 +0200 Subject: [PATCH 24/27] Rebuilt for Python 3.14.0rc3 bytecode From b7baece53fa912a88c8dbd9340b9fffdc5a11c35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ondrej=20Mosn=C3=A1=C4=8Dek?= Date: Thu, 23 Oct 2025 08:50:25 +0200 Subject: [PATCH 25/27] Update to version 0.18.16 (fedora#2405874) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ondrej Mosnáček --- python-ruamel-yaml.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 5b54205..10cd123 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -2,7 +2,7 @@ %bcond_with bootstrap Name: python-ruamel-yaml -Version: 0.18.15 +Version: 0.18.16 Release: %autorelease Summary: YAML 1.2 loader/dumper package for Python diff --git a/sources b/sources index 33fd911..b90ca66 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruamel.yaml-0.18.15.tar.xz) = 1802ae9428078aa580ed7fb0d787e021db142c49d26e89745bf2130af4738c850d0aafb5ae9e091f934b6d20ec7275c3fcd4506591617dbdc396bac377bdf243 +SHA512 (ruamel.yaml-0.18.16.tar.xz) = 1d4c28c6769167d044cfc506035a0d7e13b533ecbfa2287b00035e9036c400c9cbd86fa96921a7e6a9c9b286f9bf4970637a09d4747c5bf7315b37db353720f6 From d39270652a7d9778d1c89bc23fbbdd17600c5f12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ondrej=20Mosn=C3=A1=C4=8Dek?= Date: Thu, 18 Dec 2025 08:58:54 +0100 Subject: [PATCH 26/27] Update to version 0.18.17 (fedora#2423406) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ondrej Mosnáček --- python-ruamel-yaml.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 10cd123..f183a59 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -2,7 +2,7 @@ %bcond_with bootstrap Name: python-ruamel-yaml -Version: 0.18.16 +Version: 0.18.17 Release: %autorelease Summary: YAML 1.2 loader/dumper package for Python diff --git a/sources b/sources index b90ca66..8a3b9d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruamel.yaml-0.18.16.tar.xz) = 1d4c28c6769167d044cfc506035a0d7e13b533ecbfa2287b00035e9036c400c9cbd86fa96921a7e6a9c9b286f9bf4970637a09d4747c5bf7315b37db353720f6 +SHA512 (ruamel.yaml-0.18.17.tar.xz) = f39585da4463bb28957549b08debb2cb01ee15f926b20412b50e3dce24643a7de9790f7bd0aeb4191ade449738ff5642e1b1f71dbb199ad70c35c6392279c22c From cdec57db9dad4ca3f472574438de11a509cc2749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ondrej=20Mosn=C3=A1=C4=8Dek?= Date: Mon, 5 Jan 2026 16:47:10 +0100 Subject: [PATCH 27/27] Update to version 0.19.1 (fedora#2426465) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ondrej Mosnáček --- python-ruamel-yaml.spec | 19 ++++++++++--------- sources | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index f183a59..93c571e 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -2,7 +2,7 @@ %bcond_with bootstrap Name: python-ruamel-yaml -Version: 0.18.17 +Version: 0.19.1 Release: %autorelease Summary: YAML 1.2 loader/dumper package for Python @@ -28,20 +28,19 @@ BuildRequires: python3-pytest %py_provides python3-ruamel.yaml +%if !%{with bootstrap} +# ruamel.yaml.clibz is not available in Fedora (and probably never will +# be), so require the old clib backend +Requires: python3-ruamel-yaml+oldlibyaml = %{version}-%{release} +%endif + %description -n python3-ruamel-yaml %{_description} %prep %autosetup -n ruamel.yaml-%{version} -# Upstream upper-bounds the Python interpeter versions with which the C -# implementation (ruamel.yaml.clib dependency) may be used. Patch this out. -sed -r -i 's/( and python_version<"[^"]+")(.*ruamel\.yaml\.clib)/\2/' \ - __init__.py -%if %{with bootstrap} -sed -r -i 's/^([[:blank:]]*)(.*ruamel\.yaml\.clib)/\1# \2/' __init__.py -%endif %generate_buildrequires -%pyproject_buildrequires +%pyproject_buildrequires %{!?with_bootstrap:-x oldlibyaml} %build %pyproject_wheel @@ -63,5 +62,7 @@ k="${k-}${k+ and }not test_dump_cyaml_1_2" %files -n python3-ruamel-yaml -f %{pyproject_files} %doc README.md +%pyproject_extras_subpkg -n python3-ruamel-yaml oldlibyaml + %changelog %autochangelog diff --git a/sources b/sources index 8a3b9d4..f0e723c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruamel.yaml-0.18.17.tar.xz) = f39585da4463bb28957549b08debb2cb01ee15f926b20412b50e3dce24643a7de9790f7bd0aeb4191ade449738ff5642e1b1f71dbb199ad70c35c6392279c22c +SHA512 (ruamel.yaml-0.19.1.tar.xz) = bf9eb8e40f506d6f3f34aee5f5ec74eb93bfda2b27022f6ad62dfac724b9e0847d61e3159d284bada7dec147992aaf509804f7139818de5bc85aa328bc32601f