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

Upgrade urllib to 1.26.17 #1278

Merged
merged 2 commits into from
Oct 25, 2023
Merged

Conversation

ryanbogan
Copy link
Member

Description

Upgrades the urllib dependency to version 1.26.17

Issues Resolved

#1231

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed as per the DCO using --signoff

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.

Signed-off-by: Ryan Bogan <[email protected]>
Signed-off-by: Ryan Bogan <[email protected]>
@codecov
Copy link

codecov bot commented Oct 25, 2023

Codecov Report

Merging #1278 (ed1adf4) into main (357490e) will not change coverage.
The diff coverage is n/a.

❗ Current head ed1adf4 differs from pull request most recent head 2710be3. Consider uploading reports for the commit 2710be3 to get more accurate results

@@            Coverage Diff            @@
##               main    #1278   +/-   ##
=========================================
  Coverage     85.01%   85.01%           
  Complexity     1210     1210           
=========================================
  Files           160      160           
  Lines          4930     4930           
  Branches        449      449           
=========================================
  Hits           4191     4191           
  Misses          540      540           
  Partials        199      199           

@navneet1v
Copy link
Collaborator

@ryanbogan can we run one perf test config to see if this change is compatible with opensearch-py

@ryanbogan
Copy link
Member Author

@navneet1v I ran the perf tool locally and it worked

@junqiu-lei junqiu-lei merged commit e508031 into opensearch-project:main Oct 25, 2023
43 of 49 checks passed
@ryanbogan ryanbogan deleted the upgrade_urllib branch October 25, 2023 22:38
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-1278-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e5080316e40a09c3a6fb9d4314065c4c113e9751
# Push it to GitHub
git push --set-upstream origin backport/backport-1278-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-1278-to-2.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants