From c9bcacddcce627e56bde2bcd8ab491cb5c8e5837 Mon Sep 17 00:00:00 2001 From: Chandan Kumar Date: Thu, 20 Oct 2016 18:38:55 +0530 Subject: [PATCH 01/89] Initial import of rhbz#1386563 --- .gitignore | 1 + python-ruamel-yaml.spec | 92 +++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 94 insertions(+) create mode 100644 python-ruamel-yaml.spec diff --git a/.gitignore b/.gitignore index e69de29..896d3bc 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/ruamel.yaml-0.12.14.tar.gz diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec new file mode 100644 index 0000000..50c0f63 --- /dev/null +++ b/python-ruamel-yaml.spec @@ -0,0 +1,92 @@ +%global pypi_name ruamel.yaml +%global pname ruamel-yaml + +%if 0%{?fedora} +%global with_python3 1 +%endif + +Name: python-%{pname} +Version: 0.12.14 +Release: 1%{?dist} +Summary: YAML 1.2 loader/dumper package for Python + +License: MIT +URL: https://bitbucket.org/ruamel/yaml +Source0: https://files.pythonhosted.org/packages/source/r/%{pypi_name}/%{pypi_name}-%{version}.tar.gz + +BuildRequires: python2-devel +BuildRequires: python-setuptools + +BuildRequires: libyaml-devel + +BuildRequires: python3-devel +BuildRequires: python3-setuptools + +%description +ruamel.yaml is a YAML 1.2 loader/dumper package for Python. +It is a derivative of Kirill Simonov’s PyYAML 3.11 + +%package -n python2-%{pname} +Summary: YAML 1.2 loader/dumper package for Python +%{?python_provide:%python_provide python2-%{pypi_name}} + +Requires: python-ruamel-ordereddict +Requires: python-typing +Requires: python-setuptools + +%description -n python2-%{pname} +ruamel.yaml is a YAML 1.2 loader/dumper package for Python. +It is a derivative of Kirill Simonov’s PyYAML 3.11 + +%if 0%{?with_python3} +%package -n python3-%{pname} +Summary: YAML 1.2 loader/dumper package for Python +%{?python_provide:%python_provide python3-%{pypi_name}} + +Requires: python3-ruamel-ordereddict +Requires: python3-typing +Requires: python3-setuptools + +%description -n python3-%{pname} +ruamel.yaml is a YAML 1.2 loader/dumper package for Python. +It is a derivative of Kirill Simonov’s PyYAML 3.11 +%endif + +%prep +%autosetup -n %{pypi_name}-%{version} +rm -rf %{pypi_name}.egg-info + +%build +%py2_build +%if 0%{?with_python3} +%py3_build +%endif + +%install +%if 0%{?with_python3} +%{__python3} setup.py install --single-version-externally-managed --skip-build --root $RPM_BUILD_ROOT +%endif + +%{__python2} setup.py install --single-version-externally-managed --skip-build --root $RPM_BUILD_ROOT + +%files -n python2-%{pname} +%license LICENSE +%doc README.rst +%{python2_sitearch}/ruamel +%{python2_sitearch}/_ruamel_yaml.so +%{python2_sitearch}/%{pypi_name}-%{version}-py?.?-*.pth +%{python2_sitearch}/%{pypi_name}-%{version}-py?.?.egg-info + +%if 0%{?with_python3} +%files -n python3-%{pname} +%license LICENSE +%doc README.rst +%{python3_sitearch}/ruamel +%{python3_sitearch}/_ruamel_yaml.cpython-35m-* +%{python3_sitearch}/%{pypi_name}-%{version}-py?.?-*.pth +%{python3_sitearch}/%{pypi_name}-%{version}-py?.?.egg-info +%endif + +%changelog +* Fri Oct 14 2016 Chandan Kumar - 0.12.14-1 +- Initial package. diff --git a/sources b/sources index e69de29..a43451d 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +483e43d69178eef857aacaa06333aaa5 ruamel.yaml-0.12.14.tar.gz From d5b9029e3cc59b0dfadb14e9431b4589ac618457 Mon Sep 17 00:00:00 2001 From: Chandan Kumar Date: Mon, 24 Oct 2016 11:26:21 +0530 Subject: [PATCH 02/89] Fixed python2-typing dependency issue --- 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 50c0f63..04a7fe4 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -31,7 +31,7 @@ Summary: YAML 1.2 loader/dumper package for Python %{?python_provide:%python_provide python2-%{pypi_name}} Requires: python-ruamel-ordereddict -Requires: python-typing +Requires: python2-typing Requires: python-setuptools %description -n python2-%{pname} @@ -44,7 +44,6 @@ Summary: YAML 1.2 loader/dumper package for Python %{?python_provide:%python_provide python3-%{pypi_name}} Requires: python3-ruamel-ordereddict -Requires: python3-typing Requires: python3-setuptools %description -n python3-%{pname} From fed69efde92d3441e5e008a5eb1ecf3267eedcaa Mon Sep 17 00:00:00 2001 From: Chandan Kumar Date: Mon, 24 Oct 2016 11:28:40 +0530 Subject: [PATCH 03/89] Fixed python2-typing runtime dependency issue --- 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 04a7fe4..d340214 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -7,7 +7,7 @@ Name: python-%{pname} Version: 0.12.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -87,5 +87,8 @@ rm -rf %{pypi_name}.egg-info %endif %changelog +* 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. From 3945452d251d6b750034f330bcc49dc8f429434c Mon Sep 17 00:00:00 2001 From: Chandan Kumar Date: Tue, 25 Oct 2016 17:32:27 +0530 Subject: [PATCH 04/89] Disable python3 as python3-ruamel-ordereddict is not available --- python-ruamel-yaml.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index d340214..ba8a0ae 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -2,12 +2,13 @@ %global pname ruamel-yaml %if 0%{?fedora} -%global with_python3 1 +# Disabling python3 as python3-ruamel-ordereddict is not available +%global with_python3 0 %endif Name: python-%{pname} Version: 0.12.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -87,6 +88,9 @@ rm -rf %{pypi_name}.egg-info %endif %changelog +* 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 From 4fc915bbfa371d96d3430e132c3e21cc4813a654 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 26 Oct 2016 14:49:09 -0600 Subject: [PATCH 05/89] Build python3 package - Run tests --- python-ruamel-yaml.spec | 53 +++++++++++++++++++++++++---------------- sources | 2 +- 2 files changed, 34 insertions(+), 21 deletions(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index ba8a0ae..5ed5586 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -1,37 +1,37 @@ %global pypi_name ruamel.yaml %global pname ruamel-yaml +%global commit 171c3653fc01 -%if 0%{?fedora} -# Disabling python3 as python3-ruamel-ordereddict is not available -%global with_python3 0 -%endif +%global with_python3 1 Name: python-%{pname} Version: 0.12.14 -Release: 3%{?dist} +Release: 4%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT URL: https://bitbucket.org/ruamel/yaml -Source0: https://files.pythonhosted.org/packages/source/r/%{pypi_name}/%{pypi_name}-%{version}.tar.gz +#Source0: https://files.pythonhosted.org/packages/source/r/%{pypi_name}/%{pypi_name}-%{version}.tar.gz +# Use bitbucket sources so we can run the tests +Source0: https://bitbucket.org/ruamel/yaml/get/%{version}.tar.gz#/%{pname}-%{version}.tar.gz -BuildRequires: python2-devel -BuildRequires: python-setuptools - BuildRequires: libyaml-devel -BuildRequires: python3-devel -BuildRequires: python3-setuptools - %description ruamel.yaml is a YAML 1.2 loader/dumper package for Python. It is a derivative of Kirill Simonov’s PyYAML 3.11 %package -n python2-%{pname} Summary: YAML 1.2 loader/dumper package for Python +BuildRequires: python2-devel +BuildRequires: python-setuptools +# For tests +BuildRequires: pytest +BuildRequires: python2-ruamel-ordereddict +BuildRequires: python2-typing %{?python_provide:%python_provide python2-%{pypi_name}} -Requires: python-ruamel-ordereddict +Requires: python2-ruamel-ordereddict Requires: python2-typing Requires: python-setuptools @@ -40,20 +40,23 @@ ruamel.yaml is a YAML 1.2 loader/dumper package for Python. It is a derivative of Kirill Simonov’s PyYAML 3.11 %if 0%{?with_python3} -%package -n python3-%{pname} +%package -n python%{python3_pkgversion}-%{pname} Summary: YAML 1.2 loader/dumper package for Python -%{?python_provide:%python_provide python3-%{pypi_name}} +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-setuptools +# For tests +BuildRequires: python%{python3_pkgversion}-pytest +%{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}} -Requires: python3-ruamel-ordereddict -Requires: python3-setuptools +Requires: python%{python3_pkgversion}-setuptools -%description -n python3-%{pname} +%description -n python%{python3_pkgversion}-%{pname} ruamel.yaml is a YAML 1.2 loader/dumper package for Python. It is a derivative of Kirill Simonov’s PyYAML 3.11 %endif %prep -%autosetup -n %{pypi_name}-%{version} +%autosetup -n %{pname}-%{commit} rm -rf %{pypi_name}.egg-info %build @@ -69,6 +72,12 @@ rm -rf %{pypi_name}.egg-info %{__python2} setup.py install --single-version-externally-managed --skip-build --root $RPM_BUILD_ROOT +%check +PYTHONPATH=$(echo build/lib.*%{python2_version}) py.test-%{python2_version} _test/test_*.py +%if 0%{?with_python3} +PYTHONPATH=$(echo build/lib.*%{python3_version}) py.test-%{python3_version} _test/test_*.py +%endif + %files -n python2-%{pname} %license LICENSE %doc README.rst @@ -78,7 +87,7 @@ rm -rf %{pypi_name}.egg-info %{python2_sitearch}/%{pypi_name}-%{version}-py?.?.egg-info %if 0%{?with_python3} -%files -n python3-%{pname} +%files -n python%{python3_pkgversion}-%{pname} %license LICENSE %doc README.rst %{python3_sitearch}/ruamel @@ -88,6 +97,10 @@ rm -rf %{pypi_name}.egg-info %endif %changelog +* 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 diff --git a/sources b/sources index a43451d..786ea9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -483e43d69178eef857aacaa06333aaa5 ruamel.yaml-0.12.14.tar.gz +2b5223a399e654237c0fd0aa8f275535 ruamel-yaml-0.12.14.tar.gz From 013a0b21388461934fde10578605a5f07aa8eaf5 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 26 Oct 2016 14:54:49 -0600 Subject: [PATCH 06/89] Upload ruamel-yaml-0.12.14.tar.gz --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 896d3bc..c06d176 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /ruamel.yaml-0.12.14.tar.gz +/ruamel-yaml-0.12.14.tar.gz From e6099fefd5c4b3dfd14f1dc544564ef299a4eabb Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 26 Oct 2016 16:22:51 -0600 Subject: [PATCH 07/89] Require python34-typing on EPEL - Ignore python2 test failure due to old pytest on EPEL7 --- python-ruamel-yaml.spec | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 5ed5586..e146af6 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -6,7 +6,7 @@ Name: python-%{pname} Version: 0.12.14 -Release: 4%{?dist} +Release: 5%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -46,9 +46,16 @@ BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools # For tests BuildRequires: python%{python3_pkgversion}-pytest +# typing was added in Python 3.5 +%if %{python3_pkgversion} == 34 +BuildRequires: python%{python3_pkgversion}-typing +%endif %{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}} Requires: python%{python3_pkgversion}-setuptools +%if %{python3_pkgversion} == 34 +Requires: python%{python3_pkgversion}-typing +%endif %description -n python%{python3_pkgversion}-%{pname} ruamel.yaml is a YAML 1.2 loader/dumper package for Python. @@ -73,7 +80,9 @@ rm -rf %{pypi_name}.egg-info %{__python2} setup.py install --single-version-externally-managed --skip-build --root $RPM_BUILD_ROOT %check -PYTHONPATH=$(echo build/lib.*%{python2_version}) py.test-%{python2_version} _test/test_*.py +# Fails with "AttributeError: 'module' object has no attribute 'warns'" due to +# old pytest on EL7. +PYTHONPATH=$(echo build/lib.*%{python2_version}) py.test-%{python2_version} _test/test_*.py %{?el7:|| :} %if 0%{?with_python3} PYTHONPATH=$(echo build/lib.*%{python3_version}) py.test-%{python3_version} _test/test_*.py %endif @@ -91,12 +100,16 @@ PYTHONPATH=$(echo build/lib.*%{python3_version}) py.test-%{python3_version} _tes %license LICENSE %doc README.rst %{python3_sitearch}/ruamel -%{python3_sitearch}/_ruamel_yaml.cpython-35m-* +%{python3_sitearch}/_ruamel_yaml.cpython-* %{python3_sitearch}/%{pypi_name}-%{version}-py?.?-*.pth %{python3_sitearch}/%{pypi_name}-%{version}-py?.?.egg-info %endif %changelog +* 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 From 6cade84fbfeca31eacdd8b6be6e840c2ec38c0cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Dec 2016 18:20:38 +0100 Subject: [PATCH 08/89] Rebuild for Python 3.6 --- 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 e146af6..2cf2ab1 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -6,7 +6,7 @@ Name: python-%{pname} Version: 0.12.14 -Release: 5%{?dist} +Release: 6%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -106,6 +106,9 @@ PYTHONPATH=$(echo build/lib.*%{python3_version}) py.test-%{python3_version} _tes %endif %changelog +* 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 From 9e9418770cab194b2e30ea6474329f645eb7b079 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 31 Jan 2017 15:30:07 -0700 Subject: [PATCH 09/89] Add patch to support pytest 2.7 in EPEL7 --- python-ruamel-yaml-pytest27.patch | 19 +++++++++++++++++++ python-ruamel-yaml.spec | 13 ++++++++----- 2 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 python-ruamel-yaml-pytest27.patch diff --git a/python-ruamel-yaml-pytest27.patch b/python-ruamel-yaml-pytest27.patch new file mode 100644 index 0000000..816ccb7 --- /dev/null +++ b/python-ruamel-yaml-pytest27.patch @@ -0,0 +1,19 @@ +diff -up ruamel-yaml-171c3653fc01/_test/test_anchor.py.pytest27 ruamel-yaml-171c3653fc01/_test/test_anchor.py +--- ruamel-yaml-171c3653fc01/_test/test_anchor.py.pytest27 2016-09-21 02:09:18.000000000 -0600 ++++ ruamel-yaml-171c3653fc01/_test/test_anchor.py 2017-01-31 15:25:09.245847125 -0700 +@@ -5,6 +5,7 @@ testing of anchors and the aliases refer + """ + + import pytest ++from distutils.version import LooseVersion + from textwrap import dedent + import platform + +@@ -231,6 +232,7 @@ class TestAnchorsAliases: + """) + + # this is an error in PyYAML ++ @pytest.mark.skipif(LooseVersion(pytest.__version__) < LooseVersion("2.8"), reason="Need pytest 2.7") + def test_reused_anchor(self): + yaml = ''' + - &a diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 2cf2ab1..a28248c 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -6,7 +6,7 @@ Name: python-%{pname} Version: 0.12.14 -Release: 6%{?dist} +Release: 7%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -14,6 +14,8 @@ URL: https://bitbucket.org/ruamel/yaml #Source0: https://files.pythonhosted.org/packages/source/r/%{pypi_name}/%{pypi_name}-%{version}.tar.gz # Use bitbucket sources so we can run the tests Source0: https://bitbucket.org/ruamel/yaml/get/%{version}.tar.gz#/%{pname}-%{version}.tar.gz +# Works with pytest 2.7 +Patch0: python-ruamel-yaml-pytest27.patch BuildRequires: libyaml-devel @@ -63,7 +65,7 @@ It is a derivative of Kirill Simonov’s PyYAML 3.11 %endif %prep -%autosetup -n %{pname}-%{commit} +%autosetup -n %{pname}-%{commit} -p1 rm -rf %{pypi_name}.egg-info %build @@ -80,9 +82,7 @@ rm -rf %{pypi_name}.egg-info %{__python2} setup.py install --single-version-externally-managed --skip-build --root $RPM_BUILD_ROOT %check -# Fails with "AttributeError: 'module' object has no attribute 'warns'" due to -# old pytest on EL7. -PYTHONPATH=$(echo build/lib.*%{python2_version}) py.test-%{python2_version} _test/test_*.py %{?el7:|| :} +PYTHONPATH=$(echo build/lib.*%{python2_version}) py.test-%{python2_version} _test/test_*.py %if 0%{?with_python3} PYTHONPATH=$(echo build/lib.*%{python3_version}) py.test-%{python3_version} _test/test_*.py %endif @@ -106,6 +106,9 @@ PYTHONPATH=$(echo build/lib.*%{python3_version}) py.test-%{python3_version} _tes %endif %changelog +* 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 From ad36abad55f0a2babe86e4a94bdeee905e743993 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 31 Jan 2017 15:44:30 -0700 Subject: [PATCH 10/89] Update to 0.13.13 --- .gitignore | 1 + python-ruamel-yaml.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c06d176..7643ef9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /ruamel.yaml-0.12.14.tar.gz /ruamel-yaml-0.12.14.tar.gz +/ruamel-yaml-0.13.13.tar.gz diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index a28248c..62b779a 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -1,12 +1,12 @@ %global pypi_name ruamel.yaml %global pname ruamel-yaml -%global commit 171c3653fc01 +%global commit 113e4054a46c %global with_python3 1 Name: python-%{pname} -Version: 0.12.14 -Release: 7%{?dist} +Version: 0.13.13 +Release: 1%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -106,6 +106,9 @@ PYTHONPATH=$(echo build/lib.*%{python3_version}) py.test-%{python3_version} _tes %endif %changelog +* 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 diff --git a/sources b/sources index 786ea9a..3d5e86a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2b5223a399e654237c0fd0aa8f275535 ruamel-yaml-0.12.14.tar.gz +SHA512 (ruamel-yaml-0.13.13.tar.gz) = 4c9fa8f8d7afd739049c6deb8cdb6eb2b8d306e5b5f5e256af38446733f9d628ff2e8ad56e37b4959f87c57c57aad8e0b582145463cb4dc97f7aac3e19f4777a From d5915ba3faa511d879698e775152472a5bbc91f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 10:24:20 +0000 Subject: [PATCH 11/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_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 62b779a..8e16459 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -6,7 +6,7 @@ Name: python-%{pname} Version: 0.13.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -106,6 +106,9 @@ PYTHONPATH=$(echo build/lib.*%{python3_version}) py.test-%{python3_version} _tes %endif %changelog +* 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 From 75024940fd381ef42fa952d21c5b507ffb350549 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Mon, 13 Feb 2017 16:45:07 +0100 Subject: [PATCH 12/89] The ruamel.yaml needs at least typing >= 3.5.2.2 - related: #1386563 --- python-ruamel-yaml.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 8e16459..de352c9 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -6,7 +6,7 @@ Name: python-%{pname} Version: 0.13.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -30,11 +30,11 @@ BuildRequires: python-setuptools # For tests BuildRequires: pytest BuildRequires: python2-ruamel-ordereddict -BuildRequires: python2-typing +BuildRequires: python2-typing >= 3.5.2.2-2 %{?python_provide:%python_provide python2-%{pypi_name}} Requires: python2-ruamel-ordereddict -Requires: python2-typing +Requires: python2-typing >= 3.5.2.2-2 Requires: python-setuptools %description -n python2-%{pname} @@ -106,6 +106,10 @@ PYTHONPATH=$(echo build/lib.*%{python3_version}) py.test-%{python3_version} _tes %endif %changelog +* 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 From bdfd68acf3687b922d81f7c591b0aa12559aeafd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 11:45:06 +0000 Subject: [PATCH 13/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_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 de352c9..364ff64 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -6,7 +6,7 @@ Name: python-%{pname} Version: 0.13.13 -Release: 3%{?dist} +Release: 4%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -106,6 +106,9 @@ PYTHONPATH=$(echo build/lib.*%{python3_version}) py.test-%{python3_version} _tes %endif %changelog +* 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 From aae2fc05cb8db5cc120fb5b2ba831f70668712e9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 06:58:20 +0000 Subject: [PATCH 14/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_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 364ff64..a78383d 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -6,7 +6,7 @@ Name: python-%{pname} Version: 0.13.13 -Release: 4%{?dist} +Release: 5%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -106,6 +106,9 @@ PYTHONPATH=$(echo build/lib.*%{python3_version}) py.test-%{python3_version} _tes %endif %changelog +* 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 From 36737c6979e8e26635255e503c9adfea67fdcf3a Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 9 Aug 2017 13:06:17 -0600 Subject: [PATCH 15/89] Update to 0.13.14 --- python-ruamel-yaml.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index a78383d..d959012 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -1,12 +1,12 @@ %global pypi_name ruamel.yaml %global pname ruamel-yaml -%global commit 113e4054a46c +%global commit f29921d2048e %global with_python3 1 Name: python-%{pname} -Version: 0.13.13 -Release: 5%{?dist} +Version: 0.13.14 +Release: 1%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -106,6 +106,9 @@ PYTHONPATH=$(echo build/lib.*%{python3_version}) py.test-%{python3_version} _tes %endif %changelog +* 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 From a86887b18aa21cb885c61a7251077cd461df7f2a Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 9 Aug 2017 13:54:21 -0600 Subject: [PATCH 16/89] Upload source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7643ef9..bda4ca0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /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 diff --git a/sources b/sources index 3d5e86a..dd40aa4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruamel-yaml-0.13.13.tar.gz) = 4c9fa8f8d7afd739049c6deb8cdb6eb2b8d306e5b5f5e256af38446733f9d628ff2e8ad56e37b4959f87c57c57aad8e0b582145463cb4dc97f7aac3e19f4777a +SHA512 (ruamel-yaml-0.13.14.tar.gz) = 3701cb76a8297bc42070b55a204d41d37c813ab0685c67ae55959b4fd763d5608d79b10532af24168e53b1d5de79beeb4c57530275973fb1950ee8f61f7f4abc From dda3fb55768eac8ad7c6409583d944c9f40ae7ea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 10:41:53 +0000 Subject: [PATCH 17/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_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 d959012..1530448 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -6,7 +6,7 @@ Name: python-%{pname} Version: 0.13.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -106,6 +106,9 @@ PYTHONPATH=$(echo build/lib.*%{python3_version}) py.test-%{python3_version} _tes %endif %changelog +* 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 From d1b82a7dc295e4128e64b71577de486dd1926785 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Fri, 9 Feb 2018 14:33:39 +0100 Subject: [PATCH 18/89] Update Python 2 dependency declarations to new packaging standards --- python-ruamel-yaml.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 1530448..f2bafef 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -6,7 +6,7 @@ Name: python-%{pname} Version: 0.13.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -26,16 +26,16 @@ It is a derivative of Kirill Simonov’s PyYAML 3.11 %package -n python2-%{pname} Summary: YAML 1.2 loader/dumper package for Python BuildRequires: python2-devel -BuildRequires: python-setuptools +BuildRequires: python2-setuptools # For tests -BuildRequires: pytest +BuildRequires: python2-pytest BuildRequires: python2-ruamel-ordereddict BuildRequires: python2-typing >= 3.5.2.2-2 %{?python_provide:%python_provide python2-%{pypi_name}} Requires: python2-ruamel-ordereddict Requires: python2-typing >= 3.5.2.2-2 -Requires: python-setuptools +Requires: python2-setuptools %description -n python2-%{pname} ruamel.yaml is a YAML 1.2 loader/dumper package for Python. @@ -106,6 +106,10 @@ PYTHONPATH=$(echo build/lib.*%{python3_version}) py.test-%{python3_version} _tes %endif %changelog +* 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 From 0ccf054adda89759834c641bbac15327ea52b112 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 19 Jun 2018 11:18:27 +0200 Subject: [PATCH 19/89] Rebuilt for Python 3.7 --- 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 f2bafef..acf288a 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -6,7 +6,7 @@ Name: python-%{pname} Version: 0.13.14 -Release: 3%{?dist} +Release: 4%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -106,6 +106,9 @@ PYTHONPATH=$(echo build/lib.*%{python3_version}) py.test-%{python3_version} _tes %endif %changelog +* 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) From 6ed77069a25c3654707b5a4555c5f4076ac676e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 29 Jun 2018 13:30:52 +0200 Subject: [PATCH 20/89] Update to 0.15.41 --- .gitignore | 1 + python-ruamel-yaml-pathlib.patch | 32 ++++++++++++++++++++++++++++++++ python-ruamel-yaml.spec | 15 ++++++++++++--- sources | 2 +- 4 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 python-ruamel-yaml-pathlib.patch diff --git a/.gitignore b/.gitignore index bda4ca0..87cd173 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /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 diff --git a/python-ruamel-yaml-pathlib.patch b/python-ruamel-yaml-pathlib.patch new file mode 100644 index 0000000..6cf8156 --- /dev/null +++ b/python-ruamel-yaml-pathlib.patch @@ -0,0 +1,32 @@ +diff --git a/_doc/conf.py b/_doc/conf.py +index 19a19a3..a2b852d 100644 +--- a/_doc/conf.py ++++ b/_doc/conf.py +@@ -68,7 +68,10 @@ print('ruamel.yaml version', version) + + try: + from ryd.__main__ import RYDCmd +- from ruamel.std.pathlib import Path ++ try: ++ from pathlib import Path ++ except ImportError: ++ from pathlib2 import Path + oldargv = sys.argv + for fn in Path('.').glob('*.ryd'): + sys.argv = ['ryd', 'convert', '--no-pdf', str(fn)] +diff --git a/_test/test_api_change.py b/_test/test_api_change.py +index c0f492c..0b3f2d7 100644 +--- a/_test/test_api_change.py ++++ b/_test/test_api_change.py +@@ -11,7 +11,10 @@ import textwrap + import pytest + from ruamel.yaml import YAML + from ruamel.yaml.constructor import DuplicateKeyError +-from ruamel.std.pathlib import Path ++try: ++ from pathlib import Path ++except ImportError: ++ from pathlib2 import Path + + + class TestNewAPI: diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index acf288a..83d0e40 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -1,12 +1,12 @@ %global pypi_name ruamel.yaml %global pname ruamel-yaml -%global commit f29921d2048e +%global commit 75b1b39341d9 %global with_python3 1 Name: python-%{pname} -Version: 0.13.14 -Release: 4%{?dist} +Version: 0.15.41 +Release: 1%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -16,6 +16,9 @@ URL: https://bitbucket.org/ruamel/yaml Source0: https://bitbucket.org/ruamel/yaml/get/%{version}.tar.gz#/%{pname}-%{version}.tar.gz # Works with pytest 2.7 Patch0: python-ruamel-yaml-pytest27.patch + +# Don't require ruamel.std.pathlib, but use stdlib's pathlib on py3, pathlib2 on py2 +Patch1: python-ruamel-yaml-pathlib.patch BuildRequires: libyaml-devel @@ -28,11 +31,13 @@ Summary: YAML 1.2 loader/dumper package for Python BuildRequires: python2-devel BuildRequires: python2-setuptools # For tests +BuildRequires: python2-pathlib2 BuildRequires: python2-pytest BuildRequires: python2-ruamel-ordereddict BuildRequires: python2-typing >= 3.5.2.2-2 %{?python_provide:%python_provide python2-%{pypi_name}} +Requires: python2-pathlib2 Requires: python2-ruamel-ordereddict Requires: python2-typing >= 3.5.2.2-2 Requires: python2-setuptools @@ -106,6 +111,10 @@ PYTHONPATH=$(echo build/lib.*%{python3_version}) py.test-%{python3_version} _tes %endif %changelog +* 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 diff --git a/sources b/sources index dd40aa4..264cecd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruamel-yaml-0.13.14.tar.gz) = 3701cb76a8297bc42070b55a204d41d37c813ab0685c67ae55959b4fd763d5608d79b10532af24168e53b1d5de79beeb4c57530275973fb1950ee8f61f7f4abc +SHA512 (ruamel-yaml-0.15.41.tar.gz) = 5dcc6430a6e13a419132b9dd54bc27dedeb8037d079717817a23bde5700469fa58f634eecc6f9ca6ce67c0146ec42df0a8f9f41eca0b1e35bf6dcce1a13860d6 From 7753457842edaf74c2c8ccf67db7c76d6731602f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 10 Jul 2018 15:56:25 +0200 Subject: [PATCH 21/89] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- python-ruamel-yaml.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 83d0e40..c7bd392 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -20,6 +20,7 @@ Patch0: python-ruamel-yaml-pytest27.patch # Don't require ruamel.std.pathlib, but use stdlib's pathlib on py3, pathlib2 on py2 Patch1: python-ruamel-yaml-pathlib.patch +BuildRequires: gcc BuildRequires: libyaml-devel %description From 77924b522fe3e3b145f2fc7b8fdeb18bebb94709 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 01:59:26 +0000 Subject: [PATCH 22/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 c7bd392..11172c3 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -6,7 +6,7 @@ Name: python-%{pname} Version: 0.15.41 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -112,6 +112,9 @@ PYTHONPATH=$(echo build/lib.*%{python3_version}) py.test-%{python3_version} _tes %endif %changelog +* 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 From 649fec22cdc5911cfa52f2944f5775c8d6a0fe90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 14 Jan 2019 13:41:40 +0100 Subject: [PATCH 23/89] Subpackage python2-ruamel-yaml has been removed --- python-ruamel-yaml.spec | 49 +++++------------------------------------ 1 file changed, 5 insertions(+), 44 deletions(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 11172c3..690073b 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -2,11 +2,10 @@ %global pname ruamel-yaml %global commit 75b1b39341d9 -%global with_python3 1 Name: python-%{pname} Version: 0.15.41 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -27,27 +26,6 @@ BuildRequires: libyaml-devel ruamel.yaml is a YAML 1.2 loader/dumper package for Python. It is a derivative of Kirill Simonov’s PyYAML 3.11 -%package -n python2-%{pname} -Summary: YAML 1.2 loader/dumper package for Python -BuildRequires: python2-devel -BuildRequires: python2-setuptools -# For tests -BuildRequires: python2-pathlib2 -BuildRequires: python2-pytest -BuildRequires: python2-ruamel-ordereddict -BuildRequires: python2-typing >= 3.5.2.2-2 -%{?python_provide:%python_provide python2-%{pypi_name}} - -Requires: python2-pathlib2 -Requires: python2-ruamel-ordereddict -Requires: python2-typing >= 3.5.2.2-2 -Requires: python2-setuptools - -%description -n python2-%{pname} -ruamel.yaml is a YAML 1.2 loader/dumper package for Python. -It is a derivative of Kirill Simonov’s PyYAML 3.11 - -%if 0%{?with_python3} %package -n python%{python3_pkgversion}-%{pname} Summary: YAML 1.2 loader/dumper package for Python BuildRequires: python%{python3_pkgversion}-devel @@ -68,40 +46,20 @@ Requires: python%{python3_pkgversion}-typing %description -n python%{python3_pkgversion}-%{pname} ruamel.yaml is a YAML 1.2 loader/dumper package for Python. It is a derivative of Kirill Simonov’s PyYAML 3.11 -%endif %prep %autosetup -n %{pname}-%{commit} -p1 rm -rf %{pypi_name}.egg-info %build -%py2_build -%if 0%{?with_python3} %py3_build -%endif %install -%if 0%{?with_python3} %{__python3} setup.py install --single-version-externally-managed --skip-build --root $RPM_BUILD_ROOT -%endif - -%{__python2} setup.py install --single-version-externally-managed --skip-build --root $RPM_BUILD_ROOT %check -PYTHONPATH=$(echo build/lib.*%{python2_version}) py.test-%{python2_version} _test/test_*.py -%if 0%{?with_python3} PYTHONPATH=$(echo build/lib.*%{python3_version}) py.test-%{python3_version} _test/test_*.py -%endif -%files -n python2-%{pname} -%license LICENSE -%doc README.rst -%{python2_sitearch}/ruamel -%{python2_sitearch}/_ruamel_yaml.so -%{python2_sitearch}/%{pypi_name}-%{version}-py?.?-*.pth -%{python2_sitearch}/%{pypi_name}-%{version}-py?.?.egg-info - -%if 0%{?with_python3} %files -n python%{python3_pkgversion}-%{pname} %license LICENSE %doc README.rst @@ -109,9 +67,12 @@ PYTHONPATH=$(echo build/lib.*%{python3_version}) py.test-%{python3_version} _tes %{python3_sitearch}/_ruamel_yaml.cpython-* %{python3_sitearch}/%{pypi_name}-%{version}-py?.?-*.pth %{python3_sitearch}/%{pypi_name}-%{version}-py?.?.egg-info -%endif %changelog +* 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 From 98510145a132e0e8e701590454b5163e876dce2d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 09:10:59 +0000 Subject: [PATCH 24/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 690073b..d11821e 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -5,7 +5,7 @@ Name: python-%{pname} Version: 0.15.41 -Release: 3%{?dist} +Release: 4%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -69,6 +69,9 @@ PYTHONPATH=$(echo build/lib.*%{python3_version}) py.test-%{python3_version} _tes %{python3_sitearch}/%{pypi_name}-%{version}-py?.?.egg-info %changelog +* 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 From 92b957b68babeadd0962eca953b774cb1e2ee497 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 16:07:49 +0000 Subject: [PATCH 25/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 d11821e..bbf3256 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -5,7 +5,7 @@ Name: python-%{pname} Version: 0.15.41 -Release: 4%{?dist} +Release: 5%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -69,6 +69,9 @@ PYTHONPATH=$(echo build/lib.*%{python3_version}) py.test-%{python3_version} _tes %{python3_sitearch}/%{pypi_name}-%{version}-py?.?.egg-info %changelog +* 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 From deaa39fed74cc7f68a3502a4de8a50b08bbcfbab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 10:55:54 +0200 Subject: [PATCH 26/89] Rebuilt for Python 3.8 --- 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 bbf3256..011c3bf 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -5,7 +5,7 @@ Name: python-%{pname} Version: 0.15.41 -Release: 5%{?dist} +Release: 6%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -69,6 +69,9 @@ PYTHONPATH=$(echo build/lib.*%{python3_version}) py.test-%{python3_version} _tes %{python3_sitearch}/%{pypi_name}-%{version}-py?.?.egg-info %changelog +* 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 From 80286a62392fe80b0d453243af14260b379d557c Mon Sep 17 00:00:00 2001 From: chedi toueiti Date: Wed, 28 Aug 2019 14:34:00 +0000 Subject: [PATCH 27/89] update to 0.16.5 --- python-ruamel-yaml-pathlib.patch | 77 ++++++++++++++++++++++--------- python-ruamel-yaml-pytest27.patch | 21 ++++----- python-ruamel-yaml.spec | 15 +++--- sources | 2 +- 4 files changed, 74 insertions(+), 41 deletions(-) diff --git a/python-ruamel-yaml-pathlib.patch b/python-ruamel-yaml-pathlib.patch index 6cf8156..fccb550 100644 --- a/python-ruamel-yaml-pathlib.patch +++ b/python-ruamel-yaml-pathlib.patch @@ -1,32 +1,63 @@ diff --git a/_doc/conf.py b/_doc/conf.py -index 19a19a3..a2b852d 100644 --- a/_doc/conf.py +++ b/_doc/conf.py -@@ -68,7 +68,10 @@ print('ruamel.yaml version', version) - - try: - from ryd.__main__ import RYDCmd -- from ruamel.std.pathlib import Path -+ try: -+ from pathlib import Path -+ except ImportError: -+ from pathlib2 import Path - oldargv = sys.argv - for fn in Path('.').glob('*.ryd'): - sys.argv = ['ryd', 'convert', '--no-pdf', str(fn)] -diff --git a/_test/test_api_change.py b/_test/test_api_change.py -index c0f492c..0b3f2d7 100644 ---- a/_test/test_api_change.py -+++ b/_test/test_api_change.py -@@ -11,7 +11,10 @@ import textwrap - import pytest - from ruamel.yaml import YAML - from ruamel.yaml.constructor import DuplicateKeyError +@@ -75,7 +75,10 @@ + if False: + try: + from ryd.__main__ import RYDCmd +- from ruamel.std.pathlib import Path ++ try: ++ from pathlib import Path ++ except ImportError: ++ from pathlib2 import Path + + oldargv = sys.argv + for fn in Path('.').glob('*.ryd'): +diff --git a/_test/roundtrip.py b/_test/roundtrip.py +--- a/_test/roundtrip.py ++++ b/_test/roundtrip.py +@@ -7,7 +7,11 @@ + """ + import sys + import textwrap -from ruamel.std.pathlib import Path +try: + from pathlib import Path +except ImportError: + from pathlib2 import Path - - ++ + + enforce = object() + +diff --git a/_test/test_api_change.py b/_test/test_api_change.py +--- a/_test/test_api_change.py ++++ b/_test/test_api_change.py +@@ -9,7 +9,10 @@ + import sys + import textwrap + import pytest +-from ruamel.std.pathlib import Path ++try: ++ from pathlib import Path ++except ImportError: ++ from pathlib2 import Path + + class TestNewAPI: +diff --git a/_test/test_z_data.py b/_test/test_z_data.py +--- a/_test/test_z_data.py ++++ b/_test/test_z_data.py +@@ -6,7 +6,11 @@ + import pytest # NOQA + import warnings # NOQA + +-from ruamel.std.pathlib import Path ++try: ++ from pathlib import Path ++except ImportError: ++ from pathlib2 import Path ++ + + base_path = Path('data') # that is ruamel.yaml.data + PY2 = sys.version_info[0] == 2 + \ No newline at end of file diff --git a/python-ruamel-yaml-pytest27.patch b/python-ruamel-yaml-pytest27.patch index 816ccb7..9ef3da0 100644 --- a/python-ruamel-yaml-pytest27.patch +++ b/python-ruamel-yaml-pytest27.patch @@ -1,19 +1,18 @@ -diff -up ruamel-yaml-171c3653fc01/_test/test_anchor.py.pytest27 ruamel-yaml-171c3653fc01/_test/test_anchor.py ---- ruamel-yaml-171c3653fc01/_test/test_anchor.py.pytest27 2016-09-21 02:09:18.000000000 -0600 -+++ ruamel-yaml-171c3653fc01/_test/test_anchor.py 2017-01-31 15:25:09.245847125 -0700 -@@ -5,6 +5,7 @@ testing of anchors and the aliases refer +diff -u ruamel-yaml-ff02b83b8f91/_test/test_anchor.py.pytest27 ruamel-yaml-ff02b83b8f91/_test/test_anchor.py +--- ruamel-yaml-ff02b83b8f91/_test/test_anchor.py.pytest27 2019-08-27 10:59:01.756747586 +0100 ++++ ruamel-yaml-ff02b83b8f91/_test/test_anchor.py 2019-08-27 11:00:15.929713043 +0100 +@@ -7,6 +7,7 @@ """ - + import pytest +from distutils.version import LooseVersion from textwrap import dedent import platform - -@@ -231,6 +232,7 @@ class TestAnchorsAliases: - """) - + +@@ -248,6 +249,7 @@ + ) + # this is an error in PyYAML + @pytest.mark.skipif(LooseVersion(pytest.__version__) < LooseVersion("2.8"), reason="Need pytest 2.7") def test_reused_anchor(self): - yaml = ''' - - &a + from ruamel.yaml.error import ReusedAnchorWarning diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 011c3bf..5393e4d 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -1,12 +1,12 @@ %global pypi_name ruamel.yaml %global pname ruamel-yaml -%global commit 75b1b39341d9 +%global commit ff02b83b8f91 Name: python-%{pname} -Version: 0.15.41 -Release: 6%{?dist} -Summary: YAML 1.2 loader/dumper package for Python +Version: 0.16.5 +Release: 1%{?dist} +Summary: YAML 1.2 loader/dumper package for Python License: MIT URL: https://bitbucket.org/ruamel/yaml @@ -18,7 +18,7 @@ Patch0: python-ruamel-yaml-pytest27.patch # Don't require ruamel.std.pathlib, but use stdlib's pathlib on py3, pathlib2 on py2 Patch1: python-ruamel-yaml-pathlib.patch - + BuildRequires: gcc BuildRequires: libyaml-devel @@ -27,7 +27,7 @@ ruamel.yaml is a YAML 1.2 loader/dumper package for Python. It is a derivative of Kirill Simonov’s PyYAML 3.11 %package -n python%{python3_pkgversion}-%{pname} -Summary: YAML 1.2 loader/dumper package for Python +Summary: YAML 1.2 loader/dumper package for Python BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools # For tests @@ -69,6 +69,9 @@ PYTHONPATH=$(echo build/lib.*%{python3_version}) py.test-%{python3_version} _tes %{python3_sitearch}/%{pypi_name}-%{version}-py?.?.egg-info %changelog +* 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 diff --git a/sources b/sources index 264cecd..b78cee8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruamel-yaml-0.15.41.tar.gz) = 5dcc6430a6e13a419132b9dd54bc27dedeb8037d079717817a23bde5700469fa58f634eecc6f9ca6ce67c0146ec42df0a8f9f41eca0b1e35bf6dcce1a13860d6 +SHA512 (ruamel-yaml-0.16.5.tar.gz) = ce08ae50b9084d56c8e0f5a546cb3a23d4cdad643836aa60a44a995459d3d90057d14fa79493c36f415d7bc22936806d0b4f9b34f93192ac536526a314024c45 \ No newline at end of file From 470795cba9b0d058d1384f11ec326ac5431940ef Mon Sep 17 00:00:00 2001 From: chedi toueiti Date: Fri, 30 Aug 2019 15:26:25 +0000 Subject: [PATCH 28/89] update to 0.16.5 --- python-ruamel-yaml.spec | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 5393e4d..948d9e6 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -1,7 +1,7 @@ %global pypi_name ruamel.yaml %global pname ruamel-yaml %global commit ff02b83b8f91 - +%global debug_package %{nil} Name: python-%{pname} Version: 0.16.5 @@ -10,7 +10,6 @@ Summary: YAML 1.2 loader/dumper package for Python License: MIT URL: https://bitbucket.org/ruamel/yaml -#Source0: https://files.pythonhosted.org/packages/source/r/%{pypi_name}/%{pypi_name}-%{version}.tar.gz # Use bitbucket sources so we can run the tests Source0: https://bitbucket.org/ruamel/yaml/get/%{version}.tar.gz#/%{pname}-%{version}.tar.gz # Works with pytest 2.7 @@ -58,15 +57,14 @@ rm -rf %{pypi_name}.egg-info %{__python3} setup.py install --single-version-externally-managed --skip-build --root $RPM_BUILD_ROOT %check -PYTHONPATH=$(echo build/lib.*%{python3_version}) py.test-%{python3_version} _test/test_*.py +PYTHONPATH=$(echo build/lib) py.test-%{python3_version} _test/test_*.py %files -n python%{python3_pkgversion}-%{pname} %license LICENSE %doc README.rst -%{python3_sitearch}/ruamel -%{python3_sitearch}/_ruamel_yaml.cpython-* -%{python3_sitearch}/%{pypi_name}-%{version}-py?.?-*.pth -%{python3_sitearch}/%{pypi_name}-%{version}-py?.?.egg-info +%{python3_sitelib}/ruamel +%{python3_sitelib}/%{pypi_name}-%{version}-py?.?-*.pth +%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info %changelog * Tue Aug 27 2019 Chedi Toueiti - 0.16.5-1 From d919993ffb93fc186dae77ec031a10ebc08964c3 Mon Sep 17 00:00:00 2001 From: "Chandan Kumar (raukadah)" Date: Fri, 30 Aug 2019 23:17:37 +0530 Subject: [PATCH 29/89] Added ruamel-yaml-clib as Requires Signed-off-by: Chandan Kumar (raukadah) --- .gitignore | 1 + python-ruamel-yaml.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 87cd173..7f7d4c1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /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 diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 948d9e6..657f147 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -5,7 +5,7 @@ Name: python-%{pname} Version: 0.16.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -18,8 +18,6 @@ Patch0: python-ruamel-yaml-pytest27.patch # Don't require ruamel.std.pathlib, but use stdlib's pathlib on py3, pathlib2 on py2 Patch1: python-ruamel-yaml-pathlib.patch -BuildRequires: gcc -BuildRequires: libyaml-devel %description ruamel.yaml is a YAML 1.2 loader/dumper package for Python. @@ -37,6 +35,7 @@ BuildRequires: python%{python3_pkgversion}-typing %endif %{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}} +Requires: python%{python3_pkgversion}-ruamel-yaml-clib Requires: python%{python3_pkgversion}-setuptools %if %{python3_pkgversion} == 34 Requires: python%{python3_pkgversion}-typing @@ -67,6 +66,9 @@ PYTHONPATH=$(echo build/lib) py.test-%{python3_version} _test/test_*.py %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info %changelog +* 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 diff --git a/sources b/sources index b78cee8..a6ac9f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruamel-yaml-0.16.5.tar.gz) = ce08ae50b9084d56c8e0f5a546cb3a23d4cdad643836aa60a44a995459d3d90057d14fa79493c36f415d7bc22936806d0b4f9b34f93192ac536526a314024c45 \ No newline at end of file +SHA512 (ruamel-yaml-0.16.5.tar.gz) = ce08ae50b9084d56c8e0f5a546cb3a23d4cdad643836aa60a44a995459d3d90057d14fa79493c36f415d7bc22936806d0b4f9b34f93192ac536526a314024c45 From b3bf86a100a5aa0f0e346b2bf9c94bd054310d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Oct 2019 14:29:22 +0200 Subject: [PATCH 30/89] Rebuilt for Python 3.8.0rc1 (#1748018) --- 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 657f147..2a415fd 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -5,7 +5,7 @@ Name: python-%{pname} Version: 0.16.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -66,6 +66,9 @@ PYTHONPATH=$(echo build/lib) py.test-%{python3_version} _test/test_*.py %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info %changelog +* 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 From a3d05194a3aa2b6d889d408cf01734db80e95791 Mon Sep 17 00:00:00 2001 From: Jason Montleon Date: Mon, 20 Jan 2020 14:15:25 -0500 Subject: [PATCH 31/89] Update to 0.16.6 to fix Python 3.9 build --- .gitignore | 1 + python-ruamel-yaml.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7f7d4c1..28659f6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /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 diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 2a415fd..8112218 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -1,11 +1,11 @@ %global pypi_name ruamel.yaml %global pname ruamel-yaml -%global commit ff02b83b8f91 +%global commit 44504659794e %global debug_package %{nil} Name: python-%{pname} -Version: 0.16.5 -Release: 3%{?dist} +Version: 0.16.6 +Release: 1%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -66,6 +66,9 @@ PYTHONPATH=$(echo build/lib) py.test-%{python3_version} _test/test_*.py %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info %changelog +* Mon Jan 20 2019 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) diff --git a/sources b/sources index a6ac9f1..81b680d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruamel-yaml-0.16.5.tar.gz) = ce08ae50b9084d56c8e0f5a546cb3a23d4cdad643836aa60a44a995459d3d90057d14fa79493c36f415d7bc22936806d0b4f9b34f93192ac536526a314024c45 +SHA512 (ruamel-yaml-0.16.6.tar.gz) = 8790f3b7ca4714b323210f00c987fefeb1321ac83a229a1c429bd05bbfca94363f7b68c611b23d73c215639a08cea2283fc5c77c0fe30ba783a306a58768f582 From 320f6c123e49d8da5cfc50ee3e143d8595a92fae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 15:07:56 +0000 Subject: [PATCH 32/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 8112218..1e07f0f 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -5,7 +5,7 @@ Name: python-%{pname} Version: 0.16.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -66,6 +66,9 @@ PYTHONPATH=$(echo build/lib) py.test-%{python3_version} _test/test_*.py %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 0.16.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Jan 20 2019 Jason Montleon - 0.16.6-1 - Update to 0.16.6 From 6234cb31459e4c897390ad5345e564dbccc5e891 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Thu, 14 May 2020 15:45:38 -0600 Subject: [PATCH 33/89] Fix date in changelog --- 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 1e07f0f..1e2645d 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -69,7 +69,7 @@ PYTHONPATH=$(echo build/lib) py.test-%{python3_version} _test/test_*.py * Thu Jan 30 2020 Fedora Release Engineering - 0.16.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild -* Mon Jan 20 2019 Jason Montleon - 0.16.6-1 +* 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 From fd15c945e39e5891fed20dd34a1e328c500a259e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 03:38:20 +0200 Subject: [PATCH 34/89] Rebuilt for Python 3.9 --- 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 1e2645d..3b19a51 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -5,7 +5,7 @@ Name: python-%{pname} Version: 0.16.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -66,6 +66,9 @@ PYTHONPATH=$(echo build/lib) py.test-%{python3_version} _test/test_*.py %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info %changelog +* 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 From ea6be8f179a15e1b980fe91a91edeaa9508ea89f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 13 Jul 2020 21:04:39 +0200 Subject: [PATCH 35/89] Replace Python version glob with macro (needed for Python 3.10+) See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/PQIGCQCRNBYNXBX2ICWEM3PLDLNOG2ZT/ Co-authored-by: Tomas Hrnciar --- python-ruamel-yaml.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 3b19a51..b8adf14 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -62,8 +62,8 @@ PYTHONPATH=$(echo build/lib) py.test-%{python3_version} _test/test_*.py %license LICENSE %doc README.rst %{python3_sitelib}/ruamel -%{python3_sitelib}/%{pypi_name}-%{version}-py?.?-*.pth -%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info +%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}-*.pth +%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog * Tue May 26 2020 Miro Hrončok - 0.16.6-3 From 6633bb1cde04ac302e7497943d11480be9941acc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 03:44:30 +0000 Subject: [PATCH 36/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 b8adf14..a9b41f5 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -5,7 +5,7 @@ Name: python-%{pname} Version: 0.16.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -66,6 +66,9 @@ PYTHONPATH=$(echo build/lib) py.test-%{python3_version} _test/test_*.py %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* 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 From 0130c0c3ecb434c81a612dda85744b56014e09b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 13:15:10 +0000 Subject: [PATCH 37/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 a9b41f5..7025c3f 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -5,7 +5,7 @@ Name: python-%{pname} Version: 0.16.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -66,6 +66,9 @@ PYTHONPATH=$(echo build/lib) py.test-%{python3_version} _test/test_*.py %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* 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 From 7e24a8b7f024ea15ecb625e2aa8059bacfe2d866 Mon Sep 17 00:00:00 2001 From: Joel Capitao Date: Mon, 22 Feb 2021 16:08:41 +0100 Subject: [PATCH 38/89] Remove obsolete patch --- .gitignore | 1 + python-ruamel-yaml-pytest27.patch | 18 ------------------ python-ruamel-yaml.spec | 16 +++++++++------- sources | 2 +- 4 files changed, 11 insertions(+), 26 deletions(-) delete mode 100644 python-ruamel-yaml-pytest27.patch diff --git a/.gitignore b/.gitignore index 28659f6..2d770b9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /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 diff --git a/python-ruamel-yaml-pytest27.patch b/python-ruamel-yaml-pytest27.patch deleted file mode 100644 index 9ef3da0..0000000 --- a/python-ruamel-yaml-pytest27.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -u ruamel-yaml-ff02b83b8f91/_test/test_anchor.py.pytest27 ruamel-yaml-ff02b83b8f91/_test/test_anchor.py ---- ruamel-yaml-ff02b83b8f91/_test/test_anchor.py.pytest27 2019-08-27 10:59:01.756747586 +0100 -+++ ruamel-yaml-ff02b83b8f91/_test/test_anchor.py 2019-08-27 11:00:15.929713043 +0100 -@@ -7,6 +7,7 @@ - """ - - import pytest -+from distutils.version import LooseVersion - from textwrap import dedent - import platform - -@@ -248,6 +249,7 @@ - ) - - # this is an error in PyYAML -+ @pytest.mark.skipif(LooseVersion(pytest.__version__) < LooseVersion("2.8"), reason="Need pytest 2.7") - def test_reused_anchor(self): - from ruamel.yaml.error import ReusedAnchorWarning diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 7025c3f..ac643ce 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -1,19 +1,17 @@ %global pypi_name ruamel.yaml %global pname ruamel-yaml -%global commit 44504659794e +%global commit 44504659794e463523ff8d0b40bac18dfe3b52f8 %global debug_package %{nil} Name: python-%{pname} Version: 0.16.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT -URL: https://bitbucket.org/ruamel/yaml +URL: https://sourceforge.net/projects/ruamel-yaml # Use bitbucket sources so we can run the tests -Source0: https://bitbucket.org/ruamel/yaml/get/%{version}.tar.gz#/%{pname}-%{version}.tar.gz -# Works with pytest 2.7 -Patch0: python-ruamel-yaml-pytest27.patch +Source0: https://sourceforge.net/code-snapshots/hg/r/ru/ruamel-yaml/code/%{pname}-code-%{commit}.zip # Don't require ruamel.std.pathlib, but use stdlib's pathlib on py3, pathlib2 on py2 Patch1: python-ruamel-yaml-pathlib.patch @@ -46,7 +44,7 @@ ruamel.yaml is a YAML 1.2 loader/dumper package for Python. It is a derivative of Kirill Simonov’s PyYAML 3.11 %prep -%autosetup -n %{pname}-%{commit} -p1 +%autosetup -n %{pname}-code-%{commit} -p1 rm -rf %{pypi_name}.egg-info %build @@ -66,6 +64,10 @@ PYTHONPATH=$(echo build/lib) py.test-%{python3_version} _test/test_*.py %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* 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 diff --git a/sources b/sources index 81b680d..724a23d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruamel-yaml-0.16.6.tar.gz) = 8790f3b7ca4714b323210f00c987fefeb1321ac83a229a1c429bd05bbfca94363f7b68c611b23d73c215639a08cea2283fc5c77c0fe30ba783a306a58768f582 +SHA512 (ruamel-yaml-code-44504659794e463523ff8d0b40bac18dfe3b52f8.zip) = 920c1a41a94d55fe1e0598fe5b8d15a45342a37ed30c1b671d22579d88369b77ff9b6422200bc2106b28056962610149c5e899c68bbd096ea940800dc7ad560d From 9f5aa6074198d026514136fb0191ed1102c6f72e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 21:00:19 +0200 Subject: [PATCH 39/89] Rebuilt for Python 3.10 --- 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 ac643ce..58c5617 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -5,7 +5,7 @@ Name: python-%{pname} Version: 0.16.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -64,6 +64,9 @@ PYTHONPATH=$(echo build/lib) py.test-%{python3_version} _test/test_*.py %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* 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 From cf4f70e6188d814c41918f9d1d3b1423d230975d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 09:20:30 +0000 Subject: [PATCH 40/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_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 58c5617..727b342 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -5,7 +5,7 @@ Name: python-%{pname} Version: 0.16.6 -Release: 7%{?dist} +Release: 8%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -64,6 +64,9 @@ PYTHONPATH=$(echo build/lib) py.test-%{python3_version} _test/test_*.py %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* 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 From 74c70736bbb23b7b15f7e711cd5af9fe9b0b98d8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 15:21:12 +0000 Subject: [PATCH 41/89] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_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 727b342..41fcc20 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -5,7 +5,7 @@ Name: python-%{pname} Version: 0.16.6 -Release: 8%{?dist} +Release: 9%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -64,6 +64,9 @@ PYTHONPATH=$(echo build/lib) py.test-%{python3_version} _test/test_*.py %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* 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 From d16edee2ef77af47aeda6e9c0489d69394a45122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Thu, 12 May 2022 13:51:02 +0200 Subject: [PATCH 42/89] Update to 0.17.21 Related: BZ#2042422 --- .gitignore | 1 + python-ruamel-yaml-pathlib.patch | 63 -------------------------------- python-ruamel-yaml.spec | 17 +++++---- sources | 2 +- 4 files changed, 11 insertions(+), 72 deletions(-) delete mode 100644 python-ruamel-yaml-pathlib.patch diff --git a/.gitignore b/.gitignore index 2d770b9..7ebc36c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /ruamel-yaml-0.16.5.tar.gz /ruamel-yaml-0.16.6.tar.gz /ruamel-yaml-code-44504659794e463523ff8d0b40bac18dfe3b52f8.zip +/ruamel-yaml-code-c887dfe19e2f01b770a2b4b04163a01e00a33f85.zip diff --git a/python-ruamel-yaml-pathlib.patch b/python-ruamel-yaml-pathlib.patch deleted file mode 100644 index fccb550..0000000 --- a/python-ruamel-yaml-pathlib.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/_doc/conf.py b/_doc/conf.py ---- a/_doc/conf.py -+++ b/_doc/conf.py -@@ -75,7 +75,10 @@ - if False: - try: - from ryd.__main__ import RYDCmd -- from ruamel.std.pathlib import Path -+ try: -+ from pathlib import Path -+ except ImportError: -+ from pathlib2 import Path - - oldargv = sys.argv - for fn in Path('.').glob('*.ryd'): -diff --git a/_test/roundtrip.py b/_test/roundtrip.py ---- a/_test/roundtrip.py -+++ b/_test/roundtrip.py -@@ -7,7 +7,11 @@ - """ - import sys - import textwrap --from ruamel.std.pathlib import Path -+try: -+ from pathlib import Path -+except ImportError: -+ from pathlib2 import Path -+ - - enforce = object() - -diff --git a/_test/test_api_change.py b/_test/test_api_change.py ---- a/_test/test_api_change.py -+++ b/_test/test_api_change.py -@@ -9,7 +9,10 @@ - import sys - import textwrap - import pytest --from ruamel.std.pathlib import Path -+try: -+ from pathlib import Path -+except ImportError: -+ from pathlib2 import Path - - - class TestNewAPI: -diff --git a/_test/test_z_data.py b/_test/test_z_data.py ---- a/_test/test_z_data.py -+++ b/_test/test_z_data.py -@@ -6,7 +6,11 @@ - import pytest # NOQA - import warnings # NOQA - --from ruamel.std.pathlib import Path -+try: -+ from pathlib import Path -+except ImportError: -+ from pathlib2 import Path -+ - - base_path = Path('data') # that is ruamel.yaml.data - PY2 = sys.version_info[0] == 2 - \ No newline at end of file diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 41fcc20..607a07c 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -1,22 +1,19 @@ %global pypi_name ruamel.yaml %global pname ruamel-yaml -%global commit 44504659794e463523ff8d0b40bac18dfe3b52f8 +%global commit c887dfe19e2f01b770a2b4b04163a01e00a33f85 %global debug_package %{nil} Name: python-%{pname} -Version: 0.16.6 -Release: 9%{?dist} +Version: 0.17.21 +Release: 1%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT URL: https://sourceforge.net/projects/ruamel-yaml # Use bitbucket sources so we can run the tests +# https://sourceforge.net/code-snapshots/hg/r/ru/ruamel-yaml/code/ruamel-yaml-code-58889c2d944d5d0b22948a15d6fcb97c68d599de.zip Source0: https://sourceforge.net/code-snapshots/hg/r/ru/ruamel-yaml/code/%{pname}-code-%{commit}.zip -# Don't require ruamel.std.pathlib, but use stdlib's pathlib on py3, pathlib2 on py2 -Patch1: python-ruamel-yaml-pathlib.patch - - %description ruamel.yaml is a YAML 1.2 loader/dumper package for Python. It is a derivative of Kirill Simonov’s PyYAML 3.11 @@ -54,7 +51,7 @@ rm -rf %{pypi_name}.egg-info %{__python3} setup.py install --single-version-externally-managed --skip-build --root $RPM_BUILD_ROOT %check -PYTHONPATH=$(echo build/lib) py.test-%{python3_version} _test/test_*.py +%pytest _test/test_*.py %files -n python%{python3_pkgversion}-%{pname} %license LICENSE @@ -64,6 +61,10 @@ PYTHONPATH=$(echo build/lib) py.test-%{python3_version} _test/test_*.py %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* 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 diff --git a/sources b/sources index 724a23d..75f1347 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruamel-yaml-code-44504659794e463523ff8d0b40bac18dfe3b52f8.zip) = 920c1a41a94d55fe1e0598fe5b8d15a45342a37ed30c1b671d22579d88369b77ff9b6422200bc2106b28056962610149c5e899c68bbd096ea940800dc7ad560d +SHA512 (ruamel-yaml-code-c887dfe19e2f01b770a2b4b04163a01e00a33f85.zip) = cace08dd32b7794d390b493ad2f0d3824d01d55212cdecc9f5ae515fb12fa815ae81fb2df66221470bcd21d8d540556ff9df5f0c366142328ba567d06085ae71 From d40bc1167d3fe4dd153d8fcecd1c7922bb9e13b0 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 17:15:50 +0200 Subject: [PATCH 43/89] Rebuilt for Python 3.11 --- 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 607a07c..ad94cd4 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -5,7 +5,7 @@ Name: python-%{pname} Version: 0.17.21 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -61,6 +61,9 @@ rm -rf %{pypi_name}.egg-info %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* 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 From 652d2c9be002bef56b9431556aab3113b6b8ac79 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 22:09:25 +0000 Subject: [PATCH 44/89] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_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 ad94cd4..422c4ee 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -5,7 +5,7 @@ Name: python-%{pname} Version: 0.17.21 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -61,6 +61,9 @@ rm -rf %{pypi_name}.egg-info %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* 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 From 7cf5c4f1a97b005f2c5e674f7b6170f0cf585bde Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 17:06:18 +0000 Subject: [PATCH 45/89] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_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 422c4ee..eb9f29c 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -5,7 +5,7 @@ Name: python-%{pname} Version: 0.17.21 -Release: 3%{?dist} +Release: 4%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -61,6 +61,9 @@ rm -rf %{pypi_name}.egg-info %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* 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 From 4291e622474ed27e6989b36e8c4cb37dd83c7d31 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Wed, 3 May 2023 23:07:35 +0000 Subject: [PATCH 46/89] Update to 0.17.22. Fixes rhbz#2192464. --- .gitignore | 1 + python-ruamel-yaml.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7ebc36c..ba15f4f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /ruamel-yaml-0.16.6.tar.gz /ruamel-yaml-code-44504659794e463523ff8d0b40bac18dfe3b52f8.zip /ruamel-yaml-code-c887dfe19e2f01b770a2b4b04163a01e00a33f85.zip +/ruamel-yaml-code-56b3e2666fb275deab3eec99193c103e4edf93bb.zip diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index eb9f29c..2b099e8 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -1,11 +1,11 @@ %global pypi_name ruamel.yaml %global pname ruamel-yaml -%global commit c887dfe19e2f01b770a2b4b04163a01e00a33f85 +%global commit 56b3e2666fb275deab3eec99193c103e4edf93bb %global debug_package %{nil} Name: python-%{pname} -Version: 0.17.21 -Release: 4%{?dist} +Version: 0.17.22 +Release: 1%{?dist} Summary: YAML 1.2 loader/dumper package for Python License: MIT @@ -57,10 +57,12 @@ rm -rf %{pypi_name}.egg-info %license LICENSE %doc README.rst %{python3_sitelib}/ruamel -%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}-*.pth %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* 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 diff --git a/sources b/sources index 75f1347..f61cb82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruamel-yaml-code-c887dfe19e2f01b770a2b4b04163a01e00a33f85.zip) = cace08dd32b7794d390b493ad2f0d3824d01d55212cdecc9f5ae515fb12fa815ae81fb2df66221470bcd21d8d540556ff9df5f0c366142328ba567d06085ae71 +SHA512 (ruamel-yaml-code-56b3e2666fb275deab3eec99193c103e4edf93bb.zip) = b88a776b2f1d957ec4f6b3344e2456e85963a1bc20b6c027c6ad3cab8f7d48f5e1b36d33caaf179b9c829eb41417a46aad8b530e46f191dd1806d3b17cd1add3 From f23e6627c969dc3c0ee709accf5f85ffbb54af14 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 3 May 2023 08:17:19 -0400 Subject: [PATCH 47/89] Confirm License is SPDX MIT --- 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 2b099e8..0aaaf4d 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -5,9 +5,10 @@ Name: python-%{pname} Version: 0.17.22 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML 1.2 loader/dumper package for Python +# SPDX License: MIT URL: https://sourceforge.net/projects/ruamel-yaml # Use bitbucket sources so we can run the tests @@ -60,6 +61,9 @@ rm -rf %{pypi_name}.egg-info %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Thu May 04 2023 Benjamin A. Beasley - 0.17.22-2 +- Confirm License is SPDX MIT + * Wed May 03 2023 Maxwell G - 0.17.22-1 - Update to 0.17.22. Fixes rhbz#2192464. From b0db89e0b6660065bd4f04e1670a385c098449ef Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 3 May 2023 08:24:30 -0400 Subject: [PATCH 48/89] Reduce macro indirection and drop ancient constructs and conditionals --- python-ruamel-yaml.spec | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 0aaaf4d..b9ee479 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -1,9 +1,7 @@ -%global pypi_name ruamel.yaml -%global pname ruamel-yaml %global commit 56b3e2666fb275deab3eec99193c103e4edf93bb %global debug_package %{nil} -Name: python-%{pname} +Name: python-ruamel-yaml Version: 0.17.22 Release: 2%{?dist} Summary: YAML 1.2 loader/dumper package for Python @@ -13,56 +11,51 @@ License: MIT URL: https://sourceforge.net/projects/ruamel-yaml # Use bitbucket sources so we can run the tests # https://sourceforge.net/code-snapshots/hg/r/ru/ruamel-yaml/code/ruamel-yaml-code-58889c2d944d5d0b22948a15d6fcb97c68d599de.zip -Source0: https://sourceforge.net/code-snapshots/hg/r/ru/ruamel-yaml/code/%{pname}-code-%{commit}.zip +Source0: https://sourceforge.net/code-snapshots/hg/r/ru/ruamel-yaml/code/ruamel-yaml-code-%{commit}.zip %description ruamel.yaml is a YAML 1.2 loader/dumper package for Python. It is a derivative of Kirill Simonov’s PyYAML 3.11 -%package -n python%{python3_pkgversion}-%{pname} +%package -n python3-ruamel-yaml Summary: YAML 1.2 loader/dumper package for Python -BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: python%{python3_pkgversion}-setuptools +BuildRequires: python3-devel +BuildRequires: python3-setuptools # For tests -BuildRequires: python%{python3_pkgversion}-pytest -# typing was added in Python 3.5 -%if %{python3_pkgversion} == 34 -BuildRequires: python%{python3_pkgversion}-typing -%endif -%{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}} +BuildRequires: python3-pytest -Requires: python%{python3_pkgversion}-ruamel-yaml-clib -Requires: python%{python3_pkgversion}-setuptools -%if %{python3_pkgversion} == 34 -Requires: python%{python3_pkgversion}-typing -%endif +%py_provides python3-ruamel.yaml -%description -n python%{python3_pkgversion}-%{pname} +Requires: python3-ruamel-yaml-clib +Requires: python3-setuptools + +%description -n python3-ruamel-yaml ruamel.yaml is a YAML 1.2 loader/dumper package for Python. It is a derivative of Kirill Simonov’s PyYAML 3.11 %prep -%autosetup -n %{pname}-code-%{commit} -p1 -rm -rf %{pypi_name}.egg-info +%autosetup -n ruamel-yaml-code-%{commit} -p1 +rm -rf ruamel.yaml.egg-info %build %py3_build %install -%{__python3} setup.py install --single-version-externally-managed --skip-build --root $RPM_BUILD_ROOT +%{python3} setup.py install --single-version-externally-managed --skip-build --root $RPM_BUILD_ROOT %check %pytest _test/test_*.py -%files -n python%{python3_pkgversion}-%{pname} +%files -n python3-ruamel-yaml %license LICENSE %doc README.rst %{python3_sitelib}/ruamel -%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info +%{python3_sitelib}/ruamel.yaml-%{version}-py%{python3_version}.egg-info %changelog * 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 * Wed May 03 2023 Maxwell G - 0.17.22-1 - Update to 0.17.22. Fixes rhbz#2192464. From b96d93d810d55e8e258f8dafdf201719efd6c11f Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 3 May 2023 08:27:24 -0400 Subject: [PATCH 49/89] Update description from upstream --- python-ruamel-yaml.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index b9ee479..477e1c7 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -13,9 +13,11 @@ URL: https://sourceforge.net/projects/ruamel-yaml # https://sourceforge.net/code-snapshots/hg/r/ru/ruamel-yaml/code/ruamel-yaml-code-58889c2d944d5d0b22948a15d6fcb97c68d599de.zip Source0: https://sourceforge.net/code-snapshots/hg/r/ru/ruamel-yaml/code/ruamel-yaml-code-%{commit}.zip -%description -ruamel.yaml is a YAML 1.2 loader/dumper package for Python. -It is a derivative of Kirill Simonov’s PyYAML 3.11 +%global _description %{expand: +ruamel.yaml is a YAML parser/emitter that supports roundtrip preservation of +comments, seq/map flow style, and map key order.} + +%description %{_description} %package -n python3-ruamel-yaml Summary: YAML 1.2 loader/dumper package for Python @@ -29,9 +31,7 @@ BuildRequires: python3-pytest Requires: python3-ruamel-yaml-clib Requires: python3-setuptools -%description -n python3-ruamel-yaml -ruamel.yaml is a YAML 1.2 loader/dumper package for Python. -It is a derivative of Kirill Simonov’s PyYAML 3.11 +%description -n python3-ruamel-yaml %{_description} %prep %autosetup -n ruamel-yaml-code-%{commit} -p1 @@ -56,6 +56,7 @@ rm -rf ruamel.yaml.egg-info * 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 * Wed May 03 2023 Maxwell G - 0.17.22-1 - Update to 0.17.22. Fixes rhbz#2192464. From 073aa3c448d76be2f037f19777b42775a88eabde Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 3 May 2023 08:38:51 -0400 Subject: [PATCH 50/89] Make the package noarch (python-ruamel-yaml-clib contains the compiled code) --- python-ruamel-yaml.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 477e1c7..2378fd8 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -1,5 +1,4 @@ %global commit 56b3e2666fb275deab3eec99193c103e4edf93bb -%global debug_package %{nil} Name: python-ruamel-yaml Version: 0.17.22 @@ -13,6 +12,8 @@ URL: https://sourceforge.net/projects/ruamel-yaml # https://sourceforge.net/code-snapshots/hg/r/ru/ruamel-yaml/code/ruamel-yaml-code-58889c2d944d5d0b22948a15d6fcb97c68d599de.zip Source0: https://sourceforge.net/code-snapshots/hg/r/ru/ruamel-yaml/code/ruamel-yaml-code-%{commit}.zip +BuildArch: noarch + %global _description %{expand: ruamel.yaml is a YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order.} @@ -57,6 +58,7 @@ rm -rf ruamel.yaml.egg-info - 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) * Wed May 03 2023 Maxwell G - 0.17.22-1 - Update to 0.17.22. Fixes rhbz#2192464. From 872522d03c3428a604e033ca878ae66e3635b3f7 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 3 May 2023 09:04:48 -0400 Subject: [PATCH 51/89] Fix upper-bounded Python interpreter version for ruamel.yaml.clib dependency --- python-ruamel-yaml.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 2378fd8..b403561 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -29,13 +29,16 @@ BuildRequires: python3-pytest %py_provides python3-ruamel.yaml -Requires: python3-ruamel-yaml-clib Requires: python3-setuptools %description -n python3-ruamel-yaml %{_description} %prep -%autosetup -n ruamel-yaml-code-%{commit} -p1 +%autosetup -n ruamel-yaml-code-%{commit} +# 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 rm -rf ruamel.yaml.egg-info %build @@ -59,6 +62,7 @@ rm -rf ruamel.yaml.egg-info - 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 * Wed May 03 2023 Maxwell G - 0.17.22-1 - Update to 0.17.22. Fixes rhbz#2192464. From 3b1d1492825156089354b6a005de192dcf790f72 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 3 May 2023 09:08:00 -0400 Subject: [PATCH 52/89] Drop unused manual runtime dependency on setuptools --- 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 b403561..a9f70ae 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -29,8 +29,6 @@ BuildRequires: python3-pytest %py_provides python3-ruamel.yaml -Requires: python3-setuptools - %description -n python3-ruamel-yaml %{_description} %prep @@ -63,6 +61,7 @@ rm -rf ruamel.yaml.egg-info - 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 * Wed May 03 2023 Maxwell G - 0.17.22-1 - Update to 0.17.22. Fixes rhbz#2192464. From 47b3524b86a72964d980525970d892bb75d999d3 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 3 May 2023 09:08:40 -0400 Subject: [PATCH 53/89] =?UTF-8?q?Port=20to=20pyproject-rpm-macros=20(?= =?UTF-8?q?=E2=80=9Cnew=20Python=20guidelines=E2=80=9D)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- python-ruamel-yaml.spec | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index a9f70ae..a649e62 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -22,10 +22,8 @@ comments, seq/map flow style, and map key order.} %package -n python3-ruamel-yaml Summary: YAML 1.2 loader/dumper package for Python + BuildRequires: python3-devel -BuildRequires: python3-setuptools -# For tests -BuildRequires: python3-pytest %py_provides python3-ruamel.yaml @@ -37,22 +35,25 @@ BuildRequires: python3-pytest # implementation (ruamel.yaml.clib dependency) may be used. Patch this out. sed -r -i 's/( and python_version<"[^"]+")(.*ruamel\.yaml\.clib)/\2/' \ __init__.py -rm -rf ruamel.yaml.egg-info + +%generate_buildrequires +%pyproject_buildrequires -t %build -%py3_build +%pyproject_wheel %install -%{python3} setup.py install --single-version-externally-managed --skip-build --root $RPM_BUILD_ROOT +%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 %check %pytest _test/test_*.py -%files -n python3-ruamel-yaml -%license LICENSE +%files -n python3-ruamel-yaml -f %{pyproject_files} +# pyproject_files handles LICENSE; verify with “rpm -qL -p …” %doc README.rst -%{python3_sitelib}/ruamel -%{python3_sitelib}/ruamel.yaml-%{version}-py%{python3_version}.egg-info %changelog * Thu May 04 2023 Benjamin A. Beasley - 0.17.22-2 @@ -62,6 +63,7 @@ rm -rf ruamel.yaml.egg-info - 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”) * Wed May 03 2023 Maxwell G - 0.17.22-1 - Update to 0.17.22. Fixes rhbz#2192464. From 4e1e80ed1c3b3515183c7388320226acb1fc5aac Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 3 May 2023 09:09:23 -0400 Subject: [PATCH 54/89] Stop numbering the source archive --- python-ruamel-yaml.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index a649e62..1cbab6a 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -10,7 +10,7 @@ License: MIT URL: https://sourceforge.net/projects/ruamel-yaml # Use bitbucket sources so we can run the tests # https://sourceforge.net/code-snapshots/hg/r/ru/ruamel-yaml/code/ruamel-yaml-code-58889c2d944d5d0b22948a15d6fcb97c68d599de.zip -Source0: https://sourceforge.net/code-snapshots/hg/r/ru/ruamel-yaml/code/ruamel-yaml-code-%{commit}.zip +Source: https://sourceforge.net/code-snapshots/hg/r/ru/ruamel-yaml/code/ruamel-yaml-code-%{commit}.zip BuildArch: noarch @@ -64,6 +64,7 @@ sed -r -i 's/( and python_version<"[^"]+")(.*ruamel\.yaml\.clib)/\2/' \ - 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 * Wed May 03 2023 Maxwell G - 0.17.22-1 - Update to 0.17.22. Fixes rhbz#2192464. From cfeaa3d51fb8c14db9ca10e5038a297aff53d7a5 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 3 May 2023 10:04:43 -0400 Subject: [PATCH 55/89] Add a bootstrap conditional to break the circular dependency with ruamel.yaml.clib --- python-ruamel-yaml.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 1cbab6a..89eaa04 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -1,3 +1,6 @@ +# Breaks the circular dependency with ruamel.yaml.clib. +%bcond_with bootstrap + %global commit 56b3e2666fb275deab3eec99193c103e4edf93bb Name: python-ruamel-yaml @@ -35,6 +38,9 @@ BuildRequires: python3-devel # 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 -t @@ -49,7 +55,12 @@ sed -r -i 's/( and python_version<"[^"]+")(.*ruamel\.yaml\.clib)/\2/' \ %pyproject_save_files ruamel %check -%pytest _test/test_*.py +%if %{with bootstrap} +k="${k-}${k+ and }not test_load_cyaml" +k="${k-}${k+ and }not test_load_cyaml_1_2" +k="${k-}${k+ and }not test_dump_cyaml_1_2" +%endif +%pytest -k "${k-}" _test/test_*.py %files -n python3-ruamel-yaml -f %{pyproject_files} # pyproject_files handles LICENSE; verify with “rpm -qL -p …” @@ -65,6 +76,8 @@ sed -r -i 's/( and python_version<"[^"]+")(.*ruamel\.yaml\.clib)/\2/' \ - 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 * Wed May 03 2023 Maxwell G - 0.17.22-1 - Update to 0.17.22. Fixes rhbz#2192464. From 44e88da7ac50dba2af8d087c21a27592666aa41b Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 4 May 2023 07:28:11 -0400 Subject: [PATCH 56/89] Fix an obsolete comment referring to bitbucket --- python-ruamel-yaml.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 89eaa04..be93a07 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -11,8 +11,7 @@ Summary: YAML 1.2 loader/dumper package for Python # SPDX License: MIT URL: https://sourceforge.net/projects/ruamel-yaml -# Use bitbucket sources so we can run the tests -# https://sourceforge.net/code-snapshots/hg/r/ru/ruamel-yaml/code/ruamel-yaml-code-58889c2d944d5d0b22948a15d6fcb97c68d599de.zip +# 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 BuildArch: noarch @@ -78,6 +77,7 @@ k="${k-}${k+ and }not test_dump_cyaml_1_2" - 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. From 06cff57119d5efee7d0b65264daa5d9d4eda8e76 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 7 May 2023 09:27:28 -0400 Subject: [PATCH 57/89] Update to 0.17.24 (close RHBZ#2193478) --- .gitignore | 1 + python-ruamel-yaml.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ba15f4f..f91c294 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /ruamel-yaml-code-44504659794e463523ff8d0b40bac18dfe3b52f8.zip /ruamel-yaml-code-c887dfe19e2f01b770a2b4b04163a01e00a33f85.zip /ruamel-yaml-code-56b3e2666fb275deab3eec99193c103e4edf93bb.zip +/ruamel-yaml-code-4309006902d2453399588f4ddccfb3fc460e1eba.zip diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index be93a07..569de77 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 56b3e2666fb275deab3eec99193c103e4edf93bb +%global commit 4309006902d2453399588f4ddccfb3fc460e1eba Name: python-ruamel-yaml -Version: 0.17.22 -Release: 2%{?dist} +Version: 0.17.24 +Release: 1%{?dist} Summary: YAML 1.2 loader/dumper package for Python # SPDX @@ -66,6 +66,9 @@ k="${k-}${k+ and }not test_dump_cyaml_1_2" %doc README.rst %changelog +* 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 diff --git a/sources b/sources index f61cb82..5084ad4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruamel-yaml-code-56b3e2666fb275deab3eec99193c103e4edf93bb.zip) = b88a776b2f1d957ec4f6b3344e2456e85963a1bc20b6c027c6ad3cab8f7d48f5e1b36d33caaf179b9c829eb41417a46aad8b530e46f191dd1806d3b17cd1add3 +SHA512 (ruamel-yaml-code-4309006902d2453399588f4ddccfb3fc460e1eba.zip) = ddbcffce3d20de8700ed1405fae26d412ffa07392c600cb17820eb5e779dc48fcb298802f379752a451833a0b42648d1899e7dabebcf835e420d9db93d29145d From d30f7f99209d220ad93ca7298ca3126c3d16adca Mon Sep 17 00:00:00 2001 From: Chandan Kumar Date: Fri, 19 May 2023 23:14:33 +0530 Subject: [PATCH 58/89] Import 0.17.26 srpm (close RHBZ#2196655) Signed-off-by: Chandan Kumar --- 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 569de77..515b0aa 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -4,7 +4,7 @@ %global commit 4309006902d2453399588f4ddccfb3fc460e1eba Name: python-ruamel-yaml -Version: 0.17.24 +Version: 0.17.26 Release: 1%{?dist} Summary: YAML 1.2 loader/dumper package for Python @@ -66,6 +66,9 @@ k="${k-}${k+ and }not test_dump_cyaml_1_2" %doc README.rst %changelog +* 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) From 1ac0c0a34d5f6aa3412f397daf189d5f22a13e33 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 25 May 2023 12:29:06 -0400 Subject: [PATCH 59/89] Avoid tox dependency tox is unwanted in RHEL, but does not add any particular value here even for the Fedora build. --- python-ruamel-yaml.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index 515b0aa..a0bd5a0 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -5,7 +5,7 @@ Name: python-ruamel-yaml Version: 0.17.26 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML 1.2 loader/dumper package for Python # SPDX @@ -26,6 +26,7 @@ comments, seq/map flow style, and map key order.} Summary: YAML 1.2 loader/dumper package for Python BuildRequires: python3-devel +BuildRequires: python3-pytest %py_provides python3-ruamel.yaml @@ -42,7 +43,7 @@ sed -r -i 's/^([[:blank:]]*)(.*ruamel\.yaml\.clib)/\1# \2/' __init__.py %endif %generate_buildrequires -%pyproject_buildrequires -t +%pyproject_buildrequires %build %pyproject_wheel @@ -66,6 +67,9 @@ k="${k-}${k+ and }not test_dump_cyaml_1_2" %doc README.rst %changelog +* 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) From 90a22aad3e6335a182c48092f0707898e649ece5 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 14 Jun 2023 09:39:43 +0200 Subject: [PATCH 60/89] Bootstrap for Python 3.12 --- 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 a0bd5a0..fba934d 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.17.26 -Release: 2%{?dist} +Release: 3%{?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.rst %changelog +* 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 From 5f080d1740f4557f310a01c4dd2479a06da2876b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 14 Jun 2023 11:04:00 +0200 Subject: [PATCH 61/89] Rebuilt for Python 3.12 --- 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 fba934d..ba6ffa1 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.17.26 -Release: 3%{?dist} +Release: 4%{?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.rst %changelog +* 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 From 1194199fba07b6e0f6e0a35ebae41ed386b14728 Mon Sep 17 00:00:00 2001 From: Joel Capitao Date: Mon, 19 Jun 2023 08:08:51 +0200 Subject: [PATCH 62/89] Update to 0.17.32 (close RHBZ#2210057) --- .gitignore | 1 + python-ruamel-yaml.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f91c294..5b9d973 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /ruamel-yaml-code-c887dfe19e2f01b770a2b4b04163a01e00a33f85.zip /ruamel-yaml-code-56b3e2666fb275deab3eec99193c103e4edf93bb.zip /ruamel-yaml-code-4309006902d2453399588f4ddccfb3fc460e1eba.zip +/ruamel-yaml-code-829991d24309dd85ef9c066dbfed17eb4e4fd571.zip diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index ba6ffa1..e3f3ee7 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 4309006902d2453399588f4ddccfb3fc460e1eba +%global commit 829991d24309dd85ef9c066dbfed17eb4e4fd571 Name: python-ruamel-yaml -Version: 0.17.26 -Release: 4%{?dist} +Version: 0.17.32 +Release: 1%{?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 +* 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 diff --git a/sources b/sources index 5084ad4..52af4ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruamel-yaml-code-4309006902d2453399588f4ddccfb3fc460e1eba.zip) = ddbcffce3d20de8700ed1405fae26d412ffa07392c600cb17820eb5e779dc48fcb298802f379752a451833a0b42648d1899e7dabebcf835e420d9db93d29145d +SHA512 (ruamel-yaml-code-829991d24309dd85ef9c066dbfed17eb4e4fd571.zip) = 2a0f63e930e45e12c7fa248a19ef93c749f70fb77f53770c6862bb4a01273d3e470bdf689620b5d947fe8d82170da2c33eacd3213af31c679c6895e751b6d285 From afe54c853d319f8bed39ab2ee4829526f3e1eb67 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 22 Jun 2023 15:20:26 +0200 Subject: [PATCH 63/89] 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 64/89] 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 65/89] 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 66/89] 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 67/89] 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 68/89] 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 69/89] 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 70/89] 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 71/89] 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 72/89] 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 73/89] 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 74/89] 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 75/89] 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 76/89] 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 77/89] 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 78/89] 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 79/89] 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 80/89] 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 81/89] 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 82/89] 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 83/89] 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 84/89] 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 85/89] 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 86/89] 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 87/89] 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 88/89] 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 89/89] 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