6 changed files with 175 additions and 182 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,15 +1 @@
-/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
+/ruamel-yaml-code-af9628b0d0479c35a60efc44b8d6dff9dc95aed2.zip
--- a/bz-1951852-test.py
+++ b/bz-1951852-test.py
@ -0,0 +1,37 @@
+import io
+import sys
+import ruamel.yaml
+from ruamel.yaml import YAML
+
+ruamel_yaml = YAML(typ="rt")
+ruamel_yaml.default_flow_style = False
+ruamel_yaml.preserve_quotes = True
+ruamel_yaml.width = 1024
+
+buf = """\
+# top level
+top:
+  # next level 1
+  - { here: 1, there: 2 }
+  # next level 2
+  - { there: 1, here: 2 }
+top2:
+  # next level 1-2
+  - { here: 11, there: 22 }
+  # next level 2-2
+  - { there: 11, here: 22 }
+"""
+
+if len(sys.argv) > 1:
+    buf = open(sys.argv[1]).read()
+ruamel_data = ruamel_yaml.load(buf)
+ruamel_yaml.indent(mapping=2, sequence=4, offset=2)
+outf = io.StringIO()
+ruamel_yaml.dump(ruamel_data, outf)
+buf = outf.getvalue()
+print(buf)
+ruamel_data = ruamel_yaml.load(buf)
+outf = io.StringIO()
+ruamel_yaml.dump(ruamel_data, outf)
+buf = outf.getvalue()
+print(buf)
--- a/python-ruamel-yaml-pathlib.patch
+++ b/python-ruamel-yaml-pathlib.patch
@ -0,0 +1,56 @@
+--- ruamel-yaml-code-af9628b0d0479c35a60efc44b8d6dff9dc95aed2/_doc/conf.py.orig	2021-04-20 17:11:58.090894727 -0600
+++ ruamel-yaml-code-af9628b0d0479c35a60efc44b8d6dff9dc95aed2/_doc/conf.py	2021-04-20 17:13:38.946521358 -0600
+@@ -75,7 +75,10 @@ class ryd2rst:
+ 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'):
+--- ruamel-yaml-code-af9628b0d0479c35a60efc44b8d6dff9dc95aed2/_test/test_api_change.py.orig	2021-04-20 17:12:13.434990060 -0600
+++ ruamel-yaml-code-af9628b0d0479c35a60efc44b8d6dff9dc95aed2/_test/test_api_change.py	2021-04-20 17:13:58.317641717 -0600
+@@ -9,7 +9,10 @@ testing of anchors and the aliases refer
+ 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:
+--- ruamel-yaml-code-af9628b0d0479c35a60efc44b8d6dff9dc95aed2/_test/roundtrip.py.orig	2021-04-20 17:25:36.621971457 -0600
+++ ruamel-yaml-code-af9628b0d0479c35a60efc44b8d6dff9dc95aed2/_test/roundtrip.py	2021-04-20 17:26:47.303408002 -0600
+@@ -7,7 +7,10 @@ helper routines for testing round trip o
+ """
+ import sys
+ import textwrap
+-from ruamel.std.pathlib import Path
+try:
+    from pathlib import Path
+except ImportError:
+    from pathlib2 import Path
+ 
+ enforce = object()
+ 
+--- ruamel-yaml-code-af9628b0d0479c35a60efc44b8d6dff9dc95aed2/_test/test_z_data.py.orig	2021-04-20 17:26:30.851306390 -0600
+++ ruamel-yaml-code-af9628b0d0479c35a60efc44b8d6dff9dc95aed2/_test/test_z_data.py	2021-04-20 17:26:40.850368147 -0600
+@@ -6,7 +6,10 @@ import sys
+ 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
--- a/python-ruamel-yaml-pytest27.patch
+++ b/python-ruamel-yaml-pytest27.patch
@ -0,0 +1,18 @@
+--- ruamel-yaml-code-af9628b0d0479c35a60efc44b8d6dff9dc95aed2/_test/test_anchor.py.orig	2021-04-20 17:09:14.371877519 -0600
+++ ruamel-yaml-code-af9628b0d0479c35a60efc44b8d6dff9dc95aed2/_test/test_anchor.py	2021-04-20 17:09:45.359070044 -0600
+@@ -7,6 +7,7 @@ testing of anchors and the aliases refer
+ """
+ 
+ import pytest
+from distutils.version import LooseVersion
+ from textwrap import dedent
+ import platform
+ 
+@@ -248,6 +249,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):
+         from ruamel.yaml.error import ReusedAnchorWarning
+ 
--- a/python-ruamel-yaml.spec
+++ b/python-ruamel-yaml.spec
@ -1,192 +1,88 @@
-# Breaks the circular dependency with ruamel.yaml.clib.
-%bcond_with bootstrap
+%global pypi_name ruamel.yaml
+%global pname ruamel-yaml
+%global commit af9628b0d0479c35a60efc44b8d6dff9dc95aed2

-%global commit eb3ecf31085135283908fc8449befebbc1fff4b3

-Name:           python-ruamel-yaml
-Version:        0.18.5
-Release:        5%{?dist}
+Name:           python-%{pname}
+Version:        0.15.100
+Release:        1%{?dist}
 Summary:        YAML 1.2 loader/dumper package for Python 

-# SPDX
 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
+URL:            https://sourceforge.net/projects/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
+# moved to sourceforge
+Source0:        https://sourceforge.net/code-snapshots/hg/r/ru/%{pname}/code/%{pname}-code-%{commit}.zip
+Source1:        bz-1951852-test.py

-BuildArch:      noarch
+# Works with pytest 2.7
+Patch0:         python-ruamel-yaml-pytest27.patch

-%global _description %{expand:
-ruamel.yaml is a YAML parser/emitter that supports roundtrip preservation of
-comments, seq/map flow style, and map key order.}
+# Don't require ruamel.std.pathlib, but use stdlib's pathlib on py3, pathlib2 on py2
+Patch1:         python-ruamel-yaml-pathlib.patch
 
-%description %{_description}
+BuildRequires:  gcc
+BuildRequires:  libyaml-devel

-%package -n     python3-ruamel-yaml
+%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}
 Summary:        YAML 1.2 loader/dumper package for Python 
+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}}

-BuildRequires:  python3-devel
-BuildRequires:  python3-pytest
+Requires:       python%{python3_pkgversion}-setuptools
+%if %{python3_pkgversion} == 34
+Requires:       python%{python3_pkgversion}-typing
+%endif

-%py_provides python3-ruamel.yaml
-
-%description -n python3-ruamel-yaml %{_description}
+%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

 %prep
-%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
-%if %{with bootstrap}
-sed -r -i 's/^([[:blank:]]*)(.*ruamel\.yaml\.clib)/\1# \2/' __init__.py
-%endif
-
-%generate_buildrequires
-%pyproject_buildrequires
+%autosetup -n %{pname}-code-%{commit} -p1
+rm -rf %{pypi_name}.egg-info

 %build
-%pyproject_wheel
+%py3_build

 %install
-%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
+%{__python3} setup.py install --single-version-externally-managed --skip-build --root $RPM_BUILD_ROOT

 %check
-%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
+PYTHONPATH=$(echo build/lib.*%{python3_version}) py.test-%{python3_version} _test/test_*.py
+PYTHONPATH=$(echo build/lib.*%{python3_version}) %{__python3} %{SOURCE1}

-%files -n python3-ruamel-yaml -f %{pyproject_files}
-# pyproject_files handles LICENSE; verify with “rpm -qL -p …”
-%doc README.md
+%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

 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.18.5-5
- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
+* Tue Apr 20 2021 Rich Megginson <rmeggins@redhat.com> - 0.15.100-1
+- Resolves: rhbz#1951852
+  error converting lists with embedded comments

