diff --git a/elasticsearch-py-8.3.3.tar.gz b/elasticsearch-py-8.3.3.tar.gz new file mode 100644 index 0000000..0352b78 --- /dev/null +++ b/elasticsearch-py-8.3.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b04930ff043894738e835ef6f6cc172f2e4929d3338263f6e650ef0fed76a93 +size 514532 diff --git a/elasticsearch-py-8.4.3.tar.gz b/elasticsearch-py-8.4.3.tar.gz deleted file mode 100644 index 07578cd..0000000 --- a/elasticsearch-py-8.4.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2528308183c9f88b460f742084e20f793b8cc7a0271d36250efcaaedbf8c224 -size 516311 diff --git a/python-elasticsearch-no-mock.patch b/python-elasticsearch-no-mock.patch new file mode 100644 index 0000000..169282e --- /dev/null +++ b/python-elasticsearch-no-mock.patch @@ -0,0 +1,39 @@ +Index: elasticsearch-py-8.3.3/test_elasticsearch/test_helpers.py +=================================================================== +--- elasticsearch-py-8.3.3.orig/test_elasticsearch/test_helpers.py ++++ elasticsearch-py-8.3.3/test_elasticsearch/test_helpers.py +@@ -19,7 +19,7 @@ + import threading + import time + +-import mock ++from unittest import mock + import pytest + + from elasticsearch import Elasticsearch, helpers +Index: elasticsearch-py-8.3.3/test_elasticsearch/test_server/test_helpers.py +=================================================================== +--- elasticsearch-py-8.3.3.orig/test_elasticsearch/test_server/test_helpers.py ++++ elasticsearch-py-8.3.3/test_elasticsearch/test_server/test_helpers.py +@@ -21,7 +21,7 @@ from datetime import datetime, timedelta + import pytest + from dateutil import tz + from elastic_transport import ApiResponseMeta, ObjectApiResponse +-from mock import call, patch ++from unittest.mock import call, patch + + from elasticsearch import ApiError, helpers + from elasticsearch.helpers import ScanError +Index: elasticsearch-py-8.3.3/test_elasticsearch/test_async/test_server/test_helpers.py +=================================================================== +--- elasticsearch-py-8.3.3.orig/test_elasticsearch/test_async/test_server/test_helpers.py ++++ elasticsearch-py-8.3.3/test_elasticsearch/test_async/test_server/test_helpers.py +@@ -20,7 +20,7 @@ from datetime import datetime, timedelta + + import pytest + from elastic_transport import ApiResponseMeta, ObjectApiResponse +-from mock import MagicMock, call, patch ++from unittest.mock import MagicMock, call, patch + + from elasticsearch import helpers + from elasticsearch.exceptions import ApiError diff --git a/python-elasticsearch.changes b/python-elasticsearch.changes index fd95e79..37050ea 100644 --- a/python-elasticsearch.changes +++ b/python-elasticsearch.changes @@ -1,20 +1,3 @@ -------------------------------------------------------------------- -Mon Oct 17 21:13:04 UTC 2022 - Matej Cepl - -- Update to 8.4.3: - - Client is compatible with Elasticsearch 8.4.3 - - Added the error_trace, filter_path, human and pretty - parameters to the get_source API. - - Added the ext parameter to the search API. - - Added the ext parameter to the async_search.submit API. - - Added the ext parameter to the fleet.search API. - - Added the knn parameter to the search API. - - Added the knn parameter to the async_search.submit API. - - Added the cache_size parameter to the - ml.start_trained_model_deployment API. - - Added the security.update_api_key API. -- Remove upstreamed python-elasticsearch-no-mock.patch. - ------------------------------------------------------------------- Thu Aug 18 16:35:28 UTC 2022 - Ben Greiner diff --git a/python-elasticsearch.spec b/python-elasticsearch.spec index 3ede470..dad6566 100644 --- a/python-elasticsearch.spec +++ b/python-elasticsearch.spec @@ -16,15 +16,18 @@ # +%{?!python_module:%define python_module() python3-%{**}} %define skip_python2 1 Name: python-elasticsearch -Version: 8.4.3 +Version: 8.3.3 Release: 0 Summary: Python client for Elasticsearch License: Apache-2.0 Group: Development/Languages/Python URL: https://github.com/elastic/elasticsearch-py Source: https://github.com/elastic/elasticsearch-py/archive/refs/tags/v%{version}.tar.gz#/elasticsearch-py-%{version}.tar.gz +# https://github.com/elastic/elasticsearch-py/issues/1983 +Patch0: python-elasticsearch-no-mock.patch BuildRequires: %{python_module elastic-transport >= 8 with %python-elastic-transport < 9} BuildRequires: %{python_module setuptools} BuildRequires: fdupes