From ba782d466cb38669620284106a310c92a150ca57acfb3c5fe7788b6b1b6e502c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Tue, 5 Nov 2024 15:33:11 +0000 Subject: [PATCH] Accepting request 1221438 from home:pgajdos:python - do not require python-purl - added patches fix https://github.com/jamielennox/requests-mock/issues/266 + python-requests-mock-no-purl.patch OBS-URL: https://build.opensuse.org/request/show/1221438 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests-mock?expand=0&rev=64 --- python-requests-mock-no-purl.patch | 28 ++++++++++++++++++++++++++++ python-requests-mock.changes | 8 ++++++++ python-requests-mock.spec | 3 ++- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 python-requests-mock-no-purl.patch diff --git a/python-requests-mock-no-purl.patch b/python-requests-mock-no-purl.patch new file mode 100644 index 0000000..c80db27 --- /dev/null +++ b/python-requests-mock-no-purl.patch @@ -0,0 +1,28 @@ +Index: requests-mock-1.12.1/tests/test_adapter.py +=================================================================== +--- requests-mock-1.12.1.orig/tests/test_adapter.py ++++ requests-mock-1.12.1/tests/test_adapter.py +@@ -14,9 +14,14 @@ import http.client + import io + import json + import re ++import unittest + import urllib.parse + +-import purl ++with_purl = True ++try: ++ import purl ++except: ++ with_purl = False + import requests + from urllib3 import HTTPResponse + +@@ -345,6 +350,7 @@ class SessionAdapterTests(base.TestCase) + resp = self.session.get(u) + self.assertEqual('resp', resp.text) + ++ @unittest.skipUnless(with_purl, "purl not available") + def test_with_purl(self): + self.adapter.register_uri('GET', + purl.URL('mock://www.tester.com/a'), diff --git a/python-requests-mock.changes b/python-requests-mock.changes index 265f021..cad7ca0 100644 --- a/python-requests-mock.changes +++ b/python-requests-mock.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Nov 5 13:07:00 UTC 2024 - pgajdos@suse.com + +- do not require python-purl +- added patches + fix https://github.com/jamielennox/requests-mock/issues/266 + + python-requests-mock-no-purl.patch + ------------------------------------------------------------------- Wed May 8 06:40:50 UTC 2024 - Steve Kowalik diff --git a/python-requests-mock.spec b/python-requests-mock.spec index eafbaae..a89662d 100644 --- a/python-requests-mock.spec +++ b/python-requests-mock.spec @@ -24,9 +24,10 @@ Summary: Module to mock out responses from the requests package License: Apache-2.0 URL: https://github.com/jamielennox/requests-mock Source: https://files.pythonhosted.org/packages/source/r/requests-mock/requests-mock-%{version}.tar.gz +# https://github.com/jamielennox/requests-mock/issues/266 +Patch0: python-requests-mock-no-purl.patch BuildRequires: %{python_module fixtures} BuildRequires: %{python_module pip} -BuildRequires: %{python_module purl} BuildRequires: %{python_module pytest} BuildRequires: %{python_module requests >= 2.3} BuildRequires: %{python_module requests-futures}