From 9e9418770cab194b2e30ea6474329f645eb7b079 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Tue, 31 Jan 2017 15:30:07 -0700
Subject: [PATCH] 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 <orion@cora.nwra.com> - 0.12.14-7
+- Add patch to support pytest 2.7 in EPEL7
+
 * Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 0.12.14-6
 - Rebuild for Python 3.6