From d7b2c31cdf1f9239f8002b078573325f390ed58b Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Thu, 10 Mar 2022 13:20:44 -0500
Subject: [PATCH] Backport 2bdd631: remove deprecated pytest.warns(None) (fix
 RHBZ#2059950)

---
 ...63158b7f981fc6d70a869680451bdfd8d848.patch | 46 +++++++++++++++++++
 python-dateutil.spec                          | 15 +++++-
 2 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 2bdd63158b7f981fc6d70a869680451bdfd8d848.patch

diff --git a/2bdd63158b7f981fc6d70a869680451bdfd8d848.patch b/2bdd63158b7f981fc6d70a869680451bdfd8d848.patch
new file mode 100644
index 0000000..c7a078c
--- /dev/null
+++ b/2bdd63158b7f981fc6d70a869680451bdfd8d848.patch
@@ -0,0 +1,46 @@
+From 2bdd63158b7f981fc6d70a869680451bdfd8d848 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jakub=20Kul=C3=ADk?= <kulikjak@gmail.com>
+Date: Thu, 10 Feb 2022 10:28:42 +0100
+Subject: [PATCH] Remove deprecated pytest.warns(None) from test_internals.py
+
+---
+ tests/test_internals.py | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/tests/test_internals.py b/tests/test_internals.py
+index 530813147..b32e6723f 100644
+--- a/tests/test_internals.py
++++ b/tests/test_internals.py
+@@ -9,6 +9,7 @@
+ 
+ import sys
+ import pytest
++import warnings
+ 
+ from dateutil.parser._parser import _ymd
+ from dateutil import tz
+@@ -65,18 +66,17 @@ def test_parser_parser_private_not_warns():
+     from dateutil.parser._parser import _timelex, _tzparser
+     from dateutil.parser._parser import _parsetz
+ 
+-    with pytest.warns(None) as recorder:
++    with warnings.catch_warnings():
++        warnings.simplefilter("error")
+         _tzparser()
+-        assert len(recorder) == 0
+ 
+-    with pytest.warns(None) as recorder:
++    with warnings.catch_warnings():
++        warnings.simplefilter("error")
+         _timelex('2014-03-03')
+ 
+-        assert len(recorder) == 0
+-
+-    with pytest.warns(None) as recorder:
++    with warnings.catch_warnings():
++        warnings.simplefilter("error")
+         _parsetz('+05:00')
+-        assert len(recorder) == 0
+ 
+ 
+ @pytest.mark.tzstr
diff --git a/python-dateutil.spec b/python-dateutil.spec
index 90dadb1..0419d74 100644
--- a/python-dateutil.spec
+++ b/python-dateutil.spec
@@ -15,6 +15,13 @@ License:        BSD or (BSD and ASL 2.0)
 URL:            https://github.com/dateutil/dateutil
 Source:         %{pypi_source}
 
+# Remove deprecated pytest.warns(None) from test_internals.py
+#
+# Fixes:
+# python-dateutil fails to build with pytest 7
+# https://bugzilla.redhat.com/show_bug.cgi?id=2059950
+Patch1:         %{url}/commit/2bdd63158b7f981fc6d70a869680451bdfd8d848.patch
+
 # when bootstrapping dateutil-freezegun, we cannot run tests
 %bcond_without tests
 
@@ -51,7 +58,12 @@ Summary: API documentation for python-dateutil
 This package contains %{summary}.
 
 %prep
-%autosetup
+%autosetup -N
+# the tests were moved outside of %%{modname} directory upstream after 2.8.2
+# so we apply the patch with new paths from within it
+pushd %{modname}/test
+%patch1 -p2
+popd
 iconv --from=ISO-8859-1 --to=UTF-8 NEWS > NEWS.new
 mv NEWS.new NEWS
 
@@ -80,6 +92,7 @@ make -C docs html
 %changelog
 * Thu Mar 10 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 1:2.8.2-1
 - Update to 3.8.2 (fix RHBZ#1982169)
+- Backport 2bdd631: remove deprecated pytest.warns(None) (fix RHBZ#2059950)
 
 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.8.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild