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.

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

Updated dependencies, generated API. #793

Merged
merged 7 commits into from
Aug 14, 2024

Conversation

dblock
Copy link
Member

@dblock dblock commented Aug 13, 2024

Description

  • This should fix some of the open CVEs. I am not 100% that setting newer min versions for requests, urllib3 and certifi is right, so please lmk if you think it's not.
  • Ran the generator and added new API namespaces.
  • Locked setuptools, newer versions fail in nox ... tests with Unknown distribution option: 'test_suite'..
  • Removed flaky 2.0 from tests.
  • Reduce the mad test matrix of every minor release that hasn't yielded a bug in forever.

Issues Resolved

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@dblock dblock force-pushed the update-dependencies branch from c746e2e to b4913a0 Compare August 13, 2024 22:15
dblock added 4 commits August 13, 2024 18:27
Newer version seems to cause UserWarning: Unknown distribution option: 'test_suite'.

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

codecov bot commented Aug 13, 2024

Codecov Report

Attention: Patch coverage is 57.03704% with 116 lines in your changes missing coverage. Please review.

Project coverage is 70.25%. Comparing base (ba715b9) to head (f7a7397).
Report is 45 commits behind head on main.

Files Patch % Lines
opensearchpy/_async/plugins/sql.py 48.38% 16 Missing ⚠️
opensearchpy/plugins/sql.py 48.38% 16 Missing ⚠️
opensearchpy/_async/plugins/observability.py 56.66% 13 Missing ⚠️
opensearchpy/plugins/observability.py 56.66% 13 Missing ⚠️
opensearchpy/_async/plugins/ppl.py 52.38% 10 Missing ⚠️
opensearchpy/plugins/ppl.py 52.38% 10 Missing ⚠️
opensearchpy/_async/plugins/query.py 59.09% 9 Missing ⚠️
opensearchpy/plugins/query.py 59.09% 9 Missing ⚠️
opensearchpy/_async/plugins/ml.py 40.00% 6 Missing ⚠️
opensearchpy/plugins/ml.py 40.00% 6 Missing ⚠️
... and 2 more
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #793      +/-   ##
==========================================
- Coverage   71.95%   70.25%   -1.71%     
==========================================
  Files          91      113      +22     
  Lines        8001     8881     +880     
==========================================
+ Hits         5757     6239     +482     
- Misses       2244     2642     +398     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@dblock dblock changed the title Updated dependencies. Updated dependencies, generated API. Aug 13, 2024
@dblock
Copy link
Member Author

dblock commented Aug 14, 2024

Maybe @saimedhi @VachaShah can review?

saimedhi
saimedhi previously approved these changes Aug 14, 2024
@saimedhi
Copy link
Collaborator

  • looks good to me.
  • Going through the CVEs to confirm if below are right version bumps
install_requires = [
    'urllib3>=1.26.19,<1.27 ; python_version < "3.10"',
    'urllib3>=1.26.19,!=2.2.0,<3 ; python_version >= "3.10"',
    "requests>=2.32.0, <3.0.0",
    "python-dateutil",
    "certifi>=2024.07.04",
    "Events",
]

@saimedhi
Copy link
Collaborator

  • looks good to me.
  • Going through the CVEs to confirm if below are right version bumps
install_requires = [
    'urllib3>=1.26.19,<1.27 ; python_version < "3.10"',
    'urllib3>=1.26.19,!=2.2.0,<3 ; python_version >= "3.10"',
    "requests>=2.32.0, <3.0.0",
    "python-dateutil",
    "certifi>=2024.07.04",
    "Events",
]
  • 'urllib3>=1.26.19,!=2.2.0,<3 ; python_version >= "3.10"',
    here 2.2.1 should also be removed as per affected versions here GHSA-34jh-p97f-mpxf

Signed-off-by: dblock <[email protected]>
@dblock
Copy link
Member Author

dblock commented Aug 14, 2024

  • 'urllib3>=1.26.19,!=2.2.0,<3 ; python_version >= "3.10"',
    here 2.2.1 should also be removed as per affected versions here GHSA-34jh-p97f-mpxf

Done.

@dblock dblock requested a review from saimedhi August 14, 2024 20:48
@saimedhi saimedhi merged commit 2d6ae74 into opensearch-project:main Aug 14, 2024
31 of 34 checks passed
@dblock dblock deleted the update-dependencies branch August 15, 2024 00:06
dblock added a commit to dblock/opensearch-py that referenced this pull request Aug 15, 2024
* 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]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants