From 895a3a0b7c6f33e1b8a457e8d68950027c725261 Mon Sep 17 00:00:00 2001 From: Marcel Telka Date: Fri, 15 Nov 2024 13:54:47 +0100 Subject: [PATCH] python/elasticsearch: update to 8.16.0 --- components/python/elasticsearch/.gitignore | 2 +- components/python/elasticsearch/Makefile | 4 ++-- .../elasticsearch/patches/01-test-no-search-engine.patch | 8 ++++---- .../python/elasticsearch/patches/03-test-no-packages.patch | 8 ++++---- .../python/elasticsearch/patches/04-no-pyarrow.patch | 14 +++++++------- components/python/elasticsearch/test/results-all.master | 11 +++++++++-- 6 files changed, 27 insertions(+), 20 deletions(-) diff --git a/components/python/elasticsearch/.gitignore b/components/python/elasticsearch/.gitignore index 5172d1c204..69b6c37cbb 100644 --- a/components/python/elasticsearch/.gitignore +++ b/components/python/elasticsearch/.gitignore @@ -1 +1 @@ -/elasticsearch-py-8.15.1/ +/elasticsearch-py-8.16.0/ diff --git a/components/python/elasticsearch/Makefile b/components/python/elasticsearch/Makefile index 501436c7b7..efc699538e 100644 --- a/components/python/elasticsearch/Makefile +++ b/components/python/elasticsearch/Makefile @@ -19,13 +19,13 @@ BUILD_STYLE = pyproject include ../../../make-rules/shared-macros.mk COMPONENT_NAME = elasticsearch -HUMAN_VERSION = 8.15.1 +HUMAN_VERSION = 8.16.0 COMPONENT_SUMMARY = Python client for Elasticsearch COMPONENT_PROJECT_URL = https://github.com/elastic/elasticsearch-py COMPONENT_ARCHIVE_URL = \ https://github.com/elastic/elasticsearch-py/archive/refs/tags/v$(HUMAN_VERSION).tar.gz COMPONENT_ARCHIVE_HASH = \ - sha256:03854c70ff687542d041b1f242e96b4e47fbfd707b7be8ab45821e87daa4a3ba + sha256:ff11e054db75c399746d536cde360803880350eaa3c3ae08a04f1b96e50e13f5 COMPONENT_LICENSE = Apache-2.0 COMPONENT_LICENSE_FILE = LICENSE diff --git a/components/python/elasticsearch/patches/01-test-no-search-engine.patch b/components/python/elasticsearch/patches/01-test-no-search-engine.patch index 5e6748ffc9..c9e09cb728 100644 --- a/components/python/elasticsearch/patches/01-test-no-search-engine.patch +++ b/components/python/elasticsearch/patches/01-test-no-search-engine.patch @@ -2,8 +2,8 @@ es_url() pollutes the output with diagnostic messages when it is unable to connect. Since we do not have the search engine packaged we simply skip all tests that needs the engine. ---- elasticsearch-py-8.15.1/test_elasticsearch/conftest.py.orig -+++ elasticsearch-py-8.15.1/test_elasticsearch/conftest.py +--- elasticsearch-py-8.16.0/test_elasticsearch/conftest.py.orig ++++ elasticsearch-py-8.16.0/test_elasticsearch/conftest.py @@ -26,10 +26,7 @@ @pytest.fixture(scope="session") @@ -16,8 +16,8 @@ tests that needs the engine. @pytest.fixture(scope="session") ---- elasticsearch-py-8.15.1/test_elasticsearch/test_server/test_rest_api_spec.py.orig -+++ elasticsearch-py-8.15.1/test_elasticsearch/test_server/test_rest_api_spec.py +--- elasticsearch-py-8.16.0/test_elasticsearch/test_server/test_rest_api_spec.py.orig ++++ elasticsearch-py-8.16.0/test_elasticsearch/test_server/test_rest_api_spec.py @@ -29,6 +29,7 @@ from typing import Tuple, Union diff --git a/components/python/elasticsearch/patches/03-test-no-packages.patch b/components/python/elasticsearch/patches/03-test-no-packages.patch index 95873be451..1a61fea33c 100644 --- a/components/python/elasticsearch/patches/03-test-no-packages.patch +++ b/components/python/elasticsearch/patches/03-test-no-packages.patch @@ -1,8 +1,8 @@ We do not have these projects packaged yet. ---- elasticsearch-py-8.15.1/pyproject.toml.orig -+++ elasticsearch-py-8.15.1/pyproject.toml -@@ -60,19 +60,14 @@ +--- elasticsearch-py-8.16.0/pyproject.toml.orig ++++ elasticsearch-py-8.16.0/pyproject.toml +@@ -61,19 +61,14 @@ "coverage", "jinja2", "python-dateutil", @@ -15,7 +15,7 @@ We do not have these projects packaged yet. "nox", - "orjson", "numpy", -- "simsimd", +- "simsimd ; python_version<'3.13'", "pyarrow", - "pandas", - "mapbox-vector-tile", diff --git a/components/python/elasticsearch/patches/04-no-pyarrow.patch b/components/python/elasticsearch/patches/04-no-pyarrow.patch index 972b3f9512..8a13334952 100644 --- a/components/python/elasticsearch/patches/04-no-pyarrow.patch +++ b/components/python/elasticsearch/patches/04-no-pyarrow.patch @@ -1,8 +1,8 @@ We have no pyarrow packaged yet. ---- elasticsearch-py-8.15.1/pyproject.toml.orig -+++ elasticsearch-py-8.15.1/pyproject.toml -@@ -67,7 +67,6 @@ +--- elasticsearch-py-8.16.0/pyproject.toml.orig ++++ elasticsearch-py-8.16.0/pyproject.toml +@@ -68,7 +68,6 @@ "build", "nox", "numpy", @@ -10,8 +10,8 @@ We have no pyarrow packaged yet. ] docs = [ "sphinx", ---- elasticsearch-py-8.15.1/test_elasticsearch/test_client/test_deprecated_options.py.orig -+++ elasticsearch-py-8.15.1/test_elasticsearch/test_client/test_deprecated_options.py +--- elasticsearch-py-8.16.0/test_elasticsearch/test_client/test_deprecated_options.py.orig ++++ elasticsearch-py-8.16.0/test_elasticsearch/test_client/test_deprecated_options.py @@ -134,7 +134,6 @@ "application/x-ndjson", "application/json", @@ -28,8 +28,8 @@ We have no pyarrow packaged yet. "application/vnd.elasticsearch+json", "application/vnd.elasticsearch+x-ndjson", "application/cbor", ---- elasticsearch-py-8.15.1/test_elasticsearch/test_client/test_serializers.py.orig -+++ elasticsearch-py-8.15.1/test_elasticsearch/test_client/test_serializers.py +--- elasticsearch-py-8.16.0/test_elasticsearch/test_client/test_serializers.py.orig ++++ elasticsearch-py-8.16.0/test_elasticsearch/test_client/test_serializers.py @@ -94,7 +94,6 @@ "application/json", "text/*", diff --git a/components/python/elasticsearch/test/results-all.master b/components/python/elasticsearch/test/results-all.master index cd0ee4c522..600d5394ad 100644 --- a/components/python/elasticsearch/test/results-all.master +++ b/components/python/elasticsearch/test/results-all.master @@ -8,7 +8,7 @@ cachedir: .pytest_cache rootdir: $(@D) configfile: pyproject.toml asyncio: mode=strict, default_loop_scope=None -collecting ... collected 367 items / 2 skipped +collecting ... collected 374 items / 2 skipped test_elasticsearch/test_async/test_server/test_clients.py::test_indices_analyze_unicode[kwargs0] SKIPPED test_elasticsearch/test_async/test_server/test_clients.py::test_indices_analyze_unicode[kwargs1] SKIPPED @@ -23,6 +23,7 @@ test_elasticsearch/test_async/test_server/test_helpers.py::TestStreamingBulk::te test_elasticsearch/test_async/test_server/test_helpers.py::TestStreamingBulk::test_rejected_documents_are_retried SKIPPED test_elasticsearch/test_async/test_server/test_helpers.py::TestStreamingBulk::test_rejected_documents_are_retried_at_most_max_retries_times SKIPPED test_elasticsearch/test_async/test_server/test_helpers.py::TestStreamingBulk::test_transport_error_is_raised_with_max_retries SKIPPED +test_elasticsearch/test_async/test_server/test_helpers.py::TestStreamingBulk::test_connection_timeout_is_retried_with_retry_status_callback SKIPPED test_elasticsearch/test_async/test_server/test_helpers.py::TestBulk::test_bulk_works_with_single_item SKIPPED test_elasticsearch/test_async/test_server/test_helpers.py::TestBulk::test_all_documents_get_inserted SKIPPED test_elasticsearch/test_async/test_server/test_helpers.py::TestBulk::test_stats_only_reports_numbers SKIPPED @@ -230,6 +231,9 @@ test_elasticsearch/test_client/test_utils.py::test_handles_ascii PASSED test_elasticsearch/test_client/test_utils.py::test_handles_bytestring PASSED test_elasticsearch/test_client/test_utils.py::test_handles_unicode PASSED test_elasticsearch/test_client/test_utils.py::test_handles_unicode2 PASSED +test_elasticsearch/test_client/test_utils.py::TestStabilityWarning::test_default PASSED +test_elasticsearch/test_client/test_utils.py::TestStabilityWarning::test_beta PASSED +test_elasticsearch/test_client/test_utils.py::TestStabilityWarning::test_experimental PASSED test_elasticsearch/test_exceptions.py::TestTransformError::test_transform_error_parse_with_error_reason PASSED test_elasticsearch/test_exceptions.py::TestTransformError::test_transform_error_parse_with_error_string PASSED test_elasticsearch/test_helpers.py::TestParallelBulk::test_all_chunks_sent PASSED @@ -243,6 +247,8 @@ test_elasticsearch/test_helpers.py::TestChunkActions::test_chunks_are_chopped_by test_elasticsearch/test_helpers.py::TestChunkActions::test_chunks_are_chopped_by_byte_size_properly PASSED test_elasticsearch/test_helpers.py::TestExpandActions::test_string_actions_are_marked_as_simple_inserts[whatever0] PASSED test_elasticsearch/test_helpers.py::TestExpandActions::test_string_actions_are_marked_as_simple_inserts[whatever1] PASSED +test_elasticsearch/test_helpers.py::test_serialize_bulk_index_error PASSED +test_elasticsearch/test_helpers.py::test_serialize_scan_error PASSED test_elasticsearch/test_otel.py::test_enabled SKIPPED (TEST_WITH_OTE...) test_elasticsearch/test_otel.py::test_minimal_span SKIPPED (TEST_WIT...) test_elasticsearch/test_otel.py::test_detailed_span SKIPPED (TEST_WI...) @@ -261,6 +267,7 @@ test_elasticsearch/test_server/test_helpers.py::test_bulk_rejected_documents_are test_elasticsearch/test_server/test_helpers.py::test_bulk_rejected_documents_are_retried_when_bytes_or_string[True] SKIPPED test_elasticsearch/test_server/test_helpers.py::test_bulk_rejected_documents_are_retried_at_most_max_retries_times SKIPPED test_elasticsearch/test_server/test_helpers.py::test_bulk_transport_error_is_raised_with_max_retries SKIPPED +test_elasticsearch/test_server/test_helpers.py::test_connection_timeout_is_retried_with_retry_status_callback SKIPPED test_elasticsearch/test_server/test_helpers.py::test_bulk_works_with_single_item SKIPPED test_elasticsearch/test_server/test_helpers.py::test_all_documents_get_inserted SKIPPED test_elasticsearch/test_server/test_helpers.py::test_stats_only_reports_numbers SKIPPED @@ -472,4 +479,4 @@ test_elasticsearch/test_transport.py::TestTransport::test_sniffing_disabled_on_e Elasticsearch( -- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html -======== 223 passed, 146 skipped, 26 warnings ======== +======== 228 passed, 148 skipped, 26 warnings ======== -- 2.11.4.GIT