Increase the upper boundary of the multidict dependency allowing v6 #6950

hugovk · 2022-09-21T07:04:13Z

What do these changes do?

The multidict dependency used to be multidict >=4.5, < 7.0 in aiohttp 3.8.1, but was pinned down to multidict >=4.5, < 6.0 in aiohttp 3.8.2 (#6550) in an attempt to help avoid new errors.

However, https://github.com/python/bedevere/ uses multidict==6.0.2 so the requirements resolution fails with aiohttp==3.8.2:

ERROR: Cannot install -r requirements.txt (line 1) and multidict==6.0.2 because these package versions have conflicting dependencies.

The conflict is caused by:
    The user requested multidict==6.0.2
    aiohttp 3.8.2 depends on multidict<6.0 and >=4.5

To fix this you could try to:
1. loosen the range of package versions you've specified
2. remove package versions to allow pip attempt to solve the dependency conflict

https://github.com/hugovk/bedevere/actions/runs/3095794573/jobs/5010600772

Are there changes in behavior for the user?

None that I know of, other than they can install multidict v6 as with aiohttp 3.8.1.

Related issue number

Partially related to closed #6600 and merged #6550.

Checklist

I think the code is well written
[n/a] Unit tests for the changes exist
[n/a] Documentation reflects the changes
[already there] 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."

codecov · 2022-09-21T07:17:25Z

Codecov Report

Merging #6950 (e477473) into 3.8 (ee5e951) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##              3.8    #6950   +/-   ##
=======================================
  Coverage   97.39%   97.39%           
=======================================
  Files         107      107           
  Lines       30970    30970           
  Branches     3922     3922           
=======================================
+ Hits        30162    30164    +2     
+ Misses        604      602    -2     
  Partials      204      204

Flag	Coverage Δ
CI-GHA	`97.26% <100.00%> (+<0.01%)`	⬆️
OS-Linux	`96.90% <100.00%> (+<0.01%)`	⬆️
OS-Windows	`95.23% <ø> (ø)`
OS-macOS	`96.65% <100.00%> (+0.01%)`	⬆️
Py-3.10.6	`96.42% <100.00%> (-0.01%)`	⬇️
Py-3.10.7	`96.55% <100.00%> (+<0.01%)`	⬆️
Py-3.11.0-rc.2	`96.21% <100.00%> (-0.01%)`	⬇️
Py-3.6.15	`96.37% <100.00%> (+<0.01%)`	⬆️
Py-3.6.8	`94.75% <ø> (ø)`
Py-3.7.13	`96.53% <100.00%> (ø)`
Py-3.7.9	`94.89% <ø> (ø)`
Py-3.8.10	`94.81% <ø> (ø)`
Py-3.8.13	`96.49% <100.00%> (+<0.01%)`	⬆️
Py-3.9.13	`96.77% <100.00%> (-0.01%)`	⬇️
Py-3.9.14	`96.23% <100.00%> (+<0.01%)`	⬆️
Py-pypy7.3.9	`96.07% <100.00%> (+<0.01%)`	⬆️
VM-macos	`96.65% <100.00%> (+0.01%)`	⬆️
VM-ubuntu	`96.90% <100.00%> (+<0.01%)`	⬆️
VM-windows	`95.23% <ø> (ø)`

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

Impacted Files	Coverage Δ
aiohttp/web_ws.py	`92.11% <100.00%> (ø)`
tests/test_client_functional.py	`98.54% <0.00%> (+0.09%)`	⬆️

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

Rongronggg9 · 2022-09-21T07:19:05Z

Facing exactly the same issue
https://github.com/Rongronggg9/RSS-to-Telegram-Bot/actions/runs/3094555753/jobs/5008056472

See also
https://pypi.org/pypi/aiohttp/json

I think this can be merged quickly since
#6550 (comment)

A new version (maybe v3.8.2.post0?) should be quickly released after merging or it may be a wide impact.

hugovk · 2022-09-21T07:54:28Z

The CI passes on my fork: https://github.com/hugovk/aiohttp/actions/runs/3095913542 (I had to add a workaround to allow it to run on feature branches) ✅

webknjaz · 2022-09-21T10:06:56Z

should be quickly released

Unfortunately, the process isn't quick. So I've just yanked the release and will make a new ".3" with this instead.

setup.cfg

webknjaz · 2022-09-21T10:17:56Z

So I verified that the constraints files can't be updated. Besides that, it seems like a few cosmetic improvements are needed here and it'll be good to go.

CHANGES/6950.bugfix

Bumps [aiohttp](https://github.com/aio-libs/aiohttp) from 3.7.4.post0 to 3.8.3. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/aio-libs/aiohttp/releases">aiohttp's releases</a>.</em></p> <blockquote> <h2>3.8.3</h2> <p>.. attention::</p> <p>This is the last :doc:<code>aiohttp <index></code> release tested under Python 3.6. The 3.9 stream is dropping it from the CI and the distribution package metadata.</p> <h2>Bugfixes</h2> <ul> <li> <p>Increased the upper boundary of the :doc:<code>multidict:index</code> dependency to allow for the version 6 -- by :user:<code>hugovk</code>.</p> <p>It used to be limited below version 7 in :doc:<code>aiohttp <index></code> v3.8.1 but was lowered in v3.8.2 via :pr:<code>6550</code> and never brought back, causing problems with dependency pins when upgrading. :doc:<code>aiohttp <index></code> v3.8.3 fixes that by recovering the original boundary of <code>< 7</code>. (<a href="https://github-redirect.dependabot.com/aio-libs/aiohttp/issues/6950">#6950</a>)</p> </li> </ul> <hr /> <h1>3.8.2 (2022-09-20, subsequently yanked on 2022-09-21)</h1> <p>.. note::</p> <p>This release has some compatibility fixes for Python 3.11 but it may still have some quirks. Some tests are still flaky in the CI.</p> <p>.. caution::</p> <p>This release has been yanked from PyPI. Modern pip will not pick it up automatically. The reason is that is has <code>multidict < 6</code> set in the distribution package metadata (see :pr:<code>6950</code>). Please, use <code>aiohttp ~= 3.8.3, != 3.8.1</code> instead, if you can.</p> <h2>Bugfixes</h2> <ul> <li>Added support for registering :rfc:<code>OPTIONS <9110#OPTIONS></code> HTTP method handlers via :py:class:<code>~aiohttp.web.RouteTableDef</code>. (<a href="https://github-redirect.dependabot.com/aio-libs/aiohttp/issues/4663">#4663</a>)</li> <li>Started supporting :rfc:<code>authority-form <9112#authority-form></code> and :rfc:<code>absolute-form <9112#absolute-form></code> URLs on the server-side. (<a href="https://github-redirect.dependabot.com/aio-libs/aiohttp/issues/6227">#6227</a>)</li> <li>Fixed Python 3.11 incompatibilities by using Cython 0.29.25. (<a href="https://github-redirect.dependabot.com/aio-libs/aiohttp/issues/6396">#6396</a>)</li> <li>Extended the <code>sock</code> argument typing declaration of the</li> </ul>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst">aiohttp's changelog</a>.</em></p> <blockquote> <h1>3.8.3 (2022-09-21)</h1> <p>.. attention::</p> <p>This is the last :doc:<code>aiohttp <index></code> release tested under Python 3.6. The 3.9 stream is dropping it from the CI and the distribution package metadata.</p> <h2>Bugfixes</h2> <ul> <li> <p>Increased the upper boundary of the :doc:<code>multidict:index</code> dependency to allow for the version 6 -- by :user:<code>hugovk</code>.</p> <p>It used to be limited below version 7 in :doc:<code>aiohttp <index></code> v3.8.1 but was lowered in v3.8.2 via :pr:<code>6550</code> and never brought back, causing problems with dependency pins when upgrading. :doc:<code>aiohttp <index></code> v3.8.3 fixes that by recovering the original boundary of <code>< 7</code>. <code>[#6950](aio-libs/aiohttp#6950) <https://github.com/aio-libs/aiohttp/issues/6950></code>_</p> </li> </ul> <hr /> <h1>3.8.2 (2022-09-20, subsequently yanked on 2022-09-21)</h1> <h2>Bugfixes</h2> <ul> <li> <p>Support registering OPTIONS HTTP method handlers via RouteTableDef. <code>[#4663](aio-libs/aiohttp#4663) <https://github.com/aio-libs/aiohttp/issues/4663></code>_</p> </li> <li> <p>Started supporting <code>authority-form</code> and <code>absolute-form</code> URLs on the server-side. <code>[#6227](aio-libs/aiohttp#6227) <https://github.com/aio-libs/aiohttp/issues/6227></code>_</p> </li> <li> <p>Fix Python 3.11 alpha incompatibilities by using Cython 0.29.25 <code>[#6396](aio-libs/aiohttp#6396) <https://github.com/aio-libs/aiohttp/issues/6396></code>_</p> </li> <li> <p>Remove a deprecated usage of pytest.warns(None) <code>[#6663](aio-libs/aiohttp#6663) <https://github.com/aio-libs/aiohttp/issues/6663></code>_</p> </li> <li> <p>Fix regression where <code>asyncio.CancelledError</code> occurs on client disconnection. <code>[#6719](aio-libs/aiohttp#6719) <https://github.com/aio-libs/aiohttp/issues/6719></code>_</p> </li> <li> <p>Export :py:class:<code>~aiohttp.web.PrefixedSubAppResource</code> under :py:mod:<code>aiohttp.web</code> -- by :user:<code>Dreamsorcerer</code>.</p> <p>This fixes a regression introduced by :pr:<code>3469</code>. <code>[#6889](aio-libs/aiohttp#6889) <https://github.com/aio-libs/aiohttp/issues/6889></code>_</p> </li> <li> <p>Dropped the :class:<code>object</code> type possibility from the :py:attr:<code>aiohttp.ClientSession.timeout</code> property return type declaration. <code>[#6917](aio-libs/aiohttp#6917) <https://github.com/aio-libs/aiohttp/issues/6917></code>_,</p> </li> </ul>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/aio-libs/aiohttp/commit/30b7a4e99677b4014dda2372504343bb05fc983e"><code>30b7a4e</code></a> Add a yanking caution message to v3.8.2 changelog</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/18279443d4081a02585739d52c5822340068a13f"><code>1827944</code></a> Stop including an empty changelog draft in Sphinx</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/58a4733a17f7d1a29ceda6d8cabd8d4204039038"><code>58a4733</code></a> Mention that v3.8.2 has been yanked</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/13f50f949b8eca81c3809bc79f106e2336d49781"><code>13f50f9</code></a> Move the Python 3.6 attention box to v3.8.3</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/cb20fd2be57f96bdef243a50d9cfd539ef13c095"><code>cb20fd2</code></a> Bump aiohttp to v3.8.3</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/50203c42e51d820d7ea88d7faa019484c049c1e3"><code>50203c4</code></a> Increase the upper boundary of the multidict dependency allowing v6</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/ee5e951244b98c407d9156b00b3bd3f445c092fa"><code>ee5e951</code></a> Merge branch 'release/v3.8.2' into 3.8</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/3ef9cab654f1d2101d4e243cd5907966f9953f4c"><code>3ef9cab</code></a> Bump the hardcoded version to v3.8.2.post0.dev0</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/99c8d0d7706153970bc1cbace8bdf4ab137783c7"><code>99c8d0d</code></a> Brush up the changelog wording for v3.8.2</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/a56b31cae75506e0640808567372359a159b1f96"><code>a56b31c</code></a> Add a note about Python 3.6 in the changelog</li> <li>Additional commits viewable in <a href="https://github.com/aio-libs/aiohttp/compare/v3.7.4.post0...v3.8.3">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=aiohttp&package-manager=pip&previous-version=3.7.4.post0&new-version=3.8.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: renadvent <ericktiddle@gmail.com>

Re-allow newer multidict

415fb44

hugovk requested review from webknjaz and asvetlov as code owners September 21, 2022 07:04

hugovk added 2 commits September 21, 2022 10:04

Fix mypy: unused "type: ignore" comment

1e9724a

Add news fragment

8c711eb

psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Sep 21, 2022

hugovk changed the title ~~Re-allow newer multidict~~ [3.8] Re-allow newer multidict Sep 21, 2022

hugovk mentioned this pull request Sep 21, 2022

Pin down multidict #6550

Merged

webknjaz mentioned this pull request Sep 21, 2022

Fails to build on Python 3.11 - longintrepr.h: No such file or directory #6600

Closed

1 task

webknjaz reviewed Sep 21, 2022

View changes

setup.cfg Show resolved Hide resolved

webknjaz reviewed Sep 21, 2022

View changes

CHANGES/6950.bugfix Outdated Show resolved Hide resolved

Make the change note verbose

e05d310

webknjaz reviewed Sep 21, 2022

View changes

CHANGES/6950.bugfix Outdated Show resolved Hide resolved

Adjust news wording

e477473

webknjaz approved these changes Sep 21, 2022

View changes

webknjaz changed the title ~~[3.8] Re-allow newer multidict~~ Increase the upper boundary of the multidict dependency allowing v6 Sep 21, 2022

webknjaz merged commit 50203c4 into aio-libs:3.8 Sep 21, 2022
36 of 38 checks passed

hugovk deleted the 3.8-bump-multidict branch September 21, 2022 12:21

webknjaz mentioned this pull request Sep 21, 2022

Release v3.8.3 #6953

Merged

5 tasks

dabio mentioned this pull request Sep 22, 2022

Bump aiohttp from 3.8.1 to 3.8.3 dabio/rafi#118

Closed

Increase the upper boundary of the multidict dependency allowing v6 #6950

Increase the upper boundary of the multidict dependency allowing v6 #6950

hugovk commented Sep 21, 2022 •

edited by webknjaz

codecov bot commented Sep 21, 2022 •

edited

Rongronggg9 commented Sep 21, 2022 •

edited

hugovk commented Sep 21, 2022 •

edited

webknjaz commented Sep 21, 2022 •

edited

webknjaz commented Sep 21, 2022

Increase the upper boundary of the multidict dependency allowing v6 #6950

Increase the upper boundary of the multidict dependency allowing v6 #6950

Conversation

hugovk commented Sep 21, 2022 • edited by webknjaz

What do these changes do?

Are there changes in behavior for the user?

Related issue number

Checklist

codecov bot commented Sep 21, 2022 • edited

Codecov Report

Rongronggg9 commented Sep 21, 2022 • edited

hugovk commented Sep 21, 2022 • edited

webknjaz commented Sep 21, 2022 • edited

webknjaz commented Sep 21, 2022

hugovk commented Sep 21, 2022 •

edited by webknjaz

codecov bot commented Sep 21, 2022 •

edited

Rongronggg9 commented Sep 21, 2022 •

edited

hugovk commented Sep 21, 2022 •

edited

webknjaz commented Sep 21, 2022 •

edited