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

added server_hostname param to ws_connect method #7942

Merged
merged 3 commits into from
Dec 5, 2023

Conversation

tamir1400
Copy link
Contributor

@tamir1400 tamir1400 commented Dec 4, 2023

added the server_hostname param to ws_connect method, so it will simply be passed to the _request method which already supports the server_hostname param.

Fixes #7941

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Dec 4, 2023
Copy link

codecov bot commented Dec 4, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (43f92fa) 97.36% compared to head (605453e) 97.43%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #7942      +/-   ##
==========================================
+ Coverage   97.36%   97.43%   +0.06%     
==========================================
  Files         107      107              
  Lines       32346    32346              
  Branches     3748     3748              
==========================================
+ Hits        31494    31516      +22     
+ Misses        647      629      -18     
+ Partials      205      201       -4     
Flag Coverage Δ
CI-GHA 97.35% <ø> (+0.05%) ⬆️
OS-Linux 97.02% <ø> (+0.05%) ⬆️
OS-Windows 95.52% <ø> (ø)
OS-macOS 96.84% <ø> (+0.18%) ⬆️
Py-3.10.11 95.44% <ø> (ø)
Py-3.10.13 96.82% <ø> (-0.01%) ⬇️
Py-3.11.6 96.56% <ø> (+0.02%) ⬆️
Py-3.12.0 96.61% <ø> (ø)
Py-3.8.10 95.41% <ø> (ø)
Py-3.8.18 96.76% <ø> (ø)
Py-3.9.13 95.41% <ø> (ø)
Py-3.9.18 96.80% <ø> (+<0.01%) ⬆️
Py-pypy7.3.13 96.34% <ø> (?)
VM-macos 96.84% <ø> (+0.18%) ⬆️
VM-ubuntu 97.02% <ø> (+0.05%) ⬆️
VM-windows 95.52% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

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

@Dreamsorcerer Dreamsorcerer added backport-3.9 Trigger automatic backporting to the 3.9 release branch by Patchback robot backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot and removed backport-3.9 Trigger automatic backporting to the 3.9 release branch by Patchback robot labels Dec 4, 2023
@Dreamsorcerer
Copy link
Member

I think that looks fine to me.

@Dreamsorcerer Dreamsorcerer merged commit 0b71e1c into aio-libs:master Dec 5, 2023
31 of 34 checks passed
Copy link
Contributor

patchback bot commented Dec 5, 2023

Backport to 3.10: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 0b71e1c on top of patchback/backports/3.10/0b71e1ce595f8ac489d13b05bc9fc468ff4250b0/pr-7942

Backporting merged PR #7942 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.10/0b71e1ce595f8ac489d13b05bc9fc468ff4250b0/pr-7942 upstream/3.10
  4. Now, cherry-pick PR added server_hostname param to ws_connect method #7942 contents into that branch:
    $ git cherry-pick -x 0b71e1ce595f8ac489d13b05bc9fc468ff4250b0
    If it'll yell at you with something like fatal: Commit 0b71e1ce595f8ac489d13b05bc9fc468ff4250b0 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 0b71e1ce595f8ac489d13b05bc9fc468ff4250b0
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR added server_hostname param to ws_connect method #7942 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.10/0b71e1ce595f8ac489d13b05bc9fc468ff4250b0/pr-7942
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@Dreamsorcerer
Copy link
Member

If you could follow the backport instructions, that'd be appreciated.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot bot:chronographer:provided There is a change note present in this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

using server_host name param for ws_connect
2 participants