Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix async helpers import cycle #311

Merged
merged 5 commits into from
Mar 8, 2023
Merged

Fix async helpers import cycle #311

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3466ffb
Import async helpers through public interface in tests
aiudirog Mar 3, 2023
d00e446
Removed unused import of AsyncOpenSearch in async helpers that was ca…
aiudirog Mar 3, 2023
1c9e7e6
Update CHANGELOG.md
aiudirog Mar 3, 2023
4bad019
Change 2.2.1 in the changelog to Unreleased
aiudirog Mar 7, 2023
e65f626
Separated changelog entries for 2.2.0 from 2.1.1
aiudirog Mar 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# CHANGELOG
Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)

## [2.2.1]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe 2.1.1 is mislabeled and should have been 2.2.0? @harshavamsi

This should say "unreleased"?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed

I know you didn't ask me, but looking at the release notes on GitHub, it looks like the release notes for both versions go merged. I think everything but the notes for the SigV4 fixes should be moved to a new block for 2.2.0. I can do that if you would like.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please! We made a mess.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Latest commit should have resolved this. Let me know if you want anything else done or changed.

### Fixed
- Fixed import cycle when importing async helpers ([#311](https://github.com/opensearch-project/opensearch-py/pull/311))

## [2.1.1]
### Added
- Merging opensearch-dsl-py into opensearch-py ([#287](https://github.com/opensearch-project/opensearch-py/pull/287))
Expand Down
1 change: 0 additions & 1 deletion opensearchpy/_async/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
expand_action,
)
from ..helpers.errors import ScanError
from .client import AsyncOpenSearch # noqa

logger = logging.getLogger("opensearchpy.helpers")

Expand Down
3 changes: 1 addition & 2 deletions test_opensearchpy/test_async/test_server/test_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@
import pytest
from mock import MagicMock, patch

from opensearchpy import TransportError
from opensearchpy._async import helpers
from opensearchpy import TransportError, helpers
from opensearchpy.helpers import BulkIndexError, ScanError

pytestmark = pytest.mark.asyncio
Expand Down