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

Add default_to_mulitpart parameter #9335

Merged
merged 6 commits into from
Sep 29, 2024
Merged

Add default_to_mulitpart parameter #9335

merged 6 commits into from
Sep 29, 2024

Conversation

Dreamsorcerer
Copy link
Member

Fixes #6587.

@Dreamsorcerer Dreamsorcerer added the backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot label Sep 29, 2024
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Sep 29, 2024
Copy link

codecov bot commented Sep 29, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.56%. Comparing base (9ab74e2) to head (fa634b4).
Report is 1 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #9335   +/-   ##
=======================================
  Coverage   98.56%   98.56%           
=======================================
  Files         107      107           
  Lines       34939    34944    +5     
  Branches     4145     4145           
=======================================
+ Hits        34438    34443    +5     
  Misses        334      334           
  Partials      167      167           
Flag Coverage Δ
CI-GHA 98.44% <100.00%> (+<0.01%) ⬆️
OS-Linux 98.11% <100.00%> (-0.01%) ⬇️
OS-Windows 96.52% <100.00%> (+<0.01%) ⬆️
OS-macOS 97.79% <100.00%> (-0.01%) ⬇️
Py-3.10.11 97.68% <100.00%> (-0.01%) ⬇️
Py-3.10.15 97.61% <100.00%> (+<0.01%) ⬆️
Py-3.11.10 97.67% <100.00%> (+<0.01%) ⬆️
Py-3.11.9 97.74% <100.00%> (+<0.01%) ⬆️
Py-3.12.6 98.16% <100.00%> (+<0.01%) ⬆️
Py-3.13.0-rc.2 98.15% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 97.57% <100.00%> (-0.01%) ⬇️
Py-3.9.20 97.51% <100.00%> (+<0.01%) ⬆️
Py-pypy7.3.16 97.13% <100.00%> (-0.01%) ⬇️
VM-macos 97.79% <100.00%> (-0.01%) ⬇️
VM-ubuntu 98.11% <100.00%> (-0.01%) ⬇️
VM-windows 96.52% <100.00%> (+<0.01%) ⬆️

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 merged commit d9a9368 into master Sep 29, 2024
38 of 39 checks passed
@Dreamsorcerer Dreamsorcerer deleted the default-multipart branch September 29, 2024 12:59
Copy link
Contributor

patchback bot commented Sep 29, 2024

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

❌ Failed to cleanly apply d9a9368 on top of patchback/backports/3.11/d9a9368f0923e1447231880075271e7fe38683d8/pr-9335

Backporting merged PR #9335 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.11/d9a9368f0923e1447231880075271e7fe38683d8/pr-9335 upstream/3.11
  4. Now, cherry-pick PR Add default_to_mulitpart parameter #9335 contents into that branch:
    $ git cherry-pick -x d9a9368f0923e1447231880075271e7fe38683d8
    If it'll yell at you with something like fatal: Commit d9a9368f0923e1447231880075271e7fe38683d8 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x d9a9368f0923e1447231880075271e7fe38683d8
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Add default_to_mulitpart parameter #9335 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/d9a9368f0923e1447231880075271e7fe38683d8/pr-9335
  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 Sep 29, 2024
Co-authored-by: Yevhenii Hyzyla <hyzyla@gmail.com>
(cherry picked from commit d9a9368)
Dreamsorcerer added a commit that referenced this pull request Sep 29, 2024
Co-authored-by: Yevhenii Hyzyla <hyzyla@gmail.com>
(cherry picked from commit d9a9368)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.11 Trigger automatic backporting to the 3.11 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.

Set is_multipart for FormData
2 participants