From 5d2969f4060b2773c0df6261cfcf11804d66e2c3dbdd786c04226c4a2b5df0df Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Sat, 12 Dec 2020 12:11:41 +0000
Subject: [PATCH] Accepting request 855332 from
 home:mcepl:branches:devel:tools:scm

- Remove skipping tests which are acutally passing.

- Python < 3.7 requires external contextvars

OBS-URL: https://build.opensuse.org/request/show/855332
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-dnspython?expand=0&rev=53
---
 python-dnspython.changes | 10 ++++++++++
 python-dnspython.spec    | 19 ++++++++++---------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/python-dnspython.changes b/python-dnspython.changes
index dd7d510..0a94c1f 100644
--- a/python-dnspython.changes
+++ b/python-dnspython.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Dec 11 14:05:18 UTC 2020 - Matej Cepl <mcepl@suse.com>
+
+- Remove skipping tests which are acutally passing.
+
+-------------------------------------------------------------------
+Fri Dec 11 07:52:30 UTC 2020 - Matej Cepl <mcepl@suse.com>
+
+- Python < 3.7 requires external contextvars
+
 -------------------------------------------------------------------
 Thu Aug  6 13:46:23 UTC 2020 - John Vandenberg <jayvdb@gmail.com>
 
diff --git a/python-dnspython.spec b/python-dnspython.spec
index 2efde5b..c98e8e1 100644
--- a/python-dnspython.spec
+++ b/python-dnspython.spec
@@ -26,8 +26,8 @@ License:        ISC
 Group:          Development/Languages/Python
 URL:            https://github.com/rthalley/dnspython
 Source:         https://files.pythonhosted.org/packages/source/d/dnspython/dnspython-%{version}.zip
+BuildRequires:  %{python_module base >= 3.6}
 BuildRequires:  %{python_module setuptools}
-BuildRequires:  python3-base >= 3.6
 # SECTION tests
 BuildRequires:  %{python_module cryptography}
 BuildRequires:  %{python_module ecdsa}
@@ -36,14 +36,20 @@ BuildRequires:  %{python_module pycryptodome}
 BuildRequires:  %{python_module requests-toolbelt}
 BuildRequires:  %{python_module trio >= 0.14.0}
 BuildRequires:  %{python_module typing}
-# /SECTION tests
 BuildRequires:  fdupes
-BuildRequires:  netcfg
 BuildRequires:  python-rpm-macros
+# /SECTION tests
+BuildRequires:  %{python_module pytest}
+BuildRequires:  netcfg
 BuildRequires:  unzip
+BuildRequires:  (python3-contextvars if python3-base < 3.7)
+BuildRequires:  (python36-contextvars if python36-base)
 Requires:       python-ecdsa
 Requires:       python-pycryptodome
 Requires:       python-requests-toolbelt
+%if %{python_version_nodots} < 37
+Requires:       python-contextvars
+%endif
 BuildArch:      noarch
 Recommends:     python-cryptography
 Recommends:     python-idna >= 2.1
@@ -65,8 +71,6 @@ manipulation of DNS zones, messages, names, and records.
 %prep
 %setup -q -n dnspython-%{version}
 chmod -x examples/*
-# Two sets of fail which fail on openssl 1.1.0i and lower
-sed -Ei 's/def (testAbsoluteED)(448|25519)/def _\1\2/' tests/test_dnssec.py
 
 %build
 %python_build
@@ -76,10 +80,7 @@ sed -Ei 's/def (testAbsoluteED)(448|25519)/def _\1\2/' tests/test_dnssec.py
 %python_expand %fdupes %{buildroot}%{$python_sitelib}/
 
 %check
-%if  %python3_version_nodots  < 37
-rm tests/nanonameserver.py
-%endif
-%python_exec setup.py test
+%pytest
 
 %files %{python_files}
 %license LICENSE