-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.18.5-4
- Bump release for June 2024 mass rebuild
+* Mon Nov 23 2020 Pavel Cahyna <pcahyna@redhat.com> - 0.15.41-5
+- Rebuild after adding to RHEL buildrood and configuring CI gating

-* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.18.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.18.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Nov 12 2023 Parag Nemade <pnemade AT redhat DOT com> - 0.18.5-1
- Update to 0.18.5
-
-* Thu Oct 26 2023 Joel Capitao <jcapitao@redhat.com> - 0.18.2-1
- Update to 0.18.2 (close RHBZ#2245968)
-
-* Tue Oct 24 2023 Joel Capitao <jcapitao@redhat.com> - 0.18.1-1
- Update to 0.18.1 (close RHBZ#2241174)
-
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.17.32-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jun 22 2023 Python Maint <python-maint@redhat.com> - 0.17.32-2
- Rebuilt for Python 3.12
-
-* Mon Jun 19 2023 Joel Capitao <jcapitao@redhat.com> - 0.17.32-1
- Update to 0.17.32 (close RHBZ#2210057)
-
-* Wed Jun 14 2023 Python Maint <python-maint@redhat.com> - 0.17.26-4
- Rebuilt for Python 3.12
-
-* Wed Jun 14 2023 Python Maint <python-maint@redhat.com> - 0.17.26-3
- Bootstrap for Python 3.12
-
-* Wed May 24 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 0.17.26-2
- Avoid tox dependency
-
-* Tue May 09 2023 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 0.17.26-1
- Update to 0.17.26 (close RHBZ#2196655)
-
-* Sun May 07 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 0.17.24-1
- Update to 0.17.24 (close RHBZ#2193478)
-
-* Thu May 04 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 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 <maxwell@gtmx.me> - 0.17.22-1
- Update to 0.17.22. Fixes rhbz#2192464.
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.17.21-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.17.21-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 0.17.21-2
- Rebuilt for Python 3.11
-
-* Tue May 10 2022 Jakub Čajka <jcajka@redhat.com> - 0.17.21-1
- Update to 0.17.21
- Related: BZ#2042422
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.6-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.6-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.16.6-7
- Rebuilt for Python 3.10
-
-* Mon Feb 22 2021 Joel Capitao <jcapitao@redhat.com> - 0.16.6-6
- Change upstream URL
- Remove obsolete patch
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.6-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.16.6-3
- Rebuilt for Python 3.9
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Jan 20 2020 Jason Montleon <jmontleo@redhat.com> - 0.16.6-1
- Update to 0.16.6
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.16.5-3
- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Fri Aug 30 2019 Chandan Kumar <raukadah@gmail.com> - 0.16.5-2
- Added ruamel-yaml-clib as Requires
-
-* Tue Aug 27 2019 Chedi Toueiti <chedi.toueiti@gmail.com> - 0.16.5-1
- Update to 0.16.5
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.15.41-6
- Rebuilt for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.41-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.41-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+* Wed Mar 06 2019 Lon Hohberger <lon@redhat.com> - 0.15.41-4
+- Rebuild for new architectures

 * Mon Jan 14 2019 Miro Hrončok <mhroncok@redhat.com> - 0.15.41-3
 - Subpackage python2-ruamel-yaml has been removed
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (ruamel-yaml-code-eb3ecf31085135283908fc8449befebbc1fff4b3.zip) = 2319ecd339100ec51b060e1fb19d08c3f7603675ce3a17b59c05d11893ca7644d06ececf3950f02eda25cabede6037b5128184823f734f0e66473c5dfdef7cdc
+SHA512 (ruamel-yaml-code-af9628b0d0479c35a60efc44b8d6dff9dc95aed2.zip) = 17f3f070bbdef84f3a166cbb6044ad49983619afdfb723c31d03d094df7a75ffdf393a01053bba0567d862fb6dab8b9e23596a331549f55bab5e652463a7227c