Marcel Telka
2024-03-28 8d9f476ec7f10b78fa896436bc3df54458cf6879
python/elasticsearch: update to 8.13.0

7 files modified
85 ■■■■■ changed files
components/python/elasticsearch/Makefile 9 ●●●● patch | view | raw | blame | history
components/python/elasticsearch/elasticsearch-PYVER.p5m 1 ●●●● patch | view | raw | blame | history
components/python/elasticsearch/manifests/sample-manifest.p5m 1 ●●●● patch | view | raw | blame | history
components/python/elasticsearch/patches/01-test-no-search-engine.patch 8 ●●●● patch | view | raw | blame | history
components/python/elasticsearch/patches/03-test-no-packages.patch 24 ●●●●● patch | view | raw | blame | history
components/python/elasticsearch/python-integrate-project.conf 3 ●●●●● patch | view | raw | blame | history
components/python/elasticsearch/test/results-all.master 39 ●●●● patch | view | raw | blame | history
components/python/elasticsearch/Makefile
@@ -19,13 +19,13 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME =        elasticsearch
HUMAN_VERSION =            8.12.1
HUMAN_VERSION =            8.13.0
COMPONENT_SUMMARY =        elasticsearch - 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:05c9969be37fb03aa14d166e06b51ee4255080d751ce109beb188507ddc0833d
    sha256:82c0bca576eeaeb62dbaf63bab51119a40e2b77d3b1a8a410cf4959e4f6eb187
COMPONENT_LICENSE =        Apache-2.0
COMPONENT_LICENSE_FILE =    LICENSE
@@ -39,6 +39,9 @@
# manually.
TEST_REQUIREMENTS += dev-requirements.txt
# We do not have orjson
PYTEST_ADDOPTS += --ignore test_elasticsearch/test_serializer.py
# Auto-generated dependencies
PYTHON_REQUIRED_PACKAGES += library/python/elastic-transport
PYTHON_REQUIRED_PACKAGES += runtime/python
@@ -50,6 +53,7 @@
TEST_REQUIRED_PACKAGES.python += library/python/isort
TEST_REQUIRED_PACKAGES.python += library/python/jinja2
TEST_REQUIRED_PACKAGES.python += library/python/nox
TEST_REQUIRED_PACKAGES.python += library/python/numpy
TEST_REQUIRED_PACKAGES.python += library/python/pytest
TEST_REQUIRED_PACKAGES.python += library/python/pytest-asyncio
TEST_REQUIRED_PACKAGES.python += library/python/pytest-cov
@@ -57,5 +61,6 @@
TEST_REQUIRED_PACKAGES.python += library/python/pyyaml
TEST_REQUIRED_PACKAGES.python += library/python/requests
TEST_REQUIRED_PACKAGES.python += library/python/sphinx
TEST_REQUIRED_PACKAGES.python += library/python/sphinx-autodoc-typehints
TEST_REQUIRED_PACKAGES.python += library/python/sphinx-rtd-theme
TEST_REQUIRED_PACKAGES.python += library/python/twine
components/python/elasticsearch/elasticsearch-PYVER.p5m
@@ -73,6 +73,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_async/client/watcher.py
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_async/client/xpack.py
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_async/helpers.py
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_otel.py
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_sync/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_sync/client/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_sync/client/_base.py
components/python/elasticsearch/manifests/sample-manifest.p5m
@@ -73,6 +73,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_async/client/watcher.py
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_async/client/xpack.py
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_async/helpers.py
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_otel.py
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_sync/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_sync/client/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_sync/client/_base.py
components/python/elasticsearch/patches/01-test-no-search-engine.patch
@@ -2,8 +2,8 @@
connect.  Since we do not have the search engine packaged we simply skip all
tests that needs the engine.
--- elasticsearch-py-8.12.1/test_elasticsearch/conftest.py.orig
+++ elasticsearch-py-8.12.1/test_elasticsearch/conftest.py
--- elasticsearch-py-8.13.0/test_elasticsearch/conftest.py.orig
+++ elasticsearch-py-8.13.0/test_elasticsearch/conftest.py
@@ -26,10 +26,7 @@
 
 @pytest.fixture(scope="session")
@@ -16,8 +16,8 @@
 
 
 @pytest.fixture(scope="session")
--- elasticsearch-py-8.12.1/test_elasticsearch/test_server/test_rest_api_spec.py.orig
+++ elasticsearch-py-8.12.1/test_elasticsearch/test_server/test_rest_api_spec.py
--- elasticsearch-py-8.13.0/test_elasticsearch/test_server/test_rest_api_spec.py.orig
+++ elasticsearch-py-8.13.0/test_elasticsearch/test_server/test_rest_api_spec.py
@@ -30,6 +30,7 @@
 from typing import Tuple, Union
 
components/python/elasticsearch/patches/03-test-no-packages.patch
@@ -1,7 +1,7 @@
We have no these projects packaged yet.
We do not have these projects packaged yet.
--- elasticsearch-py-8.12.1/dev-requirements.txt.orig
+++ elasticsearch-py-8.12.1/dev-requirements.txt
--- elasticsearch-py-8.13.0/dev-requirements.txt.orig
+++ elasticsearch-py-8.13.0/dev-requirements.txt
@@ -7,7 +7,6 @@
 coverage
 jinja2
@@ -10,19 +10,15 @@
 pyyaml>=5.4
 isort
 black
@@ -15,15 +14,6 @@
 build
@@ -16,11 +15,7 @@
 nox
 
-numpy
 numpy
-pandas
-
-orjson
-# Testing the 'search_mvt' API response
-mapbox-vector-tile
-# Python 3.7 gets an old version of mapbox-vector-tile, requiring an
-# old version of protobuf
-protobuf<4; python_version<="3.7"
-
 # Docs
 # Override Read the Docs default (sphinx<2 and sphinx-rtd-theme<0.5)
 sphinx>2
 # Python 3.7 gets an old version of mapbox-vector-tile, requiring an
 # old version of protobuf
 protobuf<4; python_version<="3.7"
