Remove obsolete patch

This commit is contained in:
Joel Capitao 2021-02-22 16:08:41 +01:00
parent 0130c0c3ec
commit 7e24a8b7f0
4 changed files with 11 additions and 26 deletions

1
.gitignore vendored
View File

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

View File

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

View File

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

View File

@ -1 +1 @@
SHA512 (ruamel-yaml-0.16.6.tar.gz) = 8790f3b7ca4714b323210f00c987fefeb1321ac83a229a1c429bd05bbfca94363f7b68c611b23d73c215639a08cea2283fc5c77c0fe30ba783a306a58768f582
SHA512 (ruamel-yaml-code-44504659794e463523ff8d0b40bac18dfe3b52f8.zip) = 920c1a41a94d55fe1e0598fe5b8d15a45342a37ed30c1b671d22579d88369b77ff9b6422200bc2106b28056962610149c5e899c68bbd096ea940800dc7ad560d