From 7034bfddff9967f467a25c2dac6713dbe083d433 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Tue, 20 Sep 2022 23:59:45 +0200 Subject: [PATCH 1/6] Bump the hardcoded `aiohttp` version to v3.8.2 --- aiohttp/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aiohttp/__init__.py b/aiohttp/__init__.py index 4bbcef29350..d5851e2679e 100644 --- a/aiohttp/__init__.py +++ b/aiohttp/__init__.py @@ -1,4 +1,4 @@ -__version__ = "3.8.1" +__version__ = "3.8.2" from typing import Tuple From 4ac8ce3441eb3ccd677c0b11aed7efa32c425816 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Tue, 20 Sep 2022 11:03:12 +0200 Subject: [PATCH 2/6] Generate a change log for v3.8.2 --- CHANGES.rst | 59 ++++++++++++++++++++++++++++++++++++++++++++ CHANGES/4046.removal | 1 - CHANGES/4137.doc | 1 - CHANGES/4663.bugfix | 1 - CHANGES/6227.bugfix | 1 - CHANGES/6369.misc | 3 --- CHANGES/6396.bugfix | 1 - CHANGES/6399.misc | 1 - CHANGES/6401.doc | 1 - CHANGES/6550.misc | 1 - CHANGES/6663.bugfix | 1 - CHANGES/6708.misc | 1 - CHANGES/6719.bugfix | 1 - CHANGES/6757.misc | 3 --- CHANGES/6857.misc | 2 -- CHANGES/6872.misc | 1 - CHANGES/6889.bugfix | 4 --- CHANGES/6917.bugfix | 3 --- CHANGES/6917.doc | 1 - CHANGES/6923.bugfix | 1 - CHANGES/6923.doc | 1 - 21 files changed, 59 insertions(+), 30 deletions(-) delete mode 100644 CHANGES/4046.removal delete mode 100644 CHANGES/4137.doc delete mode 100644 CHANGES/4663.bugfix delete mode 100644 CHANGES/6227.bugfix delete mode 100644 CHANGES/6369.misc delete mode 100644 CHANGES/6396.bugfix delete mode 100644 CHANGES/6399.misc delete mode 100644 CHANGES/6401.doc delete mode 100644 CHANGES/6550.misc delete mode 100644 CHANGES/6663.bugfix delete mode 100644 CHANGES/6708.misc delete mode 100644 CHANGES/6719.bugfix delete mode 100644 CHANGES/6757.misc delete mode 100644 CHANGES/6857.misc delete mode 100644 CHANGES/6872.misc delete mode 100644 CHANGES/6889.bugfix delete mode 100644 CHANGES/6917.bugfix delete mode 120000 CHANGES/6917.doc delete mode 120000 CHANGES/6923.bugfix delete mode 120000 CHANGES/6923.doc diff --git a/CHANGES.rst b/CHANGES.rst index a367e2d4ba4..f8f52570335 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -10,6 +10,65 @@ .. towncrier release notes start + +3.8.2 (2022-09-20) +================== + +Bugfixes +-------- + +- Support registering OPTIONS HTTP method handlers via RouteTableDef. + `#4663 `_ +- Started supporting ``authority-form`` and ``absolute-form`` URLs on the server-side. + `#6227 `_ +- Fix Python 3.11 alpha incompatibilities by using Cython 0.29.25 + `#6396 `_ +- Remove a deprecated usage of pytest.warns(None) + `#6663 `_ +- Fix regression where ``asyncio.CancelledError`` occurs on client disconnection. + `#6719 `_ +- Export :py:class:`~aiohttp.web.PrefixedSubAppResource` under + :py:mod:`aiohttp.web` -- by :user:`Dreamsorcerer`. + + This fixes a regression introduced by :pr:`3469`. + `#6889 `_ +- Dropped the :class:`object` type possibility from + the :py:attr:`aiohttp.ClientSession.timeout` + property return type declaration. + `#6917 `_, + `#6923 `_ + + +Improved Documentation +---------------------- + +- Added clarification on configuring the app object with settings such as a db connection. + `#4137 `_ +- Edited the web.run_app declaration. + `#6401 `_ +- Dropped the :class:`object` type possibility from + the :py:attr:`aiohttp.ClientSession.timeout` + property return type declaration. + `#6917 `_, + `#6923 `_ + + +Deprecations and Removals +------------------------- + +- Drop Python 3.5 support, aiohttp works on 3.6+ now. + `#4046 `_ + + +Misc +---- + +- `#6369 `_, `#6399 `_, `#6550 `_, `#6708 `_, `#6757 `_, `#6857 `_, `#6872 `_ + + +---- + + 3.8.1 (2021-11-14) ================== diff --git a/CHANGES/4046.removal b/CHANGES/4046.removal deleted file mode 100644 index 169774857bd..00000000000 --- a/CHANGES/4046.removal +++ /dev/null @@ -1 +0,0 @@ -Drop Python 3.5 support, aiohttp works on 3.6+ now. diff --git a/CHANGES/4137.doc b/CHANGES/4137.doc deleted file mode 100644 index e51e89a33a8..00000000000 --- a/CHANGES/4137.doc +++ /dev/null @@ -1 +0,0 @@ -Added clarification on configuring the app object with settings such as a db connection. diff --git a/CHANGES/4663.bugfix b/CHANGES/4663.bugfix deleted file mode 100644 index c2d8fb5a6b4..00000000000 --- a/CHANGES/4663.bugfix +++ /dev/null @@ -1 +0,0 @@ -Support registering OPTIONS HTTP method handlers via RouteTableDef. diff --git a/CHANGES/6227.bugfix b/CHANGES/6227.bugfix deleted file mode 100644 index df097565bcd..00000000000 --- a/CHANGES/6227.bugfix +++ /dev/null @@ -1 +0,0 @@ -Started supporting ``authority-form`` and ``absolute-form`` URLs on the server-side. diff --git a/CHANGES/6369.misc b/CHANGES/6369.misc deleted file mode 100644 index 8882cd1b2ca..00000000000 --- a/CHANGES/6369.misc +++ /dev/null @@ -1,3 +0,0 @@ -Fixed the CI check used in the branch protection to gate merging PR, now -broken pull requests from ``Dependabot`` and others are not auto-merged -silently anymore -- :user:`webknjaz`. diff --git a/CHANGES/6396.bugfix b/CHANGES/6396.bugfix deleted file mode 100644 index 889fb2b735d..00000000000 --- a/CHANGES/6396.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix Python 3.11 alpha incompatibilities by using Cython 0.29.25 diff --git a/CHANGES/6399.misc b/CHANGES/6399.misc deleted file mode 100644 index beaeafbea61..00000000000 --- a/CHANGES/6399.misc +++ /dev/null @@ -1 +0,0 @@ -Do not install C sources with binary distributions. diff --git a/CHANGES/6401.doc b/CHANGES/6401.doc deleted file mode 100644 index 5920747db3a..00000000000 --- a/CHANGES/6401.doc +++ /dev/null @@ -1 +0,0 @@ -Edited the web.run_app declaration. diff --git a/CHANGES/6550.misc b/CHANGES/6550.misc deleted file mode 100644 index db8cae6a468..00000000000 --- a/CHANGES/6550.misc +++ /dev/null @@ -1 +0,0 @@ -Pin multidict<6, due to possible regressions. diff --git a/CHANGES/6663.bugfix b/CHANGES/6663.bugfix deleted file mode 100644 index ee89799a0e9..00000000000 --- a/CHANGES/6663.bugfix +++ /dev/null @@ -1 +0,0 @@ -Remove a deprecated usage of pytest.warns(None) diff --git a/CHANGES/6708.misc b/CHANGES/6708.misc deleted file mode 100644 index 69fcadf6b45..00000000000 --- a/CHANGES/6708.misc +++ /dev/null @@ -1 +0,0 @@ -Replace deprecated cgi module usage with email.parser. diff --git a/CHANGES/6719.bugfix b/CHANGES/6719.bugfix deleted file mode 100644 index b42ccca255d..00000000000 --- a/CHANGES/6719.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix regression where ``asyncio.CancelledError`` occurs on client disconnection. diff --git a/CHANGES/6757.misc b/CHANGES/6757.misc deleted file mode 100644 index 986e3feb95f..00000000000 --- a/CHANGES/6757.misc +++ /dev/null @@ -1,3 +0,0 @@ -Work around the changes in 3.11, e.g. :py:class:`~asyncio.TimeoutError` is an :py:class:`OSError`, -and :py:class:`~unittest.IsolatedAsyncioTestCase` calls :py:function:`~asyncio.set_event_loop` -differently -- by :user:`graingert`. diff --git a/CHANGES/6857.misc b/CHANGES/6857.misc deleted file mode 100644 index 3af5791308c..00000000000 --- a/CHANGES/6857.misc +++ /dev/null @@ -1,2 +0,0 @@ -Excluded :term:`cchardet` from the ``speedups`` extra in the package -metadata under Python 3.10 or higher -- by :user:`webknjaz`. diff --git a/CHANGES/6872.misc b/CHANGES/6872.misc deleted file mode 100644 index 6cb08c89518..00000000000 --- a/CHANGES/6872.misc +++ /dev/null @@ -1 +0,0 @@ -Fixed suppression of :py:class:`ResourceWarning`s in the pytest setup -- by :user:`graingert`. diff --git a/CHANGES/6889.bugfix b/CHANGES/6889.bugfix deleted file mode 100644 index ea438993d84..00000000000 --- a/CHANGES/6889.bugfix +++ /dev/null @@ -1,4 +0,0 @@ -Export :py:class:`~aiohttp.web.PrefixedSubAppResource` under -:py:mod:`aiohttp.web` -- by :user:`Dreamsorcerer`. - -This fixes a regression introduced by :pr:`3469`. diff --git a/CHANGES/6917.bugfix b/CHANGES/6917.bugfix deleted file mode 100644 index 468e21a2b0f..00000000000 --- a/CHANGES/6917.bugfix +++ /dev/null @@ -1,3 +0,0 @@ -Dropped the :class:`object` type possibility from -the :py:attr:`aiohttp.ClientSession.timeout` -property return type declaration. diff --git a/CHANGES/6917.doc b/CHANGES/6917.doc deleted file mode 120000 index b8eddb8d6dc..00000000000 --- a/CHANGES/6917.doc +++ /dev/null @@ -1 +0,0 @@ -6917.bugfix \ No newline at end of file diff --git a/CHANGES/6923.bugfix b/CHANGES/6923.bugfix deleted file mode 120000 index b8eddb8d6dc..00000000000 --- a/CHANGES/6923.bugfix +++ /dev/null @@ -1 +0,0 @@ -6917.bugfix \ No newline at end of file diff --git a/CHANGES/6923.doc b/CHANGES/6923.doc deleted file mode 120000 index c05397962f9..00000000000 --- a/CHANGES/6923.doc +++ /dev/null @@ -1 +0,0 @@ -6917.doc \ No newline at end of file From 2b49d2a61054b669bded114598f4da1f2b9a6c30 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Tue, 20 Sep 2022 11:36:43 +0200 Subject: [PATCH 3/6] Add a note about Python 3.11 support shortcomings --- CHANGES.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index f8f52570335..92a00a92cb0 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -14,6 +14,11 @@ 3.8.2 (2022-09-20) ================== +.. note:: + + 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. + Bugfixes -------- From a56b31cae75506e0640808567372359a159b1f96 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Tue, 20 Sep 2022 15:42:50 +0200 Subject: [PATCH 4/6] Add a note about Python 3.6 in the changelog --- CHANGES.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 92a00a92cb0..b0d7925b230 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -19,6 +19,12 @@ 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. +.. attention:: + + This is the last :doc:`aiohttp ` release tested under + Python 3.6. The 3.9 stream is dropping it from the CI and the + distribution package metadata. + Bugfixes -------- From 99c8d0d7706153970bc1cbace8bdf4ab137783c7 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Tue, 20 Sep 2022 16:08:50 +0200 Subject: [PATCH 5/6] Brush up the changelog wording for v3.8.2 This patch also moves miscategorized entries to proper sections. --- CHANGES.rst | 36 ++++++++++++++++++++++++------------ docs/conf.py | 1 + 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index b0d7925b230..ecdf50dedbd 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -28,18 +28,23 @@ Bugfixes -------- -- Support registering OPTIONS HTTP method handlers via RouteTableDef. +- Added support for registering :rfc:`OPTIONS <9110#OPTIONS>` + HTTP method handlers via :py:class:`~aiohttp.web.RouteTableDef`. `#4663 `_ -- Started supporting ``authority-form`` and ``absolute-form`` URLs on the server-side. +- Started supporting :rfc:`authority-form <9112#authority-form>` and + :rfc:`absolute-form <9112#absolute-form>` URLs on the server-side. `#6227 `_ -- Fix Python 3.11 alpha incompatibilities by using Cython 0.29.25 +- Fixed Python 3.11 incompatibilities by using Cython 0.29.25. `#6396 `_ -- Remove a deprecated usage of pytest.warns(None) - `#6663 `_ -- Fix regression where ``asyncio.CancelledError`` occurs on client disconnection. +- Extended the ``sock`` argument typing declaration of the + :py:func:`~aiohttp.web.run_app` function as optionally + accepting iterables. + `#6401 `_ +- Fixed a regression where :py:exc:`~asyncio.CancelledError` + occurs on client disconnection. `#6719 `_ -- Export :py:class:`~aiohttp.web.PrefixedSubAppResource` under - :py:mod:`aiohttp.web` -- by :user:`Dreamsorcerer`. +- Started exporting :py:class:`~aiohttp.web.PrefixedSubAppResource` + under :py:mod:`aiohttp.web` -- by :user:`Dreamsorcerer`. This fixes a regression introduced by :pr:`3469`. `#6889 `_ @@ -53,9 +58,12 @@ Bugfixes Improved Documentation ---------------------- -- Added clarification on configuring the app object with settings such as a db connection. +- Added clarification on configuring the app object with + settings such as a database connection. `#4137 `_ -- Edited the web.run_app declaration. +- Extended the ``sock`` argument typing declaration of the + :py:func:`~aiohttp.web.run_app` function as optionally + accepting iterables. `#6401 `_ - Dropped the :class:`object` type possibility from the :py:attr:`aiohttp.ClientSession.timeout` @@ -67,14 +75,18 @@ Improved Documentation Deprecations and Removals ------------------------- -- Drop Python 3.5 support, aiohttp works on 3.6+ now. +- Dropped Python 3.5 support, :doc:`aiohttp ` only works + under Python 3.6 and higher from now on. `#4046 `_ Misc ---- -- `#6369 `_, `#6399 `_, `#6550 `_, `#6708 `_, `#6757 `_, `#6857 `_, `#6872 `_ +- Removed a deprecated usage of :py:func:`pytest.warns(None) + ` in tests. + `#6663 `_ +- `#6369 `_, `#6399 `_, `#6550 `_, `#6708 `_, `#6757 `_, `#6857 `_, `#6872 `_. ---- diff --git a/docs/conf.py b/docs/conf.py index f10012d0081..029db20ea26 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -67,6 +67,7 @@ intersphinx_mapping = { + "pytest": ("http://docs.pytest.org/en/latest/", None), "python": ("http://docs.python.org/3", None), "multidict": ("https://multidict.readthedocs.io/en/stable/", None), "yarl": ("https://yarl.readthedocs.io/en/stable/", None), From 3ef9cab654f1d2101d4e243cd5907966f9953f4c Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Tue, 20 Sep 2022 20:46:49 +0200 Subject: [PATCH 6/6] Bump the hardcoded version to v3.8.2.post0.dev0 --- aiohttp/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aiohttp/__init__.py b/aiohttp/__init__.py index d5851e2679e..e439218f88c 100644 --- a/aiohttp/__init__.py +++ b/aiohttp/__init__.py @@ -1,4 +1,4 @@ -__version__ = "3.8.2" +__version__ = "3.8.2.post0.dev0" from typing import Tuple