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

Stop installing cchardet speedup under >Python 3.9 #6857

Merged

Conversation

webknjaz
Copy link
Member

@webknjaz webknjaz commented Aug 3, 2022

What do these changes do?

cchardet stopped being maintained a while ago so this patch removes
it from the speedups extra to keep it helpful. It also makes the
same adjustment in the CI under the most recent CPython versions to
keep the testing going.

Are there changes in behavior for the user?

pip install aiohttp[speedups] will only request cchardet under CPython < 3.10

Related issue number

Checklist

  • I think the code is well written
  • 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."

`cchardet` stopped being maintained a while ago so this patch removes
it from the `speedups` extra to keep it helpful. It also makes the
same adjustment in the CI under the most recent CPython versions to
keep the testing going.

Refs:
* aio-libs#6819 (comment)
* PyYoshi/cChardet#77
@webknjaz webknjaz added bug enhancement meta dependencies Pull requests that update a dependency file backport-3.8 labels Aug 3, 2022
@webknjaz webknjaz requested a review from asvetlov as a code owner August 3, 2022 14:42
@webknjaz webknjaz self-assigned this Aug 3, 2022
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Aug 3, 2022
@codecov
Copy link

codecov bot commented Aug 3, 2022

Codecov Report

Merging #6857 (16e3e5a) into master (0db3362) will increase coverage by 71.68%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           master    #6857       +/-   ##
===========================================
+ Coverage   21.76%   93.44%   +71.68%     
===========================================
  Files         104      104               
  Lines       30628    30629        +1     
  Branches     3064     3076       +12     
===========================================
+ Hits         6666    28622    +21956     
+ Misses      23859     1838    -22021     
- Partials      103      169       +66     
Flag Coverage Δ
unit 93.36% <ø> (+71.62%) ⬆️

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

Impacted Files Coverage Δ
aiohttp/client_ws.py 21.96% <0.00%> (ø)
tests/autobahn/test_autobahn.py 38.33% <0.00%> (+6.66%) ⬆️
tests/test_circular_imports.py 100.00% <0.00%> (+7.69%) ⬆️
aiohttp/abc.py 100.00% <0.00%> (+7.86%) ⬆️
aiohttp/web_exceptions.py 99.52% <0.00%> (+22.27%) ⬆️
tests/conftest.py 68.42% <0.00%> (+25.43%) ⬆️
aiohttp/resolver.py 64.00% <0.00%> (+28.00%) ⬆️
aiohttp/tracing.py 100.00% <0.00%> (+36.12%) ⬆️
tests/test_resolver.py 70.07% <0.00%> (+37.79%) ⬆️
aiohttp/client_exceptions.py 96.66% <0.00%> (+39.16%) ⬆️
... and 85 more

📣 Codecov can now indicate which changes are the most critical in Pull Requests. Learn more

@webknjaz webknjaz merged commit 1e8c40f into aio-libs:master Aug 3, 2022
@patchback
Copy link
Contributor

patchback bot commented Aug 3, 2022

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

❌ Failed to cleanly apply 1e8c40f on top of patchback/backports/3.8/1e8c40fe48245247f63549ebe119a6f309614889/pr-6857

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

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

❌ Failed to cleanly apply 1e8c40f on top of patchback/backports/3.9/1e8c40fe48245247f63549ebe119a6f309614889/pr-6857

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

Backport to 3.9: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.9/1e8c40fe48245247f63549ebe119a6f309614889/pr-6857

Backported as #6861

🤖 @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 Aug 3, 2022

Backport to 3.8: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.8/1e8c40fe48245247f63549ebe119a6f309614889/pr-6857

Backported as #6862

🤖 @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:provided There is a change note present in this PR bug dependencies Pull requests that update a dependency file enhancement meta
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant