Skip to content

Commit

Permalink
Updated dependencies, generated API. (opensearch-project#793)
Browse files Browse the repository at this point in the history
* Updated dependencies.

Signed-off-by: dblock <[email protected]>

* Lock setuptools at 71.1.0.

Newer version seems to cause UserWarning: Unknown distribution option: 'test_suite'.

Signed-off-by: dblock <[email protected]>

* Updated opensearch-py APIs to reflect opensearch-api-specification@9d3bc34.

Signed-off-by: dblock <[email protected]>

* Do not test against flaky 2.0.

Signed-off-by: dblock <[email protected]>

* Reduce test matrix and add 2.16.

Signed-off-by: dblock <[email protected]>

* Fix missing spaces in generated descriptions.

Signed-off-by: dblock <[email protected]>

* Removed 2.2.1.

Signed-off-by: dblock <[email protected]>

---------

Signed-off-by: dblock <[email protected]>
  • Loading branch information
dblock committed Aug 15, 2024
1 parent 4597c97 commit 83c71a9
Show file tree
Hide file tree
Showing 47 changed files with 3,817 additions and 1,621 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integration-unreleased.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
fail-fast: false
matrix:
opensearch_ref: [ '1.x', '2.x', '2.0', 'main' ]
opensearch_ref: [ '1.x', '2.x', 'main' ]

steps:
- name: Checkout OpenSearch
Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,8 @@ jobs:
strategy:
fail-fast: false
matrix:
opensearch_version: [ '1.0.1', '1.1.0', '1.2.4', '1.3.7', '2.0.1', '2.1.0', '2.2.1', '2.3.0', '2.4.0', '2.5.0', '2.6.0', '2.7.0', '2.8.0', '2.9.0', '2.10.0', '2.11.1' ]
opensearch_version: [ '1.0.1', '1.3.7' ]
secured: [ "true", "false" ]
exclude:
# https://github.com/opensearch-project/opensearch-py/issues/612
- opensearch_version: 2.0.1
secured: "true"
- opensearch_version: 2.1.0
secured: "true"
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -32,7 +26,7 @@ jobs:
strategy:
fail-fast: false
matrix:
opensearch_version: [ '2.12.0', '2.13.0', '2.14.0' ]
opensearch_version: [ '2.14.0', '2.16.0' ]
secured: [ "true", "false" ]

steps:
Expand Down
10 changes: 4 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,14 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- Fixed Search helper to ensure proper retention of the _collapse attribute in chained operations. ([#771](https://github.com/opensearch-project/opensearch-py/pull/771))
- Fixed the use of `minimum_should_match` with `Bool` to allow the use of string-based value (percent string, combination). ([#780](https://github.com/opensearch-project/opensearch-py/pull/780))
### Updated APIs
- Updated opensearch-py APIs to reflect [opensearch-api-specification@0453dbe](https://github.com/opensearch-project/opensearch-api-specification/commit/0453dbe35080bf31eebac1d75f8022667d019e9f)
- Updated opensearch-py APIs to reflect [opensearch-api-specification@0b033a9](https://github.com/opensearch-project/opensearch-api-specification/commit/0b033a92cac4cb20ec3fb51350c139afc753b089)
- Updated opensearch-py APIs to reflect [opensearch-api-specification@d5ca873](https://github.com/opensearch-project/opensearch-api-specification/commit/d5ca873d20ff54be16ec48e7bd629cda7c4a6332)
- Updated opensearch-py APIs to reflect [opensearch-api-specification@7452827](https://github.com/opensearch-project/opensearch-api-specification/commit/745282767026703ea27967d2705633c3e2661c97)
- Updated opensearch-py APIs to reflect [opensearch-api-specification@f2afd71](https://github.com/opensearch-project/opensearch-api-specification/commit/f2afd7171406c7477fbd644d74087bb0e2948c75)
- Updated opensearch-py APIs to reflect [opensearch-api-specification@49cd814](https://github.com/opensearch-project/opensearch-api-specification/commit/49cd8140663f32f7c8b638ddc295683344edba61)
- Updated opensearch-py APIs to reflect [opensearch-api-specification@9d3bc34](https://github.com/opensearch-project/opensearch-api-specification/commit/9d3bc340ccd7d049e7d6e14a4aff2293780cb446)
### Security
### Dependencies
- Bump `pytest-asyncio` from <=0.23.7 to <=0.23.8 ([#787](https://github.com/opensearch-project/opensearch-py/pull/787))
- Bump `sphinx` from <7.4 to <7.5 ([#788](https://github.com/opensearch-project/opensearch-py/pull/788))
- Bump `urllib3` from >=1.26.18 to >=1.26.19 ([#793](https://github.com/opensearch-project/opensearch-py/pull/793))
- Bump `requests` from >=2.4.0 to >=2.32.0 ([#793](https://github.com/opensearch-project/opensearch-py/pull/793))
- Bump `certifi` from >=2022.12.07 to >=2024.07.04 ([#793](https://github.com/opensearch-project/opensearch-py/pull/793))

## [2.6.0]
### Added
Expand Down
915 changes: 497 additions & 418 deletions benchmarks/poetry.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jinja2
pytz
deepmerge
Events
setuptools
setuptools==71.1.0

numpy; python_version<="3.12"
pandas; python_version<="3.12"
Expand Down
398 changes: 199 additions & 199 deletions opensearchpy/_async/client/__init__.py

Large diffs are not rendered by default.

58 changes: 29 additions & 29 deletions opensearchpy/_async/client/cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,11 @@ async def pending_tasks(
:arg human: Whether to return human readable values for
statistics.
:arg local: If `true`, the request retrieves information from
the local node only.If `false`, information is retrieved from the master
node. Default is false.
the local node only. If `false`, information is retrieved from the
master node. Default is false.
:arg master_timeout (Deprecated: To promote inclusive language,
use 'cluster_manager_timeout' instead.): Period to wait for a connection
to the master node.If no response is received before the timeout
to the master node. If no response is received before the timeout
expires, the request fails and returns an error.
:arg pretty: Whether to pretty format the returned JSON
response.
Expand Down Expand Up @@ -285,9 +285,9 @@ async def stats(
response.
:arg source: The URL-encoded request definition. Useful for
libraries that do not accept a request body for non-POST requests.
:arg timeout: Period to wait for each node to respond.If a node
:arg timeout: Period to wait for each node to respond. If a node
does not respond before its timeout expires, the response does not
include its stats.However, timed out nodes are included in the
include its stats. However, timed out nodes are included in the
response's `_nodes.failed` property. Defaults to no timeout.
"""
return await self.transport.perform_request(
Expand Down Expand Up @@ -394,13 +394,13 @@ async def get_settings(
settings from the local node. Default is false.
:arg master_timeout (Deprecated: To promote inclusive language,
use 'cluster_manager_timeout' instead.): Period to wait for a connection
to the master node.If no response is received before the timeout
to the master node. If no response is received before the timeout
expires, the request fails and returns an error.
:arg pretty: Whether to pretty format the returned JSON
response.
:arg source: The URL-encoded request definition. Useful for
libraries that do not accept a request body for non-POST requests.
:arg timeout: Period to wait for a response.If no response is
:arg timeout: Period to wait for a response. If no response is
received before the timeout expires, the request fails and returns an
error.
"""
Expand Down Expand Up @@ -558,13 +558,13 @@ async def delete_component_template(
statistics.
:arg master_timeout (Deprecated: To promote inclusive language,
use 'cluster_manager_timeout' instead.): Period to wait for a connection
to the master node.If no response is received before the timeout
to the master node. If no response is received before the timeout
expires, the request fails and returns an error.
:arg pretty: Whether to pretty format the returned JSON
response.
:arg source: The URL-encoded request definition. Useful for
libraries that do not accept a request body for non-POST requests.
:arg timeout: Period to wait for a response.If no response is
:arg timeout: Period to wait for a response. If no response is
received before the timeout expires, the request fails and returns an
error.
"""
Expand Down Expand Up @@ -609,11 +609,11 @@ async def get_component_template(
:arg human: Whether to return human readable values for
statistics.
:arg local: If `true`, the request retrieves information from
the local node only.If `false`, information is retrieved from the master
node. Default is false.
the local node only. If `false`, information is retrieved from the
master node. Default is false.
:arg master_timeout (Deprecated: To promote inclusive language,
use 'cluster_manager_timeout' instead.): Period to wait for a connection
to the master node.If no response is received before the timeout
to the master node. If no response is received before the timeout
expires, the request fails and returns an error.
:arg pretty: Whether to pretty format the returned JSON
response.
Expand Down Expand Up @@ -672,7 +672,7 @@ async def put_component_template(
statistics.
:arg master_timeout (Deprecated: To promote inclusive language,
use 'cluster_manager_timeout' instead.): Period to wait for a connection
to the master node.If no response is received before the timeout
to the master node. If no response is received before the timeout
expires, the request fails and returns an error.
:arg pretty: Whether to pretty format the returned JSON
response.
Expand Down Expand Up @@ -723,12 +723,12 @@ async def exists_component_template(
:arg human: Whether to return human readable values for
statistics.
:arg local: If true, the request retrieves information from the
local node only.Defaults to false, which means information is retrieved
local node only. Defaults to false, which means information is retrieved
from the master node. Default is false.
:arg master_timeout (Deprecated: To promote inclusive language,
use 'cluster_manager_timeout' instead.): Period to wait for a connection
to the master node. If no response isreceived before the timeout
expires, the request fails and returns anerror.
to the master node. If no response is received before the timeout
expires, the request fails and returns an error.
:arg pretty: Whether to pretty format the returned JSON
response.
:arg source: The URL-encoded request definition. Useful for
Expand Down Expand Up @@ -767,12 +767,12 @@ async def delete_voting_config_exclusions(
:arg source: The URL-encoded request definition. Useful for
libraries that do not accept a request body for non-POST requests.
:arg wait_for_removal: Specifies whether to wait for all
excluded nodes to be removed from thecluster before clearing the voting
configuration exclusions list.Defaults to true, meaning that all
excluded nodes must be removed fromthe cluster before this API takes any
action. If set to false then thevoting configuration exclusions list is
cleared even if some excludednodes are still in the cluster. Default is
True.
excluded nodes to be removed from the cluster before clearing the voting
configuration exclusions list. Defaults to true, meaning that all
excluded nodes must be removed from the cluster before this API takes
any action. If set to false then the voting configuration exclusions
list is cleared even if some excluded nodes are still in the cluster.
Default is True.
"""
return await self.transport.perform_request(
"DELETE",
Expand Down Expand Up @@ -807,19 +807,19 @@ async def post_voting_config_exclusions(
:arg human: Whether to return human readable values for
statistics.
:arg node_ids: A comma-separated list of the persistent ids of
the nodes to excludefrom the voting configuration. If specified, you may
not also specify node_names.
the nodes to exclude from the voting configuration. If specified, you
may not also specify node_names.
:arg node_names: A comma-separated list of the names of the
nodes to exclude from thevoting configuration. If specified, you may not
also specify node_ids.
nodes to exclude from the voting configuration. If specified, you may
not also specify node_ids.
:arg pretty: Whether to pretty format the returned JSON
response.
:arg source: The URL-encoded request definition. Useful for
libraries that do not accept a request body for non-POST requests.
:arg timeout: When adding a voting configuration exclusion, the
API waits for thespecified nodes to be excluded from the voting
configuration beforereturning. If the timeout expires before the
appropriate conditionis satisfied, the request fails and returns an
API waits for the specified nodes to be excluded from the voting
configuration before returning. If the timeout expires before the
appropriate condition is satisfied, the request fails and returns an
error.
"""
return await self.transport.perform_request(
Expand Down
Loading

0 comments on commit 83c71a9

Please sign in to comment.