From 8fd8979b71a4c00a18c3e04be92d0bb54abff74e88b847eb691d2e89a80f1d84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 3 May 2024 20:33:36 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main python-elasticsearch revision 6b308ffa182ffa195b45083039a14bca --- .gitattributes | 23 ++ 7.6.0.tar.gz | 3 + python-elasticsearch-no-mock.patch | 46 ++++ python-elasticsearch-no-nose.patch | 77 ++++++ python-elasticsearch.changes | 387 +++++++++++++++++++++++++++++ python-elasticsearch.spec | 79 ++++++ 6 files changed, 615 insertions(+) create mode 100644 .gitattributes create mode 100644 7.6.0.tar.gz create mode 100644 python-elasticsearch-no-mock.patch create mode 100644 python-elasticsearch-no-nose.patch create mode 100644 python-elasticsearch.changes create mode 100644 python-elasticsearch.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/7.6.0.tar.gz b/7.6.0.tar.gz new file mode 100644 index 0000000..064221c --- /dev/null +++ b/7.6.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20b6b2ec5f429ef7d102fb8af61fe4a244e1f44a450ec3bceaf1c8058eeefde3 +size 120271 diff --git a/python-elasticsearch-no-mock.patch b/python-elasticsearch-no-mock.patch new file mode 100644 index 0000000..0b6875b --- /dev/null +++ b/python-elasticsearch-no-mock.patch @@ -0,0 +1,46 @@ +--- + test_elasticsearch/test_connection.py | 2 +- + test_elasticsearch/test_helpers.py | 2 +- + test_elasticsearch/test_server/test_helpers.py | 2 +- + test_elasticsearch/test_transport.py | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +--- a/test_elasticsearch/test_connection.py ++++ b/test_elasticsearch/test_connection.py +@@ -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 +--- a/test_elasticsearch/test_helpers.py ++++ b/test_elasticsearch/test_helpers.py +@@ -1,5 +1,5 @@ + # -*- coding: utf-8 -*- +-import mock ++from unittest import mock + import time + import threading + from unittest import SkipTest +--- a/test_elasticsearch/test_server/test_helpers.py ++++ b/test_elasticsearch/test_server/test_helpers.py +@@ -1,4 +1,4 @@ +-from mock import patch ++from unittest.mock import patch + + from elasticsearch import helpers, TransportError + from elasticsearch.helpers import ScanError +--- a/test_elasticsearch/test_transport.py ++++ b/test_elasticsearch/test_transport.py +@@ -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 diff --git a/python-elasticsearch-no-nose.patch b/python-elasticsearch-no-nose.patch new file mode 100644 index 0000000..a2f86b9 --- /dev/null +++ b/python-elasticsearch-no-nose.patch @@ -0,0 +1,77 @@ +--- + dev-requirements.txt | 2 -- + setup.py | 2 -- + test_elasticsearch/run_tests.py | 13 ++----------- + test_elasticsearch/test_helpers.py | 2 +- + 4 files changed, 3 insertions(+), 16 deletions(-) + +--- a/dev-requirements.txt ++++ b/dev-requirements.txt +@@ -1,8 +1,6 @@ + requests>=2, <3 +-nose + coverage + mock +-nosexcover + sphinx<1.7 + sphinx_rtd_theme + jinja2 +--- a/setup.py ++++ b/setup.py +@@ -13,11 +13,9 @@ with open(join(dirname(__file__), "READM + install_requires = ["urllib3>=1.21.1"] + tests_require = [ + "requests>=2.0.0, <3.0.0", +- "nose", + "coverage", + "mock", + "pyyaml", +- "nosexcover", + ] + + docs_require = ["sphinx<1.7", "sphinx_rtd_theme"] +--- a/test_elasticsearch/run_tests.py ++++ b/test_elasticsearch/run_tests.py +@@ -6,7 +6,7 @@ from os import environ + from os.path import dirname, join, pardir, abspath, exists + import subprocess + +-import nose ++import unittest + + + def fetch_es_repo(): +@@ -64,21 +64,12 @@ def run_all(argv=None): + # fetch yaml tests + fetch_es_repo() + +- # always insert coverage when running tests + if argv is None: + argv = [ +- "nosetests", +- "--with-xunit", +- "--with-xcoverage", +- "--cover-package=elasticsearch", +- "--cover-erase", +- "--logging-filter=elasticsearch", +- "--logging-level=DEBUG", + "--verbose", +- "--with-id", + ] + +- nose.run_exit(argv=argv, defaultTest=abspath(dirname(__file__))) ++ unittest.main(argv=argv, defaultTest=abspath(dirname(__file__))) + + + if __name__ == "__main__": +--- a/test_elasticsearch/test_helpers.py ++++ b/test_elasticsearch/test_helpers.py +@@ -2,7 +2,7 @@ + import mock + import time + import threading +-from nose.plugins.skip import SkipTest ++from unittest import SkipTest + from elasticsearch import helpers, Elasticsearch + from elasticsearch.serializer import JSONSerializer + diff --git a/python-elasticsearch.changes b/python-elasticsearch.changes new file mode 100644 index 0000000..f6b2c8d --- /dev/null +++ b/python-elasticsearch.changes @@ -0,0 +1,387 @@ +------------------------------------------------------------------- +Fri Apr 21 12:24:36 UTC 2023 - Dirk Müller + +- add sle15_python_module_pythons (jsc#PED-68) + +------------------------------------------------------------------- +Thu Apr 13 22:41:05 UTC 2023 - Matej Cepl + +- Make calling of %{sle15modernpython} optional. + +------------------------------------------------------------------- +Tue Oct 18 10:04:37 UTC 2022 - Matej Cepl + +- Revert back to 7.6.0. elasticsearch-dsl is not compatible with + 8.* releases (gh#elastic/elasticsearch-dsl-py#1569). +- Add python-elasticsearch-no-nose.patch to replace sed call in + SPEC file. + +------------------------------------------------------------------- +Thu Aug 18 16:35:28 UTC 2022 - Ben Greiner + +- Update to 8.3.3 + * Client is compatible with Elasticsearch 8.3.3 +- Release 8.3.2 + + Security + * Added the refresh parameter to the + security.create_service_token API. +- Release 8.3.1 + + Security + * Added the experimental security.has_privileges_user_profile + API + * Added the hint parameter to the experimental + security.suggest_user_profiles API +- Release 8.3.0 + * Client is compatible with Elasticsearch 8.3.0 +- Release 8.2.3 + + Documents + * Added the routing parameter to the msearch API. + + CAT + * Added the cat.component_templates API. + + Ingest + * Added the if_version parameter to the ingest.put_pipeline + API. + + Security + * Changed the name parameter for the + security.create_service_token API from required to optional. + * Added the refresh parameter to the + security.create_service_token API. + * Changed the name of access parameter to the labels parameter + in the security.update_user_profile_data API. + + Shutdown + * Added the timeout and master_timeout parameters to the + shutdown.get_node, shutdown.delete_node, and + shutdown.put_node APIs. + * Added the reason, type, allocation_delay, and + target_node_name parameters to the shutdown.put_node API. +- Release 8.2.2 + * Client is compatible with Elasticsearch 8.2.2 +- Release 8.2.1 + + Machine Learning + * Added the inference_config parameter to the + ml.infer_trained_model_deployment API +- Release 8.2.0 + + Client + * Re-introduced support for passing requests.auth.BaseAuth + objects to the http_auth parameter which was available in + 7.x. + + Search + * Added the filter parameter to the experimental knn_search API + + Documents + * Changed the source and dest parameters for the reindex API + from optional to required + + Indices + * Added the indices.field_usage_stats API + * Added the indices.modify_data_stream API + * Added the fields and types parameters to the field_caps API + * Added the ignore_unvailable parameter to the + open_point_in_time API + * Added the master_timeout and timeout parameters to the + indices.delete API + * Added the features parameter to the indices.get API + + Machine Learning + * Added the ml.get_memory_stats API + + Migrations + * Added the migrations.get_feature_upgrade_status API + * Added the migrations.post_feature_upgrade API + + Nodes + * Added the nodes.clear_repositories_metering_archive API + * Added the nodes.get_repositories_metering_info API + + Security + * Added the beta security.activate_user_profile API + * Added the beta security.disable_user_profile API + * Added the beta security.enable_user_profile API + * Added the beta security.get_user_profile API + * Added the beta security.suggest_user_profiles API + * Added the beta security.update_user_profile_data API + + SQL + * Added the catalog, index_using_frozen, keep_alive, + keep_on_completion, runtime_mappings, and + wait_for_completion_timeout parameters to the sql.query API +- Release 8.1.2 + * Client is compatible with Elasticsearch 8.1.2 +- Release 8.1.1 + + Documents + * Changed the source and dest parameters of the reindex API to + be required. + + Mappings + * Changed the fields parameter of the field_caps API to be + required. +- Release 8.1.0 + + Transforms + * Added the transform.reset_transform API +- Release 8.0.0 + + Added + * Added the top-level .options() method to Elasticsearch and + AsyncElasticsearch for modifying transport options. + * Added parameters corresponding to JSON request body fields + for all APIs + * Added basic_auth parameter for specifying username and + password authentication + * Added bearer_auth parameter for specifying an HTTP bearer + token or service token + * Added the meta property to ApiError to access the HTTP + response metadata of an error. + * Added a check that a compatible version of the + elastic-transport package is installed. + * Changed + * Changed the transport layer to use the elastic-transport + package + * Changed user-defined body parameters to have semantic names + (e.g index(document={...}) instead of index(body={...})). + * Changed responses to be objects with two properties, meta for + response metadata (HTTP status, headers, node, etc) and body + for a typed body. + * Changed AsyncElasticsearch to always be available, regardless + of whether aiohttp is installed + * Changed exception hierarchy, the major change is a new + exception ApiError which differentiates between an error + that’s raised from the transport layer (previously + elasticsearch.exceptions.TransportError, now + elastic_transport.TransportError) and one raised from the API + layer + * Changed the name of JSONSerializer to JsonSerializer for + consistency with other serializer names. Added an alias to + the old name for backwards compatibility + * Changed the default mimetypes (application/json) to instead + use compatibility mimetypes + (application/vnd.elasticsearch+json) which always request for + responses compatibility with version 8.x. + + Removed + * Removed support for Python 2.7 and Python 3.5, the library + now supports only Python 3.6+ + * Removed the elasticsearch.connection module as all + functionality has been moved to the elastic-transport package + * Removed the default URL of http://localhost:9200 due to + Elasticsearch 8.0 default configuration being + https://localhost:9200. The client’s connection to + Elasticsearch now must be specified with scheme, host, and + port or with the cloud_id parameter + * Removed the ability to use positional arguments with API + methods. Going forward all API parameters must be + keyword-only parameters + * Removed the doc_type, include_type_name, and copy_settings + parameters from many document and index APIs + + Deprecated + * Deprecated the body and params parameters on all APIs + * Deprecated setting transport options http_auth, api_key, + ignore, request_timeout, headers, and opaque_id All of these + settings should instead be set via the .options() method + * Deprecated the elasticsearch.transport and + elasticsearch.client modules. These modules will be removed + in a future version + + CAT + * Removed the deprecated local parameter from the cat.indices, + cat.nodes, cat.shards API + * Removed the deprecated allow_no_datafeeds parameter from the + cat.ml_datafeeds API + * Removed the deprecated allow_no_jobs parameter from the + cat.ml_jobs API + * Removed the deprecated size parameter from the + cat.thread_pool API + * Added the time parameter to the cat.thread_pool API + + Documents + * Removed the deprecated size parameter from the + delete_by_query API + * Removed the deprecated size parameter from the + update_by_query API + + Indices + * Removed the deprecated indices.flush_synced API + * Removed the deprecated indices.freeze API + * Removed the deprecated indices.get_upgrade API + * Removed the deprecated indices.upgrade API + * Removed the deprecated indices.exist_type API + * Removed the deprecated parameter copy_settings from the + indices.shrink API + * Deprecated the verbose parameter of the indices.segments API + + License / X-Pack + * Deprecated the accept_enterprise parameter of the license.get + API + * Deprecated the accept_enterprise parameter of the xpack.info + API + + Machine Learning + * Added the experimental ml.infer_trained_model_deployment API + * Added the experimental ml.put_trained_model_definition_part + API + * Added the experimental ml.put_trained_model_vocabulary API + * Added the experimental ml.start_trained_model_deployment API + * Added the experimental ml.stop_trained_model_deployment API + * Added the timeout parameter to the ml.delete_trained_model + API + * Removed the deprecated allow_no_jobs parameter from the + ml.close_job API + * Removed the deprecated ml.find_text_structure API + * Removed the deprecated allow_no_datafeeds parameter from the + ml.get_datafeed_stats API + * Removed the deprecated allow_no_datafeeds parameter from the + ml.get_datafeeds API + * Removed the deprecated allow_no_jobs parameter from the + ml.get_job_stats API + * Removed the deprecated allow_no_jobs parameter from the + ml.get_jobs API + * Removed the deprecated allow_no_jobs parameter from the + ml.get_overall_buckets API + + Search + * Added the experimental knn_search API + * Searchable Snapshots + * Removed the deprecated searchable_snapshots.repository_stats + API + + Snapshots + * Changed the snapshot.delete API to accept multiple snapshots + + Security + * Added the security.enroll_kibana API + * Added the security.enroll_node API + +------------------------------------------------------------------- +Mon May 23 12:08:05 UTC 2022 - pgajdos@suse.com + +- do not require python-mock for build +- added patches + fix https://github.com/elastic/elasticsearch-py/issues/1983 + + python-elasticsearch-no-mock.patch + +------------------------------------------------------------------- +Sun Aug 16 12:33:29 UTC 2020 - John Vandenberg + +- Replace nose with pytest +- Remove %bcond_without test +- Tidy spec + +------------------------------------------------------------------- +Mon Apr 6 07:52:26 UTC 2020 - Marketa Calabkova + +- Update to 7.6.0 + * Added support for ES 7.6 APIs + * Added support for `X-Opaque-Id`_ to identify long-running tasks + * Added support for HTTP compression to ``RequestsHttpConnection`` + * Updated default setting of ``http_compress`` when using ``cloud_id`` to ``True`` + * Updated default setting of ``sniffing`` when using ``cloud_id`` to ``False`` + * Updated default port to ``443`` if ``cloud_id`` and no other port is defined + on the client or within ``cloud_id`` + * Fix regression of ``client.cluster.state()`` where the default ``metric`` + should be set to ``"_all"`` if an index is given (See `#1143`_) + * Fix regression of ``client.tasks.get()`` without a ``task_id`` + having similar functionality to ``client.tasks.list()`` This will + be removed in ``v8.0`` of ``elasticsearch-py`` (See `#1157`_) + +------------------------------------------------------------------- +Mon Mar 2 15:39:59 UTC 2020 - Marketa Calabkova + +- Update to 7.5.1 + * All API is now auto generated + * deprecated the .xpack namespace + * Update client to support ES 7.5 APIs + * Fix sniffing with http.publish_host + * Fix request_timeout for indices APIs + * Allow access to x-pack features without xpack namespace + * Fix verify_certs=False + +------------------------------------------------------------------- +Fri Sep 13 08:03:22 UTC 2019 - Tomáš Chvátal + +- Update to 7.0.4: + * remove sleep in retries + * pass scroll_id through body in scroll + * add user-agent + +------------------------------------------------------------------- +Fri Jun 7 09:21:34 UTC 2019 - Marketa Calabkova + +- update to 7.0.2 + * Add connection parameter for Elastic Cloud cloud_id + * ML client uses client object for _bulk_body requests + * Blocking pool must fit thread_count + * Update client to support missing ES 7 API's and query params. + * Removed deprecated option update_all_types + * Using insecure SSL configuration (verify_cert=False) raises a + warning, this can be not showed with ssl_show_warn=False + * Add support for 7.x api's in Elasticsearch + +------------------------------------------------------------------- +Thu Jan 10 13:18:55 UTC 2019 - Thomas Bechtold + +- update to 6.3.1: + * Removed deprecated option ``update_all_types``. + * Pass retry object instead of False in urllib3 + * Add support for `allow_partial_search_results` + * Deprecate `update_all_types` + * Add an exponential wait on delays + * Fix issues with dependencies + * Adding X-pack Docs + * Adding forecast to x-pack ML client + * cleanup for SSL Context + * Add X-Pack clients to -py + * Adding Gzip support for capacity constrained networks + * ``_routing`` in bulk action has been deprecated in ES. Introduces a breaking change + if you use ``routing`` as a field in your documents. + * Updates to SSLContext logic to make it easier to use and have saner defaults. + * Doc updates + * bad release + +------------------------------------------------------------------- +Tue Dec 4 12:47:36 UTC 2018 - Matej Cepl + +- Remove superfluous devel dependency for noarch package + +------------------------------------------------------------------- +Thu Nov 23 15:32:45 UTC 2017 - mimi.vx@gmail.com + +- fix Source url, use pypi package + +------------------------------------------------------------------- +Thu Nov 23 13:27:11 UTC 2017 - kkaempf@suse.com + +- Update to 6.0.0 + * compatibility with Elasticsearch 6.0.0 + +------------------------------------------------------------------- +Thu Oct 19 00:43:55 UTC 2017 - toddrme2178@gmail.com + +- Implement single-spec version +- Update to version 5.4.0 + * see changelog at https://github.com/elastic/elasticsearch-py/blob/5.4.0/Changelog.rst + +------------------------------------------------------------------- +Tue Feb 14 20:34:21 UTC 2017 - jengelh@inai.de + +- Remove hypothetical wording from description + +------------------------------------------------------------------- +Mon Feb 13 08:47:46 UTC 2017 - tbechtold@suse.com + +- update to 5.2.0: + * The client now automatically sends ``Content-Type`` http header set to + ``application/json``. If you are explicitly passing in other encoding than + ``json`` you need to set the header manually. + * Fixed sniffing + * Fixed performance regression in ``scan`` helper + * when using SSL certificate validation is now on by default. Install + ``certifi`` or supply root certificate bundle. + * ``elasticsearch.trace`` logger now also logs failed requests, signature of + internal logging method ``log_request_fail`` has changed, all custom + connection classes need to be updated + * added ``headers`` arg to connections to support custom http headers + * passing in a keyword parameter with ``None`` as value will cause that param + to be ignored + +------------------------------------------------------------------- +Thu Jan 19 23:36:29 UTC 2017 - dmueller@suse.com + +- update to 2.4.0: + * increase default size for ``scan`` helper to 1000 + * added ``client_key`` argument to configure client certificates + * debug logging now includes response body even for failed requests + * Elasticsearch 2.0 compatibility release + * removed thrift and memcached connections, if you wish to continue using + those, extract the classes and use them separately. + * added a new, parallel version of the bulk helper using thread pools + * In helpers, removed ``bulk_index`` as an alias for ``bulk``. Use ``bulk`` + instead. + * thrift now deprecated, to be removed in future version + * make sure urllib3 always uses keep-alive + +------------------------------------------------------------------- +Wed Apr 29 13:15:43 UTC 2015 - tbechtold@suse.com + +- Initial packaging + diff --git a/python-elasticsearch.spec b/python-elasticsearch.spec new file mode 100644 index 0000000..055bceb --- /dev/null +++ b/python-elasticsearch.spec @@ -0,0 +1,79 @@ +# +# spec file for package python-elasticsearch +# +# Copyright (c) 2023 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%define skip_python2 1 +%{?sle15_python_module_pythons} +Name: python-elasticsearch +# DO NOT UPDATE until the compatible version of +# python-elasticsearch-dsl is available (i.e., the same major +# version ... currently we are waiting on 8.* release). +Version: 7.6.0 +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/%{version}.tar.gz +Patch0: python-elasticsearch-no-nose.patch +# https://github.com/elastic/elasticsearch-py/issues/1983 +Patch1: python-elasticsearch-no-mock.patch +BuildRequires: %{python_module certifi} +BuildRequires: %{python_module elastic-transport} +BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module urllib3 >= 1.21.1} +BuildRequires: fdupes +BuildRequires: python-rpm-macros +Requires: python-elastic-transport +BuildArch: noarch +# SECTION test +BuildRequires: %{python_module PyYAML >= 5.4} +BuildRequires: %{python_module aiohttp >= 3 with %python-aiohttp < 4} +BuildRequires: %{python_module pytest-asyncio} +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module python-dateutil} +BuildRequires: %{python_module requests >= 2.4 with %python-requests < 3} +# /SECTION +%python_subpackages + +%description +Official low-level client for Elasticsearch. Its goal is to provide common +ground for all Elasticsearch-related code in Python; because of this it tries +to be opinion-free and very extendable. + +%prep +%autosetup -p1 -n elasticsearch-py-%{version} +sed -i '/addopts/d' setup.cfg +rm README.rst + +%build +%python_build + +%install +%python_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} + +%check +%pytest + +%files %{python_files} +%license LICENSE +%doc AUTHORS Changelog.rst README +%{python_sitelib}/elasticsearch +%{python_sitelib}/elasticsearch-%{version}*-info + +%changelog