Improve import time #6591

Dreamsorcerer · 2022-02-03T19:24:12Z

See aio-libs/aiohttp-debugtoolbar#394 (comment)

for more information, see https://pre-commit.ci

CHANGES/6591.misc

tests/test_imports.py

lgtm-com · 2022-02-03T19:57:55Z

This pull request introduces 1 alert when merging 3f18cfa into f78c128 - view on LGTM.com

new alerts:

1 for Unused local variable

Co-authored-by: Sviatoslav Sydorenko <sviat@redhat.com>

Dreamsorcerer · 2022-02-03T21:29:24Z

Any idea what this internal error from coverage is about? Seems to have just started happening when I switched it to sys.executable.

for more information, see https://pre-commit.ci

codecov · 2022-02-09T18:32:32Z

Codecov Report

Merging #6591 (91087d2) into master (d7ebbeb) will decrease coverage by 0.01%.
The diff coverage is 89.74%.

@@            Coverage Diff             @@
##           master    #6591      +/-   ##
==========================================
- Coverage   97.50%   97.49%   -0.02%     
==========================================
  Files         103      103              
  Lines       29990    30016      +26     
  Branches     3643     3647       +4     
==========================================
+ Hits        29243    29265      +22     
- Misses        567      569       +2     
- Partials      180      182       +2

Flag	Coverage Δ
CI-GHA	`97.40% <89.74%> (-0.02%)`	⬇️
OS-Linux	`97.03% <84.61%> (-0.03%)`	⬇️
OS-Windows	`95.35% <64.10%> (-0.04%)`	⬇️
OS-macOS	`96.65% <66.66%> (-0.04%)`	⬇️
Py-3.10.8	`97.15% <89.74%> (-0.02%)`	⬇️
Py-3.11.0	`96.54% <84.61%> (-0.02%)`	⬇️
Py-3.7.15	`96.87% <84.61%> (-0.02%)`	⬇️
Py-3.7.9	`95.24% <64.10%> (-0.04%)`	⬇️
Py-3.8.10	`95.14% <64.10%> (-0.05%)`	⬇️
Py-3.8.14	`96.76% <84.61%> (-0.02%)`	⬇️
Py-3.9.13	`95.13% <64.10%> (-0.04%)`	⬇️
Py-3.9.14	`96.53% <66.66%> (-0.05%)`	⬇️
Py-3.9.15	`96.74% <84.61%> (-0.02%)`	⬇️
Py-pypy7.3.9	`96.40% <66.66%> (-0.05%)`	⬇️
VM-macos	`96.65% <66.66%> (-0.04%)`	⬇️
VM-ubuntu	`97.03% <84.61%> (-0.03%)`	⬇️
VM-windows	`95.35% <64.10%> (-0.04%)`	⬇️

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

Impacted Files	Coverage Δ
aiohttp/__init__.py	`92.85% <86.66%> (-7.15%)`	⬇️
tests/test_imports.py	`91.66% <91.66%> (ø)`

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

.coveragerc

Dreamsorcerer · 2022-10-29T16:25:59Z

OK, I'm totally lost on why we always get an import error. Anybody got any ideas how to fix this?

webknjaz · 2022-10-29T22:01:23Z

Maybe because you're patching PYTHONPATH? Old tests didn't do that. And I don't know if pytester changes the directory (it probably does).

webknjaz · 2022-10-29T22:02:30Z

Also, you modify environ for the whole test process, not just one test. This will have weird side-effects.

Dreamsorcerer · 2022-10-30T12:26:56Z

Maybe because you're patching PYTHONPATH? Old tests didn't do that. And I don't know if pytester changes the directory (it probably does).

That was me trying to fix the issue, not the cause.

I think it might have been working before merging master, let's see if it works on an older pytest release, maybe some change there broke it..

Dreamsorcerer · 2022-10-30T13:43:41Z

