From edd1727cd3287fa60cd583a64f7e5b2115e68883fcf10b7e9c0fb319c01f2c73 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Mon, 17 Jan 2022 06:30:18 +0000
Subject: [PATCH] Accepting request 946843 from
 home:bnavigator:branches:devel:languages:python

- Skip a failing test in python310: exception format not recognized

OBS-URL: https://build.opensuse.org/request/show/946843
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Scrapy?expand=0&rev=22
---
 python-Scrapy.changes |  5 +++++
 python-Scrapy.spec    | 15 ++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/python-Scrapy.changes b/python-Scrapy.changes
index a131980..11cc3c3 100644
--- a/python-Scrapy.changes
+++ b/python-Scrapy.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Jan 16 21:07:14 UTC 2022 - Ben Greiner <code@bnavigator.de>
+
+- Skip a failing test in python310: exception format not recognized
+
 -------------------------------------------------------------------
 Thu Oct  7 14:35:57 UTC 2021 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-Scrapy.spec b/python-Scrapy.spec
index c729b65..5ceacae 100644
--- a/python-Scrapy.spec
+++ b/python-Scrapy.spec
@@ -16,10 +16,8 @@
 #
 
 
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%{?!python_module:%define python_module() python3-%{**}}
 %define skip_python2 1
-# python-uvloop does not support python3.6
-%define skip_python36 1
 Name:           python-Scrapy
 Version:        2.5.1
 Release:        0
@@ -60,7 +58,7 @@ BuildRequires:  %{python_module zope.interface >= 4.1.3}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 BuildRequires:  python3-Sphinx
-BuildRequires:  %{python_module dataclasses if (%python-base with python36-base)}
+BuildRequires:  (python3-dataclasses if python3-base < 3.7)
 Requires:       python-Protego >= 0.1.15
 Requires:       python-PyDispatcher >= 2.0.5
 Requires:       python-Twisted >= 17.9.0
@@ -114,14 +112,16 @@ popd
 # tests/test_downloader_handlers_*.py and test_http2_client_protocol.py: no network
 # tests/test_command_check.py: twisted dns resolution of example.com error
 # no color in obs chroot console
-skiplist="not test_pformat"
+skiplist="test_pformat"
+# correct exception but not recognized due to different format
+python310_skiplist=" or test_callback_kwargs"
 %{pytest \
     --ignore tests/test_proxy_connect.py \
     --ignore tests/test_command_check.py \
     --ignore tests/test_downloader_handlers.py \
     --ignore tests/test_downloader_handlers_http2.py \
     --ignore tests/test_http2_client_protocol.py \
-    -k "${skiplist}" \
+    -k "not (${skiplist} ${$python_skiplist})" \
     -W ignore::DeprecationWarning \
     tests}
 
@@ -134,7 +134,8 @@ skiplist="not test_pformat"
 %files %{python_files}
 %license LICENSE
 %doc AUTHORS README.rst
-%{python_sitelib}/*
+%{python_sitelib}/scrapy
+%{python_sitelib}/Scrapy-%{version}*-info
 %python_alternative %{_bindir}/scrapy
 
 %files -n %{name}-doc