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

Fix bump llhttp to v8.1.1 #7367

Merged
merged 15 commits into from
Jul 18, 2023
Merged

Fix bump llhttp to v8.1.1 #7367

merged 15 commits into from
Jul 18, 2023

Conversation

Dreamsorcerer
Copy link
Member

No description provided.

@Dreamsorcerer Dreamsorcerer added bot:chronographer:skip This PR does not need to include a change note backport-3.8 labels Jul 16, 2023
@codecov
Copy link

codecov bot commented Jul 16, 2023

Codecov Report

Merging #7367 (b3a50d8) into master (7911f1e) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##           master    #7367   +/-   ##
=======================================
  Coverage   97.27%   97.27%           
=======================================
  Files         106      106           
  Lines       31402    31411    +9     
  Branches     3925     3927    +2     
=======================================
+ Hits        30547    30556    +9     
  Misses        650      650           
  Partials      205      205           
Flag Coverage Δ
CI-GHA 97.22% <100.00%> (+<0.01%) ⬆️
OS-Linux 96.89% <100.00%> (+<0.01%) ⬆️
OS-Windows 95.35% <100.00%> (-0.01%) ⬇️
OS-macOS 96.57% <100.00%> (-0.02%) ⬇️
Py-3.10.11 95.27% <100.00%> (-0.01%) ⬇️
Py-3.10.12 96.78% <100.00%> (-0.01%) ⬇️
Py-3.11.0 96.53% <100.00%> (+<0.01%) ⬆️
Py-3.8.10 95.24% <100.00%> (-0.01%) ⬇️
Py-3.8.17 96.72% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 95.23% <100.00%> (-0.01%) ⬇️
Py-3.9.17 96.74% <100.00%> (+<0.01%) ⬆️
Py-pypy7.3.11 94.22% <100.00%> (-0.01%) ⬇️
VM-macos 96.57% <100.00%> (-0.02%) ⬇️
VM-ubuntu 96.89% <100.00%> (+<0.01%) ⬆️
VM-windows 95.35% <100.00%> (-0.01%) ⬇️

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

Impacted Files Coverage Δ
tests/test_http_parser.py 99.08% <100.00%> (+<0.01%) ⬆️

... and 1 file with indirect coverage changes

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

vendor/README.rst Outdated Show resolved Hide resolved
vendor/README.rst Show resolved Hide resolved
tests/test_http_parser.py Show resolved Hide resolved
.gitmodules Show resolved Hide resolved
@webknjaz
Copy link
Member

@Dreamsorcerer I think there was a change note file that needs updating. One of the recent ones.

@webknjaz webknjaz changed the title Fix llhttp bump Bump llhttp to v8.<.replace this.> Jul 16, 2023
@Dreamsorcerer
Copy link
Member Author

@Dreamsorcerer I think there was a change note file that needs updating. One of the recent ones.

I don't think anything needs updating from your previous note: https://github.com/aio-libs/aiohttp/blob/master/CHANGES/7346.feature

The change you applied just didn't work, this PR fixes it (as evidenced by the test not failing in your PR). The version is still 8.1.1.

@Dreamsorcerer Dreamsorcerer changed the title Bump llhttp to v8.<.replace this.> Fix bump llhttp to v8.1.1 Jul 16, 2023
@webknjaz
Copy link
Member

So I suppose this is mergeable, but it'd be nice to think about those nitpicks...

@Dreamsorcerer Dreamsorcerer merged commit 41e2c4c into master Jul 18, 2023
@Dreamsorcerer Dreamsorcerer deleted the Dreamsorcerer-patch-2 branch July 18, 2023 18:30
@patchback
Copy link
Contributor

patchback bot commented Jul 18, 2023

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

❌ Failed to cleanly apply 41e2c4c on top of patchback/backports/3.8/41e2c4c1fdf34d800bb9e4247cd9ebfc6904d9d7/pr-7367

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

@patchback
Copy link
Contributor

patchback bot commented Jul 18, 2023

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

❌ Failed to cleanly apply 41e2c4c on top of patchback/backports/3.9/41e2c4c1fdf34d800bb9e4247cd9ebfc6904d9d7/pr-7367

Backporting merged PR #7367 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/41e2c4c1fdf34d800bb9e4247cd9ebfc6904d9d7/pr-7367 upstream/3.9
  4. Now, cherry-pick PR Fix bump llhttp to v8.1.1 #7367 contents into that branch:
    $ git cherry-pick -x 41e2c4c1fdf34d800bb9e4247cd9ebfc6904d9d7
    If it'll yell at you with something like fatal: Commit 41e2c4c1fdf34d800bb9e4247cd9ebfc6904d9d7 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 41e2c4c1fdf34d800bb9e4247cd9ebfc6904d9d7
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix bump llhttp to v8.1.1 #7367 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.9/41e2c4c1fdf34d800bb9e4247cd9ebfc6904d9d7/pr-7367
  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 added a commit that referenced this pull request Jul 18, 2023
(cherry picked from commit 41e2c4c)
Dreamsorcerer added a commit that referenced this pull request Jul 18, 2023
(cherry picked from commit 41e2c4c)
Dreamsorcerer added a commit that referenced this pull request Jul 18, 2023
Dreamsorcerer added a commit that referenced this pull request Jul 18, 2023
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.

2 participants