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

Raise allowed charset version #7057

Merged
merged 1 commit into from
Oct 29, 2022
Merged

Raise allowed charset version #7057

merged 1 commit into from
Oct 29, 2022

Conversation

Dreamsorcerer
Copy link
Member

Fixes #7050.

@Dreamsorcerer Dreamsorcerer added bot:chronographer:skip This PR does not need to include a change note backport-3.9 labels Oct 28, 2022
@codecov
Copy link

codecov bot commented Oct 28, 2022

Codecov Report

Merging #7057 (b619273) into master (12f56d7) will decrease coverage by 0.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #7057      +/-   ##
==========================================
- Coverage   97.50%   97.49%   -0.02%     
==========================================
  Files         103      103              
  Lines       29972    29972              
  Branches     3640     3640              
==========================================
- Hits        29224    29220       -4     
- Misses        567      569       +2     
- Partials      181      183       +2     
Flag Coverage Δ
CI-GHA 97.40% <ø> (-0.01%) ⬇️
OS-Linux 97.05% <ø> (ø)
OS-Windows 95.16% <ø> (-0.23%) ⬇️
OS-macOS 96.68% <ø> (-0.01%) ⬇️
Py-3.10.8 96.83% <ø> (-0.39%) ⬇️
Py-3.11.0 96.55% <ø> (ø)
Py-3.11.0-rc.2 ?
Py-3.7.15 96.88% <ø> (ø)
Py-3.7.9 ?
Py-3.8.10 ?
Py-3.8.14 96.78% <ø> (ø)
Py-3.9.13 95.16% <ø> (+<0.01%) ⬆️
Py-3.9.14 96.57% <ø> (ø)
Py-3.9.15 96.76% <ø> (-0.05%) ⬇️
Py-pypy7.3.9 96.44% <ø> (ø)
VM-macos 96.68% <ø> (-0.01%) ⬇️
VM-ubuntu 97.05% <ø> (ø)
VM-windows 95.16% <ø> (-0.23%) ⬇️

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

Impacted Files Coverage Δ
tests/conftest.py 91.22% <0.00%> (-1.76%) ⬇️
aiohttp/web.py 97.52% <0.00%> (-1.66%) ⬇️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@Dreamsorcerer Dreamsorcerer merged commit cf8e25d into master Oct 29, 2022
@Dreamsorcerer Dreamsorcerer deleted the Dreamsorcerer-patch-6 branch October 29, 2022 00:04
@patchback
Copy link
Contributor

patchback bot commented Oct 29, 2022

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

❌ Failed to cleanly apply cf8e25d on top of patchback/backports/3.9/cf8e25d0175f1d4874781b67c0dd466557be8e69/pr-7057

Backporting merged PR #7057 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.9/cf8e25d0175f1d4874781b67c0dd466557be8e69/pr-7057 upstream/3.9
  4. Now, cherry-pick PR Raise allowed charset version #7057 contents into that branch:
    $ git cherry-pick -x cf8e25d0175f1d4874781b67c0dd466557be8e69
    If it'll yell at you with something like fatal: Commit cf8e25d0175f1d4874781b67c0dd466557be8e69 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x cf8e25d0175f1d4874781b67c0dd466557be8e69
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Raise allowed charset version #7057 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.9/cf8e25d0175f1d4874781b67c0dd466557be8e69/pr-7057
  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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot:chronographer:skip This PR does not need to include a change note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

charset-normalizer 3.0.0-1 incompatibility
1 participant