components/python/elasticsearch/python-integrate-project.conf
@@ -26,3 +26,6 @@
# This project does not support tox so we need to provide test requirements
# manually.
TEST_REQUIREMENTS += dev-requirements.txt
# We do not have orjson
PYTEST_ADDOPTS += --ignore test_elasticsearch/test_serializer.py
components/python/elasticsearch/test/results-all.master
@@ -4,8 +4,9 @@
rootdir: $(@D)
configfile: setup.cfg
asyncio: mode=strict
collecting ... collected 349 items / 2 skipped
collecting ... collected 331 items / 2 skipped
not set)
test_elasticsearch/test_async/test_server/test_clients.py::test_bulk_works_with_bytestring_body SKIPPED
test_elasticsearch/test_async/test_server/test_clients.py::test_bulk_works_with_string_body SKIPPED
test_elasticsearch/test_async/test_server/test_clients.py::test_indices_analyze_unicode[kwargs0] SKIPPED
@@ -238,28 +239,9 @@
test_elasticsearch/test_helpers.py::TestExpandActions::test_string_actions_are_marked_as_simple_inserts[whatever1] PASSED
test_elasticsearch/test_helpers.py::TestParallelBulk::test_all_chunks_sent PASSED
test_elasticsearch/test_helpers.py::TestParallelBulk::test_chunk_sent_from_different_threads PASSED
test_elasticsearch/test_serializer.py::TestDeserializer::test_deserialize_compatibility_header PASSED
test_elasticsearch/test_serializer.py::TestDeserializer::test_deserializes_json_by_default PASSED
test_elasticsearch/test_serializer.py::TestDeserializer::test_deserializes_text_with_correct_ct[{"some":"data"}0] PASSED
test_elasticsearch/test_serializer.py::TestDeserializer::test_deserializes_text_with_correct_ct[{"some":"data"}1] PASSED
test_elasticsearch/test_serializer.py::test_datetime_serialization PASSED
test_elasticsearch/test_serializer.py::test_decimal_serialization PASSED
test_elasticsearch/test_serializer.py::test_json_raises_serialization_error_on_dump_error PASSED
test_elasticsearch/test_serializer.py::test_raises_serialization_error_on_load_error PASSED
test_elasticsearch/test_serializer.py::test_raises_serialization_error_pandas_nat SKIPPED
test_elasticsearch/test_serializer.py::test_serializes_numpy_bool SKIPPED
test_elasticsearch/test_serializer.py::test_serializes_numpy_datetime SKIPPED
test_elasticsearch/test_serializer.py::test_serializes_numpy_floats SKIPPED
test_elasticsearch/test_serializer.py::test_serializes_numpy_integers SKIPPED
test_elasticsearch/test_serializer.py::test_serializes_numpy_nan_to_nan SKIPPED
test_elasticsearch/test_serializer.py::test_serializes_numpy_ndarray SKIPPED
test_elasticsearch/test_serializer.py::test_serializes_pandas_category SKIPPED
test_elasticsearch/test_serializer.py::test_serializes_pandas_na SKIPPED
test_elasticsearch/test_serializer.py::test_serializes_pandas_series SKIPPED
test_elasticsearch/test_serializer.py::test_serializes_pandas_timestamp SKIPPED
test_elasticsearch/test_serializer.py::test_strings_are_left_untouched PASSED
test_elasticsearch/test_serializer.py::test_text_raises_serialization_error_on_dump_error PASSED
test_elasticsearch/test_serializer.py::test_uuid_serialization PASSED
test_elasticsearch/test_otel.py::test_detailed_span SKIPPED
test_elasticsearch/test_otel.py::test_enabled SKIPPED (TEST_WITH_OTEL is
test_elasticsearch/test_otel.py::test_minimal_span SKIPPED
test_elasticsearch/test_server/test_clients.py::test_bulk_works_with_bytestring_body SKIPPED
test_elasticsearch/test_server/test_clients.py::test_bulk_works_with_string_body SKIPPED
test_elasticsearch/test_server/test_clients.py::test_indices_analyze_unicode[kwargs0] SKIPPED
@@ -312,6 +294,7 @@
test_elasticsearch/test_server/test_mapbox_vector_tile.py::test_mapbox_vector_tile_error[urllib3] SKIPPED
test_elasticsearch/test_server/test_mapbox_vector_tile.py::test_mapbox_vector_tile_response[requests] SKIPPED
test_elasticsearch/test_server/test_mapbox_vector_tile.py::test_mapbox_vector_tile_response[urllib3] SKIPPED
test_elasticsearch/test_server/test_otel.py::test_otel_end_to_end SKIPPED
test_elasticsearch/test_server/test_responses.py::test_exists_response SKIPPED
test_elasticsearch/test_server/test_responses.py::test_object_response SKIPPED
test_elasticsearch/test_server/test_responses.py::test_text_response SKIPPED
@@ -357,8 +340,8 @@
test_elasticsearch/test_transport.py::test_warning_header[headers1] PASSED
=============================== warnings summary ===============================
../../../../../../../..$(PYTHON_DIR)/vendor-packages/_pytest/fixtures.py:1322
  $(PYTHON_DIR)/vendor-packages/_pytest/fixtures.py:1322: PytestRemovedIn9Warning: Marks applied to fixtures have no effect
../../../../../../../..$(PYTHON_DIR)/vendor-packages/_pytest/fixtures.py:1314
  $(PYTHON_DIR)/vendor-packages/_pytest/fixtures.py:1314: PytestRemovedIn9Warning: Marks applied to fixtures have no effect
  See docs: https://docs.pytest.org/en/stable/deprecations.html#applying-a-mark-to-a-fixture-function
    return fixture_marker(fixture_function)
@@ -407,11 +390,11 @@
    AsyncElasticsearch(
test_elasticsearch/test_client/test_options.py::TestOptions::test_user_agent_override
  $(@D)/test_elasticsearch/test_client/test_options.py:344: DeprecationWarning: Passing transport options in the API method is deprecated. Use 'Elasticsearch.options()' instead.
  $(@D)/test_elasticsearch/test_client/test_options.py:351: DeprecationWarning: Passing transport options in the API method is deprecated. Use 'Elasticsearch.options()' instead.
    client.indices.get(index="2", headers={"user-agent": "custom2"})
test_elasticsearch/test_client/test_options.py::TestOptions::test_user_agent_override
  $(@D)/test_elasticsearch/test_client/test_options.py:365: DeprecationWarning: Passing transport options in the API method is deprecated. Use 'Elasticsearch.options()' instead.
  $(@D)/test_elasticsearch/test_client/test_options.py:372: DeprecationWarning: Passing transport options in the API method is deprecated. Use 'Elasticsearch.options()' instead.
    client.indices.get(index="2", headers={"user-agent": "custom4"})
test_elasticsearch/test_client/test_rewrite_parameters.py::TestRewriteParameters::test_default_params_conflict
@@ -456,4 +439,4 @@
-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
======== 229 passed, 122 skipped, 27 warnings ========
======== 218 passed, 115 skipped, 27 warnings ========