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 support for Python 3.10 #6079

Merged
merged 2 commits into from
Oct 12, 2021
Merged

Add support for Python 3.10 #6079

merged 2 commits into from
Oct 12, 2021

Conversation

hugovk
Copy link
Contributor

@hugovk hugovk commented Oct 11, 2021

What do these changes do?

Add support for Python 3.10: Trove classifier and create binary wheels for 3.10.

Are there changes in behavior for the user?

No.

Related issue number

No, a follow on from PR #5927.

Checklist

  • I think the code is well written
  • [n/a] Unit tests for the changes exist
  • Documentation reflects the changes
  • If you provide code modification, please add yourself to CONTRIBUTORS.txt
    • The format is <Name> <Surname>.
    • Please keep alphabetical order, the file is sorted by names.
  • Add a new news fragment into the CHANGES folder
    • name it <issue_id>.<type> for example (588.bugfix)
    • if you don't have an issue_id change it to the pr id after creating the pr
    • ensure type is one of the following:
      • .feature: Signifying a new feature.
      • .bugfix: Signifying a bug fix.
      • .doc: Signifying a documentation improvement.
      • .removal: Signifying a deprecation or removal of public API.
      • .misc: A ticket has been closed, but it is not of interest to users.
    • Make sure to use full sentences with correct case and punctuation, for example: "Fix issue with non-ascii contents in doctest text files."

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Oct 11, 2021
Copy link
Member

@webknjaz webknjaz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@webknjaz webknjaz enabled auto-merge (squash) October 12, 2021 00:30
@codecov
Copy link

codecov bot commented Oct 12, 2021

Codecov Report

Merging #6079 (ba1fdea) into master (9723abf) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #6079   +/-   ##
=======================================
  Coverage   93.31%   93.31%           
=======================================
  Files         102      102           
  Lines       30062    30062           
  Branches     2690     2690           
=======================================
  Hits        28053    28053           
  Misses       1833     1833           
  Partials      176      176           
Flag Coverage Δ
unit 93.24% <ø> (ø)

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


Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 68bae50...ba1fdea. Read the comment docs.

@webknjaz webknjaz merged commit 02bb200 into aio-libs:master Oct 12, 2021
@patchback
Copy link
Contributor

patchback bot commented Oct 12, 2021

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

❌ Failed to cleanly apply 02bb200 on top of patchback/backports/3.8/02bb2009cda3814c5cbaddc5b4a466bd0067dbdc/pr-6079

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

@aio-libs-github-bot
Copy link
Contributor

💔 Backport was not successful

The PR was attempted backported to the following branches:

  • ❌ 3.8: Commit could not be cherrypicked due to conflicts

@patchback
Copy link
Contributor

patchback bot commented Oct 16, 2021

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

❌ Failed to cleanly apply 02bb200 on top of patchback/backports/3.8/02bb2009cda3814c5cbaddc5b4a466bd0067dbdc/pr-6079

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

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

❌ Failed to cleanly apply 02bb200 on top of patchback/backports/3.8/02bb2009cda3814c5cbaddc5b4a466bd0067dbdc/pr-6079

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

webknjaz pushed a commit to webknjaz/aiohttp that referenced this pull request Oct 20, 2021
webknjaz added a commit that referenced this pull request Oct 20, 2021
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

2 participants