diff --git a/python-pytest-httpbin-no-six.patch b/python-pytest-httpbin-no-six.patch new file mode 100644 index 0000000..9b4bd0c --- /dev/null +++ b/python-pytest-httpbin-no-six.patch @@ -0,0 +1,13 @@ +Index: pytest-httpbin-1.0.2/pytest_httpbin/serve.py +=================================================================== +--- pytest-httpbin-1.0.2.orig/pytest_httpbin/serve.py ++++ pytest-httpbin-1.0.2/pytest_httpbin/serve.py +@@ -3,7 +3,7 @@ import threading + import ssl + from wsgiref.simple_server import WSGIServer, make_server, WSGIRequestHandler + from wsgiref.handlers import SimpleHandler +-from six.moves.urllib.parse import urljoin ++from urllib.parse import urljoin + + + CERT_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'certs') diff --git a/python-pytest-httpbin.changes b/python-pytest-httpbin.changes index c39edd1..c2baca4 100644 --- a/python-pytest-httpbin.changes +++ b/python-pytest-httpbin.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Dec 8 11:15:36 UTC 2022 - pgajdos@suse.com + +- do not require six +- added patches + fix https://github.com/kevin1024/pytest-httpbin/issues/75 + + python-pytest-httpbin-no-six.patch + ------------------------------------------------------------------- Tue Apr 12 20:57:41 UTC 2022 - Ben Greiner diff --git a/python-pytest-httpbin.spec b/python-pytest-httpbin.spec index a2140d0..cc29c0b 100644 --- a/python-pytest-httpbin.spec +++ b/python-pytest-httpbin.spec @@ -26,16 +26,16 @@ Group: Development/Languages/Python URL: https://github.com/kevin1024/pytest-httpbin Source: https://files.pythonhosted.org/packages/source/p/pytest-httpbin/pytest-httpbin-%{version}.tar.gz Source99: pytest-httpbin-rpmlintrc +# https://github.com/kevin1024/pytest-httpbin/issues/75 +Patch0: python-pytest-httpbin-no-six.patch BuildRequires: %{python_module httpbin} BuildRequires: %{python_module pytest} BuildRequires: %{python_module requests} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module six} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-httpbin Requires: python-pytest -Requires: python-six BuildArch: noarch %python_subpackages @@ -50,6 +50,7 @@ fixture. %prep %setup -q -n pytest-httpbin-%{version} +%patch0 -p1 %build %python_build