Update to 0.17.21

This commit is contained in:
Jason Montleon 2023-07-18 09:42:45 -04:00
commit ef56b32bc4
4 changed files with 9 additions and 71 deletions

1
.gitignore vendored
View file

@ -1,3 +1,4 @@
/python-ruamel-yaml-pytest27.patch /python-ruamel-yaml-pytest27.patch
/python-ruamel-yaml-pathlib.patch /python-ruamel-yaml-pathlib.patch
/ruamel-yaml-0.15.41.tar.gz /ruamel-yaml-0.15.41.tar.gz
/ruamel-yaml-code-c887dfe19e2f01b770a2b4b04163a01e00a33f85.zip

View file

@ -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

View file

@ -1,11 +1,11 @@
%global pypi_name ruamel.yaml %global pypi_name ruamel.yaml
%global pname ruamel-yaml %global pname ruamel-yaml
%global commit 44504659794e463523ff8d0b40bac18dfe3b52f8 %global commit c887dfe19e2f01b770a2b4b04163a01e00a33f85
%global debug_package %{nil} %global debug_package %{nil}
Name: python-%{pname} Name: python-%{pname}
Version: 0.16.6 Version: 0.17.21
Release: 8%{?dist} Release: 1%{?dist}
Summary: YAML 1.2 loader/dumper package for Python Summary: YAML 1.2 loader/dumper package for Python
License: MIT License: MIT
@ -13,10 +13,6 @@ URL: https://sourceforge.net/projects/ruamel-yaml
# Use bitbucket sources so we can run the tests # Use bitbucket sources so we can run the tests
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/%{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 %description
ruamel.yaml is a YAML 1.2 loader/dumper package for Python. ruamel.yaml is a YAML 1.2 loader/dumper package for Python.
It is a derivative of Kirill Simonovs PyYAML 3.11 It is a derivative of Kirill Simonovs PyYAML 3.11
@ -65,6 +61,10 @@ PYTHONPATH=$(echo build/lib) py.test-%{python3_version} _test/test_*.py
%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info
%changelog %changelog
* Tue Jul 18 2023 Jason Montleon <jmontleo@redhat.com> - 0.17.21
- Update to 0.17.21
- Last version to support python 3.6
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.6-8 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.6-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

View file

@ -1 +1 @@
SHA512 (ruamel-yaml-code-44504659794e463523ff8d0b40bac18dfe3b52f8.zip) = 920c1a41a94d55fe1e0598fe5b8d15a45342a37ed30c1b671d22579d88369b77ff9b6422200bc2106b28056962610149c5e899c68bbd096ea940800dc7ad560d SHA512 (ruamel-yaml-code-c887dfe19e2f01b770a2b4b04163a01e00a33f85.zip) = ad35326ea48451eba75e1458f9a0de70e000da554c22fcfadbcaf3daab0258159cdcb7a5ab5890d4f2cdd9cfd98ce1950df2b0b6511d8442b6a34453de45cd93