OK, I've even pushed a separate branch from the time the tests were successful, but they are failing now: #7060

Seems like something outside of our code has changed the CI behaviour, so it no longer imports...

webknjaz · 2022-10-31T01:26:51Z

Does it pass locally for you?

for more information, see https://pre-commit.ci

Dreamsorcerer · 2022-10-31T15:35:13Z

OK, seem to have got it working now, even if it seems a bit awkward. The Python invocation seems to end up with half as many entries in sys.path than the main process does, so I've had to copy it into PYTHONPATH to get it to run with the same path values.

Dreamsorcerer · 2022-10-31T16:29:26Z

OK, full CI run passed twice with a threshold of 410ms. Think we can merge this and take a look at the other 2 PRs relating to import time.

patchback · 2022-11-20T23:17:16Z

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

❌ Failed to cleanly apply a8dbb68 on top of patchback/backports/3.9/a8dbb68e19d93fb0a49ff0eca9fa3ec3d18cd4c9/pr-6591

Backporting merged PR #6591 into master

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
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
```

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/a8dbb68e19d93fb0a49ff0eca9fa3ec3d18cd4c9/pr-6591 upstream/3.9

Now, cherry-pick PR Improve import time #6591 contents into that branch:
```
$ git cherry-pick -x a8dbb68e19d93fb0a49ff0eca9fa3ec3d18cd4c9
```
If it'll yell at you with something like fatal: Commit a8dbb68e19d93fb0a49ff0eca9fa3ec3d18cd4c9 is a merge but no -m option was given., add -m 1 as follows intead:
```
$ git cherry-pick -m1 -x a8dbb68e19d93fb0a49ff0eca9fa3ec3d18cd4c9
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Improve import time #6591 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/3.9/a8dbb68e19d93fb0a49ff0eca9fa3ec3d18cd4c9/pr-6591

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.

