From 5b52efe5d5180fc485edb71649cd082cbcd150e8 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Fri, 15 Jan 2021 19:01:00 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/python-urllib3.git#edd63be688277f5100037c0c9f550788c9632d43 --- python-urllib3.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 85fd454..5bd9d57 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 1.25.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -24,8 +24,6 @@ Summary: Python3 HTTP library with thread-safe connection pooling and fil BuildRequires: python3-devel BuildRequires: python3-setuptools %if %{with tests} -BuildRequires: python3-nose -BuildRequires: python3-mock BuildRequires: python3-six BuildRequires: python3-pysocks BuildRequires: python3-pytest @@ -76,6 +74,11 @@ rm -rf test/contrib/ # fail when combined with the unbundling of backports-ssl_match_hostname rm -f test/test_no_ssl.py +# Use the standard library instead of a backport +sed -i -e 's/^import mock/from unittest import mock/' \ + -e 's/^from mock import /from unittest.mock import /' \ + test/*.py docs/conf.py + %build %py3_build @@ -113,6 +116,10 @@ popd %changelog +* Fri Jan 15 2021 Miro Hrončok - 1.25.10-3 +- Drop redundant BuildRequires for nose +- Instead of the mock backport, use unittest.mock from the standard library + * Tue Jan 05 2021 Anna Khaitovich - 1.25.10-2 - Update RECENT_DATE dynamically