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

Bump cffi to 1.17.0 #8749

Merged
merged 2 commits into from
Aug 19, 2024
Merged

Bump cffi to 1.17.0 #8749

merged 2 commits into from
Aug 19, 2024

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Aug 19, 2024

What do these changes do?

cffi 1.17.0 is needed for python 3.13 support

Are there changes in behavior for the user?

no

Is it a substantial burden for the maintainers to support this?

no

cffi 1.17.0 is needed for python 3.13 support
@bdraco bdraco added backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot bot:chronographer:skip This PR does not need to include a change note labels Aug 19, 2024
@bdraco
Copy link
Member Author

bdraco commented Aug 19, 2024

I figured dependabot would have done this by now but since it hasn't it looks like we need to do it manually

Copy link

codecov bot commented Aug 19, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.14%. Comparing base (e97b17a) to head (0e2599c).
Report is 1 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #8749   +/-   ##
=======================================
  Coverage   98.13%   98.14%           
=======================================
  Files         107      107           
  Lines       34067    34067           
  Branches     4030     4030           
=======================================
+ Hits        33433    33435    +2     
+ Misses        457      456    -1     
+ Partials      177      176    -1     
Flag Coverage Δ
CI-GHA 98.04% <ø> (+<0.01%) ⬆️
OS-Linux 97.69% <ø> (ø)
OS-Windows 96.06% <ø> (ø)
OS-macOS 97.35% <ø> (-0.01%) ⬇️
Py-3.10.11 97.44% <ø> (+<0.01%) ⬆️
Py-3.10.14 97.39% <ø> (ø)
Py-3.11.9 97.63% <ø> (+<0.01%) ⬆️
Py-3.12.4 97.73% <ø> (ø)
Py-3.8.10 95.70% <ø> (ø)
Py-3.8.18 97.20% <ø> (ø)
Py-3.9.13 97.33% <ø> (ø)
Py-3.9.19 97.29% <ø> (ø)
Py-pypy7.3.16 96.90% <ø> (ø)
VM-macos 97.35% <ø> (-0.01%) ⬇️
VM-ubuntu 97.69% <ø> (ø)
VM-windows 96.06% <ø> (ø)

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.

@bdraco bdraco marked this pull request as ready for review August 19, 2024 18:18
@bdraco bdraco enabled auto-merge (squash) August 19, 2024 18:18
@bdraco bdraco merged commit 5e30b49 into master Aug 19, 2024
34 of 35 checks passed
@bdraco bdraco deleted the bump_cffi branch August 19, 2024 18:24
Copy link
Contributor

patchback bot commented Aug 19, 2024

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

❌ Failed to cleanly apply 5e30b49 on top of patchback/backports/3.10/5e30b490e78cb5ceabb92fb3cf16205ed7cd9f1e/pr-8749

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

Copy link
Contributor

patchback bot commented Aug 19, 2024

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

❌ Failed to cleanly apply 5e30b49 on top of patchback/backports/3.11/5e30b490e78cb5ceabb92fb3cf16205ed7cd9f1e/pr-8749

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

bdraco added a commit that referenced this pull request Aug 19, 2024
<!-- Thank you for your contribution! -->

cffi 1.17.0 is needed for python 3.13 support

no
no

(cherry picked from commit 5e30b49)
bdraco added a commit that referenced this pull request Aug 19, 2024
<!-- Thank you for your contribution! -->

cffi 1.17.0 is needed for python 3.13 support

no
no

(cherry picked from commit 5e30b49)
@Dreamsorcerer
Copy link
Member

Hmm, it's seen them: https://github.com/aio-libs/aiohttp/network/updates/870981818
Not sure why it doesn't update it. Maybe it only updates the ones listed in the .in files?

@Dreamsorcerer
Copy link
Member

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 backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot 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