[![Mend Renovate logo banner](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [aiohttp](https://togithub.com/aio-libs/aiohttp) | `==3.8.6` -> `==3.9.0` | [![age](https://developer.mend.io/api/mc/badges/age/pypi/aiohttp/3.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/pypi/aiohttp/3.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/pypi/aiohttp/3.8.6/3.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/pypi/aiohttp/3.8.6/3.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>aio-libs/aiohttp (aiohttp)</summary> ### [`v3.9.0`](https://togithub.com/aio-libs/aiohttp/blob/HEAD/CHANGES.rst#390-2023-11-18) [Compare Source](https://togithub.com/aio-libs/aiohttp/compare/v3.8.6...v3.9.0) \================== ## Features - Introduced `AppKey` for static typing support of `Application` storage. See https://docs.aiohttp.org/en/stable/web_advanced.html#application-s-config `#5864 <https://github.com/aio-libs/aiohttp/issues/5864>`\_ - Added a graceful shutdown period which allows pending tasks to complete before the application's cleanup is called. The period can be adjusted with the `shutdown_timeout` parameter. -- by :user:`Dreamsorcerer`. See https://docs.aiohttp.org/en/latest/web_advanced.html#graceful-shutdown `#7188 <https://github.com/aio-libs/aiohttp/issues/7188>`\_ - Added `handler_cancellation <https://docs.aiohttp.org/en/stable/web_advanced.html#web-handler-cancellation>`\_ parameter to cancel web handler on client disconnection. -- by :user:`mosquito` This (optionally) reintroduces a feature removed in a previous release. Recommended for those looking for an extra level of protection against denial-of-service attacks. `#7056 <https://github.com/aio-libs/aiohttp/issues/7056>`\_ - Added support for setting response header parameters `max_line_size` and `max_field_size`. `#2304 <https://github.com/aio-libs/aiohttp/issues/2304>`\_ - Added `auto_decompress` parameter to `ClientSession.request` to override `ClientSession._auto_decompress`. -- by :user:`Daste745` `#3751 <https://github.com/aio-libs/aiohttp/issues/3751>`\_ - Changed `raise_for_status` to allow a coroutine. `#3892 <https://github.com/aio-libs/aiohttp/issues/3892>`\_ - Added client brotli compression support (optional with runtime check). `#5219 <https://github.com/aio-libs/aiohttp/issues/5219>`\_ - Added `client_max_size` to `BaseRequest.clone()` to allow overriding the request body size. -- :user:`anesabml`. `#5704 <https://github.com/aio-libs/aiohttp/issues/5704>`\_ - Added a middleware type alias `aiohttp.typedefs.Middleware`. `#5898 <https://github.com/aio-libs/aiohttp/issues/5898>`\_ - Exported `HTTPMove` which can be used to catch any redirection request that has a location -- :user:`dreamsorcerer`. `#6594 <https://github.com/aio-libs/aiohttp/issues/6594>`\_ - Changed the `path` parameter in `web.run_app()` to accept a `pathlib.Path` object. `#6839 <https://github.com/aio-libs/aiohttp/issues/6839>`\_ - Performance: Skipped filtering `CookieJar` when the jar is empty or all cookies have expired. `#7819 <https://github.com/aio-libs/aiohttp/issues/7819>`\_ - Performance: Only check origin if insecure scheme and there are origins to treat as secure, in `CookieJar.filter_cookies()`. `#7821 <https://github.com/aio-libs/aiohttp/issues/7821>`\_ - Performance: Used timestamp instead of `datetime` to achieve faster cookie expiration in `CookieJar`. `#7824 <https://github.com/aio-libs/aiohttp/issues/7824>`\_ - Added support for passing a custom server name parameter to HTTPS connection. `#7114 <https://github.com/aio-libs/aiohttp/issues/7114>`\_ - Added support for using Basic Auth credentials from :file:`.netrc` file when making HTTP requests with the :py:class:`~aiohttp.ClientSession` `trust_env` argument is set to `True`. -- by :user:`yuvipanda`. `#7131 <https://github.com/aio-libs/aiohttp/issues/7131>`\_ - Turned access log into no-op when the logger is disabled. `#7240 <https://github.com/aio-libs/aiohttp/issues/7240>`\_ - Added typing information to `RawResponseMessage`. -- by :user:`Gobot1234` `#7365 <https://github.com/aio-libs/aiohttp/issues/7365>`\_ - Removed `async-timeout` for Python 3.11+ (replaced with `asyncio.timeout()` on newer releases). `#7502 <https://github.com/aio-libs/aiohttp/issues/7502>`\_ - Added support for `brotlicffi` as an alternative to `brotli` (fixing Brotli support on PyPy). `#7611 <https://github.com/aio-libs/aiohttp/issues/7611>`\_ - Added `WebSocketResponse.get_extra_info()` to access a protocol transport's extra info. `#7078 <https://github.com/aio-libs/aiohttp/issues/7078>`\_ - Allow `link` argument to be set to None/empty in HTTP 451 exception. `#7689 <https://github.com/aio-libs/aiohttp/issues/7689>`\_ ## Bugfixes - Implemented stripping the trailing dots from fully-qualified domain names in `Host` headers and TLS context when acting as an HTTP client. This allows the client to connect to URLs with FQDN host name like `https://example.com./`. \-- by :user:`martin-sucha`. `#3636 <https://github.com/aio-libs/aiohttp/issues/3636>`\_ - Fixed client timeout not working when incoming data is always available without waiting. -- by :user:`Dreamsorcerer`. `#5854 <https://github.com/aio-libs/aiohttp/issues/5854>`\_ - Fixed `readuntil` to work with a delimiter of more than one character. `#6701 <https://github.com/aio-libs/aiohttp/issues/6701>`\_ - Added `__repr__` to `EmptyStreamReader` to avoid `AttributeError`. `#6916 <https://github.com/aio-libs/aiohttp/issues/6916>`\_ - Fixed bug when using `TCPConnector` with `ttl_dns_cache=0`. `#7014 <https://github.com/aio-libs/aiohttp/issues/7014>`\_ - Fixed response returned from expect handler being thrown away. -- by :user:`Dreamsorcerer` `#7025 <https://github.com/aio-libs/aiohttp/issues/7025>`\_ - Avoided raising `UnicodeDecodeError` in multipart and in HTTP headers parsing. `#7044 <https://github.com/aio-libs/aiohttp/issues/7044>`\_ - Changed `sock_read` timeout to start after writing has finished, avoiding read timeouts caused by an unfinished write. -- by :user:`dtrifiro` `#7149 <https://github.com/aio-libs/aiohttp/issues/7149>`\_ - Fixed missing query in tracing method URLs when using `yarl` 1.9+. `#7259 <https://github.com/aio-libs/aiohttp/issues/7259>`\_ - Changed max 32-bit timestamp to an aware datetime object, for consistency with the non-32-bit one, and to avoid a `DeprecationWarning` on Python 3.12. `#7302 <https://github.com/aio-libs/aiohttp/issues/7302>`\_ - Fixed `EmptyStreamReader.iter_chunks()` never ending. -- by :user:`mind1m` `#7616 <https://github.com/aio-libs/aiohttp/issues/7616>`\_ - Fixed a rare `RuntimeError: await wasn't used with future` exception. -- by :user:`stalkerg` `#7785 <https://github.com/aio-libs/aiohttp/issues/7785>`\_ - Fixed issue with insufficient HTTP method and version validation. `#7700 <https://github.com/aio-libs/aiohttp/issues/7700>`\_ - Added check to validate that absolute URIs have schemes. `#7712 <https://github.com/aio-libs/aiohttp/issues/7712>`\_ - Fixed unhandled exception when Python HTTP parser encounters unpaired Unicode surrogates. `#7715 <https://github.com/aio-libs/aiohttp/issues/7715>`\_ - Updated parser to disallow invalid characters in header field names and stop accepting LF as a request line separator. `#7719 <https://github.com/aio-libs/aiohttp/issues/7719>`\_ - Fixed Python HTTP parser not treating 204/304/1xx as an empty body. `#7755 <https://github.com/aio-libs/aiohttp/issues/7755>`\_ - Ensure empty body response for 1xx/204/304 per RFC 9112 sec 6.3. `#7756 <https://github.com/aio-libs/aiohttp/issues/7756>`\_ - Fixed an issue when a client request is closed before completing a chunked payload. -- by :user:`Dreamsorcerer` `#7764 <https://github.com/aio-libs/aiohttp/issues/7764>`\_ - Edge Case Handling for ResponseParser for missing reason value. `#7776 <https://github.com/aio-libs/aiohttp/issues/7776>`\_ - Fixed `ClientWebSocketResponse.close_code` being erroneously set to `None` when there are concurrent async tasks receiving data and closing the connection. `#7306 <https://github.com/aio-libs/aiohttp/issues/7306>`\_ - Added HTTP method validation. `#6533 <https://github.com/aio-libs/aiohttp/issues/6533>`\_ - Fixed arbitrary sequence types being allowed to inject values via version parameter. -- by :user:`Dreamsorcerer` `#7835 <https://github.com/aio-libs/aiohttp/issues/7835>`\_ - Performance: Fixed increase in latency with small messages from websocket compression changes. `#7797 <https://github.com/aio-libs/aiohttp/issues/7797>`\_ ## Improved Documentation - Fixed the `ClientResponse.release`'s type in the doc. Changed from `comethod` to `method`. `#5836 <https://github.com/aio-libs/aiohttp/issues/5836>`\_ - Added information on behavior of base_url parameter in `ClientSession`. `#6647 <https://github.com/aio-libs/aiohttp/issues/6647>`\_ - Fixed `ClientResponseError` docs. `#6700 <https://github.com/aio-libs/aiohttp/issues/6700>`\_ - Updated Redis code examples to follow the latest API. `#6907 <https://github.com/aio-libs/aiohttp/issues/6907>`\_ - Added a note about possibly needing to update headers when using `on_response_prepare`. -- by :user:`Dreamsorcerer` `#7283 <https://github.com/aio-libs/aiohttp/issues/7283>`\_ - Completed `trust_env` parameter description to honor `wss_proxy`, `ws_proxy` or `no_proxy` env. `#7325 <https://github.com/aio-libs/aiohttp/issues/7325>`\_ - Expanded SSL documentation with more examples (e.g. how to use certifi). -- by :user:`Dreamsorcerer` `#7334 <https://github.com/aio-libs/aiohttp/issues/7334>`\_ - Fix, update, and improve client exceptions documentation. `#7733 <https://github.com/aio-libs/aiohttp/issues/7733>`\_ ## Deprecations and Removals - Added `shutdown_timeout` parameter to `BaseRunner`, while deprecating `shutdown_timeout` parameter from `BaseSite`. -- by :user:`Dreamsorcerer` `#7718 <https://github.com/aio-libs/aiohttp/issues/7718>`\_ - Dropped Python 3.6 support. `#6378 <https://github.com/aio-libs/aiohttp/issues/6378>`\_ - Dropped Python 3.7 support. -- by :user:`Dreamsorcerer` `#7336 <https://github.com/aio-libs/aiohttp/issues/7336>`\_ - Removed support for abandoned `tokio` event loop. -- by :user:`Dreamsorcerer` `#7281 <https://github.com/aio-libs/aiohttp/issues/7281>`\_ ## Misc - Made `print` argument in `run_app()` optional. `#3690 <https://github.com/aio-libs/aiohttp/issues/3690>`\_ - Improved performance of `ceil_timeout` in some cases. `#6316 <https://github.com/aio-libs/aiohttp/issues/6316>`\_ - Changed importing Gunicorn to happen on-demand, decreasing import time by ~53%. -- :user:`Dreamsorcerer` `#6591 <https://github.com/aio-libs/aiohttp/issues/6591>`\_ - Improved import time by replacing `http.server` with `http.HTTPStatus`. `#6903 <https://github.com/aio-libs/aiohttp/issues/6903>`\_ - Fixed annotation of `ssl` parameter to disallow `True`. -- by :user:`Dreamsorcerer`. `#7335 <https://github.com/aio-libs/aiohttp/issues/7335>`\_ *** </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/allenporter/pyrainbird).  Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Test import time.

6de1836

Dreamsorcerer requested a review from asvetlov as a code owner February 3, 2022 19:24

pre-commit-ci bot and others added 3 commits February 3, 2022 19:24

[pre-commit.ci] auto fixes from pre-commit.com hooks

13c30e6

for more information, see https://pre-commit.ci

Update test_imports.py

ec242b3

Lazy load gunicorn workers.

33e0ae5

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

[pre-commit.ci] auto fixes from pre-commit.com hooks

3f18cfa

for more information, see https://pre-commit.ci

webknjaz reviewed Feb 3, 2022

View reviewed changes

CHANGES/6591.misc Outdated Show resolved Hide resolved

webknjaz reviewed Feb 3, 2022

View reviewed changes

tests/test_imports.py Show resolved Hide resolved

webknjaz reviewed Feb 3, 2022

View reviewed changes

tests/test_imports.py Outdated Show resolved Hide resolved

Dreamsorcerer and others added 4 commits February 3, 2022 20:08

Fix type checking.

b9266d3

Merge

3b76c1f

Tweak run args.

cc3bd32

Update CHANGES/6591.misc

cf70791

Co-authored-by: Sviatoslav Sydorenko <sviat@redhat.com>

Dreamsorcerer and others added 5 commits February 9, 2022 17:48

Update test_imports.py

11157ea

Update test_imports.py

7a8cd02

Update test_imports.py

3fcf892

[pre-commit.ci] auto fixes from pre-commit.com hooks

79612ad

for more information, see https://pre-commit.ci

Update test_imports.py

98c35b1

Dreamsorcerer added 3 commits February 9, 2022 18:39

Update test_imports.py

08654c8

Create .coveragerc

2d9865e

Update setup.cfg

2f4c294

Dreamsorcerer commented Feb 9, 2022

View reviewed changes

.coveragerc Show resolved Hide resolved

Update test_imports.py

fd7e59d

Dreamsorcerer added the backport-3.9 Trigger automatic backporting to the 3.9 release branch by Patchback robot label Feb 9, 2022

Dreamsorcerer added 2 commits February 10, 2022 11:06

Update test_imports.py

36f8791

Update test_imports.py

312e09d

Update test_imports.py

94abba4

Dreamsorcerer added 4 commits October 30, 2022 12:35

Update test.txt

ea618a0

Update test_imports.py

7ff29c2

Update constraints.txt

d24422d

Update lint.txt

d2c8414

Dreamsorcerer and others added 11 commits October 31, 2022 14:38

Update test_imports.py

85139ba

Update test_imports.py

0e202e7

Update test_imports.py

e092c14

Update test_imports.py

a8dd9e8

Update test_imports.py

a3dbf66

Update test_imports.py

9ebc8a8

Merge branch 'master' into importtime

4f9d197

Update __init__.py

fdadd38

[pre-commit.ci] auto fixes from pre-commit.com hooks

86f6eb2

for more information, see https://pre-commit.ci

Update __init__.py

57a7ec9

Update test_imports.py

7d87ca8

Update test_imports.py

91087d2

Dreamsorcerer merged commit a8dbb68 into master Nov 20, 2022

Dreamsorcerer deleted the importtime branch November 20, 2022 23:17

hauntsaninja mentioned this pull request Sep 11, 2023

Importing gunicorn.config takes a lot of time benoitc/gunicorn#2613

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improve import time #6591

Improve import time #6591

Dreamsorcerer commented Feb 3, 2022 •

edited

lgtm-com bot commented Feb 3, 2022

Dreamsorcerer commented Feb 3, 2022 •

edited

codecov bot commented Feb 9, 2022 •

edited

Dreamsorcerer commented Oct 29, 2022

webknjaz commented Oct 29, 2022

webknjaz commented Oct 29, 2022

Dreamsorcerer commented Oct 30, 2022

Dreamsorcerer commented Oct 30, 2022

webknjaz commented Oct 31, 2022

Dreamsorcerer commented Oct 31, 2022

Dreamsorcerer commented Oct 31, 2022

patchback bot commented Nov 20, 2022 •

edited

Improve import time #6591

Improve import time #6591

Conversation

Dreamsorcerer commented Feb 3, 2022 • edited

lgtm-com bot commented Feb 3, 2022

Dreamsorcerer commented Feb 3, 2022 • edited

codecov bot commented Feb 9, 2022 • edited

Codecov Report

Dreamsorcerer commented Oct 29, 2022

webknjaz commented Oct 29, 2022

webknjaz commented Oct 29, 2022

Dreamsorcerer commented Oct 30, 2022

Dreamsorcerer commented Oct 30, 2022

webknjaz commented Oct 31, 2022

Dreamsorcerer commented Oct 31, 2022

Dreamsorcerer commented Oct 31, 2022

patchback bot commented Nov 20, 2022 • edited

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

Backporting merged PR #6591 into master

Dreamsorcerer commented Feb 3, 2022 •

edited

Dreamsorcerer commented Feb 3, 2022 •

edited

codecov bot commented Feb 9, 2022 •

edited

patchback bot commented Nov 20, 2022 •

edited