Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-elasticsearch for
openSUSE:Factory checked in at 2022-05-24 20:31:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-elasticsearch (Old)
and /work/SRC/openSUSE:Factory/.python-elasticsearch.new.2254 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-elasticsearch"
Tue May 24 20:31:01 2022 rev:11 rq:978728 version:7.6.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-elasticsearch/python-elasticsearch.changes
2020-08-25 12:37:54.469404749 +0200
+++
/work/SRC/openSUSE:Factory/.python-elasticsearch.new.2254/python-elasticsearch.changes
2022-05-24 20:31:18.106915919 +0200
@@ -1,0 +2,8 @@
+Mon May 23 12:08:05 UTC 2022 - [email protected]
+
+- do not require python-mock for build
+- added patches
+ fix https://github.com/elastic/elasticsearch-py/issues/1983
+ + python-elasticsearch-no-mock.patch
+
+-------------------------------------------------------------------
New:
----
python-elasticsearch-no-mock.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-elasticsearch.spec ++++++
--- /var/tmp/diff_new_pack.W05Mu7/_old 2022-05-24 20:31:18.706916454 +0200
+++ /var/tmp/diff_new_pack.W05Mu7/_new 2022-05-24 20:31:18.714916461 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-elasticsearch
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,9 +25,10 @@
Group: Development/Languages/Python
URL: https://github.com/elastic/elasticsearch-py
Source:
https://github.com/elastic/elasticsearch-py/archive/%{version}.tar.gz
+# https://github.com/elastic/elasticsearch-py/issues/1983
+Patch0: python-elasticsearch-no-mock.patch
BuildRequires: %{python_module certifi}
BuildRequires: %{python_module coverage}
-BuildRequires: %{python_module mock}
BuildRequires: %{python_module pyaml}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module requests >= 2.0.0}
@@ -49,6 +50,7 @@
%setup -q -n elasticsearch-py-%{version}
rm README.rst
sed -i 's/from nose.plugins.skip import SkipTest/from unittest import
SkipTest/' test_elasticsearch/test_helpers.py
+%patch0 -p1
%build
%python_build
++++++ python-elasticsearch-no-mock.patch ++++++
diff -upr elasticsearch-py-7.6.0.orig/test_elasticsearch/test_connection.py
elasticsearch-py-7.6.0/test_elasticsearch/test_connection.py
--- elasticsearch-py-7.6.0.orig/test_elasticsearch/test_connection.py
2022-05-23 13:53:49.850202688 +0200
+++ elasticsearch-py-7.6.0/test_elasticsearch/test_connection.py
2022-05-23 13:53:49.862202756 +0200
@@ -2,7 +2,7 @@ import re
import ssl
import gzip
import io
-from mock import Mock, patch
+from unittest.mock import Mock, patch
import urllib3
import warnings
from requests.auth import AuthBase
diff -upr elasticsearch-py-7.6.0.orig/test_elasticsearch/test_helpers.py
elasticsearch-py-7.6.0/test_elasticsearch/test_helpers.py
--- elasticsearch-py-7.6.0.orig/test_elasticsearch/test_helpers.py
2022-05-23 13:53:49.846202666 +0200
+++ elasticsearch-py-7.6.0/test_elasticsearch/test_helpers.py 2022-05-23
13:53:49.862202756 +0200
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-import mock
+from unittest import mock
import time
import threading
from unittest import SkipTest
diff -upr
elasticsearch-py-7.6.0.orig/test_elasticsearch/test_server/test_helpers.py
elasticsearch-py-7.6.0/test_elasticsearch/test_server/test_helpers.py
--- elasticsearch-py-7.6.0.orig/test_elasticsearch/test_server/test_helpers.py
2022-05-23 13:53:49.846202666 +0200
+++ elasticsearch-py-7.6.0/test_elasticsearch/test_server/test_helpers.py
2022-05-23 13:53:49.862202756 +0200
@@ -1,4 +1,4 @@
-from mock import patch
+from unittest.mock import patch
from elasticsearch import helpers, TransportError
from elasticsearch.helpers import ScanError
diff -upr elasticsearch-py-7.6.0.orig/test_elasticsearch/test_transport.py
elasticsearch-py-7.6.0/test_elasticsearch/test_transport.py
--- elasticsearch-py-7.6.0.orig/test_elasticsearch/test_transport.py
2022-05-23 13:53:49.850202688 +0200
+++ elasticsearch-py-7.6.0/test_elasticsearch/test_transport.py 2022-05-23
13:53:49.862202756 +0200
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
import time
-from mock import patch
+from unittest.mock import patch
from elasticsearch.transport import Transport, get_host_info
from elasticsearch.connection import Connection
