Accepting request 1009965 from devel:languages:python
- Add patch remove-mock.patch: * Remove use of mock. OBS-URL: https://build.opensuse.org/request/show/1009965 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-kafka-python?expand=0&rev=10
This commit is contained in:
commit
c695ae4c97
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Oct 12 02:26:13 UTC 2022 - Steve Kowalik <steven.kowalik@suse.com>
|
||||||
|
|
||||||
|
- Add patch remove-mock.patch:
|
||||||
|
* Remove use of mock.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Sep 6 14:12:44 UTC 2022 - John Vandenberg <jayvdb@gmail.com>
|
Tue Sep 6 14:12:44 UTC 2022 - John Vandenberg <jayvdb@gmail.com>
|
||||||
|
|
||||||
|
@ -29,6 +29,8 @@ Source1: https://raw.githubusercontent.com/dpkp/kafka-python/master/serve
|
|||||||
Source2: https://raw.githubusercontent.com/dpkp/kafka-python/master/test/conftest.py
|
Source2: https://raw.githubusercontent.com/dpkp/kafka-python/master/test/conftest.py
|
||||||
Source3: https://raw.githubusercontent.com/dpkp/kafka-python/master/test/fixtures.py
|
Source3: https://raw.githubusercontent.com/dpkp/kafka-python/master/test/fixtures.py
|
||||||
Source4: https://raw.githubusercontent.com/dpkp/kafka-python/master/test/service.py
|
Source4: https://raw.githubusercontent.com/dpkp/kafka-python/master/test/service.py
|
||||||
|
# PATCH-FIX-OPENSUSE Remove use of mock module
|
||||||
|
Patch0: remove-mock.patch
|
||||||
BuildRequires: %{python_module setuptools}
|
BuildRequires: %{python_module setuptools}
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: python-rpm-macros
|
BuildRequires: python-rpm-macros
|
||||||
@ -39,7 +41,6 @@ Suggests: python-xxhash
|
|||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
# SECTION test requirements
|
# SECTION test requirements
|
||||||
BuildRequires: %{python_module lz4}
|
BuildRequires: %{python_module lz4}
|
||||||
BuildRequires: %{python_module mock}
|
|
||||||
BuildRequires: %{python_module pytest-mock}
|
BuildRequires: %{python_module pytest-mock}
|
||||||
BuildRequires: %{python_module pytest}
|
BuildRequires: %{python_module pytest}
|
||||||
BuildRequires: %{python_module python-snappy}
|
BuildRequires: %{python_module python-snappy}
|
||||||
@ -55,7 +56,7 @@ protocol as well as broker-aware request routing. Gzip and Snappy compression
|
|||||||
is also supported for message sets.
|
is also supported for message sets.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n kafka-python-%{version}
|
%autosetup -p1 -n kafka-python-%{version}
|
||||||
mkdir -p servers/0.11.0.2/resources/
|
mkdir -p servers/0.11.0.2/resources/
|
||||||
cp %{SOURCE1} servers/0.11.0.2/resources/
|
cp %{SOURCE1} servers/0.11.0.2/resources/
|
||||||
|
|
||||||
|
32
remove-mock.patch
Normal file
32
remove-mock.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
Index: kafka-python-2.0.2/test/test_consumer_integration.py
|
||||||
|
===================================================================
|
||||||
|
--- kafka-python-2.0.2.orig/test/test_consumer_integration.py
|
||||||
|
+++ kafka-python-2.0.2/test/test_consumer_integration.py
|
||||||
|
@@ -1,7 +1,10 @@
|
||||||
|
import logging
|
||||||
|
import time
|
||||||
|
|
||||||
|
-from mock import patch
|
||||||
|
+try:
|
||||||
|
+ from unittest.mock import patch
|
||||||
|
+except ImportError:
|
||||||
|
+ from mock import patch
|
||||||
|
import pytest
|
||||||
|
from kafka.vendor.six.moves import range
|
||||||
|
|
||||||
|
Index: kafka-python-2.0.2/test/test_conn.py
|
||||||
|
===================================================================
|
||||||
|
--- kafka-python-2.0.2.orig/test/test_conn.py
|
||||||
|
+++ kafka-python-2.0.2/test/test_conn.py
|
||||||
|
@@ -4,7 +4,10 @@ from __future__ import absolute_import
|
||||||
|
from errno import EALREADY, EINPROGRESS, EISCONN, ECONNRESET
|
||||||
|
import socket
|
||||||
|
|
||||||
|
-import mock
|
||||||
|
+try:
|
||||||
|
+ from unittest import mock
|
||||||
|
+except ImportError:
|
||||||
|
+ import mock
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
from kafka.conn import BrokerConnection, ConnectionStates, collect_hosts
|
Loading…
Reference in New Issue
Block a user