From abc17812f88fb0a98bcc04eb6a3d848b27cabac9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Jul 2025 12:04:24 +0000
Subject: [PATCH 1/2] Bump virtualenv from 20.31.2 to 20.32.0 (#11326)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Bumps [virtualenv](https://github.com/pypa/virtualenv) from 20.31.2 to
20.32.0.
Release notes
Sourced from virtualenv's
releases.
20.32.0
What's Changed
New Contributors
Full Changelog: https://github.com/pypa/virtualenv/compare/20.31.2...20.32.0
Changelog
Sourced from virtualenv's
changelog.
v20.32.0 (2025-07-20)
Features - 20.32.0
- Warn on incorrect invocation of Nushell activation script -
by :user:`esafak`. (:issue:`nushell_activation`)
- Discover uv-managed Python installations (:issue:`2901`)
Bugfixes - 20.32.0
- Ignore missing absolute paths for python discovery - by
:user:
esafak (:issue:2870)
- Upgrade embedded setuptools to
80.9.0 from
80.3.1 - by :user:gaborbernat.
(:issue:2900)
Commits
[](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)
---
Dependabot commands and options
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 show ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@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)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
requirements/constraints.txt | 2 +-
requirements/dev.txt | 2 +-
requirements/lint.txt | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index 6fea02f6342..31522c1142c 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -289,7 +289,7 @@ uvloop==0.21.0 ; platform_system != "Windows"
# -r requirements/lint.in
valkey==6.1.0
# via -r requirements/lint.in
-virtualenv==20.31.2
+virtualenv==20.32.0
# via pre-commit
wait-for-it==2.3.0
# via -r requirements/test.in
diff --git a/requirements/dev.txt b/requirements/dev.txt
index 0fca26985c0..b6badecfdf2 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -280,7 +280,7 @@ uvloop==0.21.0 ; platform_system != "Windows" and implementation_name == "cpytho
# -r requirements/lint.in
valkey==6.1.0
# via -r requirements/lint.in
-virtualenv==20.31.2
+virtualenv==20.32.0
# via pre-commit
wait-for-it==2.3.0
# via -r requirements/test.in
diff --git a/requirements/lint.txt b/requirements/lint.txt
index c100791722d..49ffbfe0fd5 100644
--- a/requirements/lint.txt
+++ b/requirements/lint.txt
@@ -118,7 +118,7 @@ uvloop==0.21.0 ; platform_system != "Windows"
# via -r requirements/lint.in
valkey==6.1.0
# via -r requirements/lint.in
-virtualenv==20.31.2
+virtualenv==20.32.0
# via pre-commit
zlib-ng==0.5.1
# via -r requirements/lint.in
From 8afdc4dc5b5f9ced7cb52c13a66c136bd19c35cd Mon Sep 17 00:00:00 2001
From: Trevor Gamblin
Date: Mon, 21 Jul 2025 12:54:06 -0400
Subject: [PATCH 2/2] Reflect llhttp license in core packaging metadata
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
aiohttp vendors llhttp in its source distributions, and it also bundles it as a part for platform-specific wheels. Previously, this was not exposed in the core packaging metadata.
With this patch, now it is. The change includes both the license file from the vendored project and adds it to the SPDX expression following PEP 639.
This is configured through the `setup.cfg` config for the `setuptools` build backend.
PR #11226
Co-Authored-By: Karolina Surma
Co-Authored-By: 🇺🇦 Sviatoslav Sydorenko
---
CHANGES/11226.packaging.rst | 1 +
CONTRIBUTORS.txt | 1 +
setup.cfg | 6 ++++--
3 files changed, 6 insertions(+), 2 deletions(-)
create mode 100644 CHANGES/11226.packaging.rst
diff --git a/CHANGES/11226.packaging.rst b/CHANGES/11226.packaging.rst
new file mode 100644
index 00000000000..293a9beaadb
--- /dev/null
+++ b/CHANGES/11226.packaging.rst
@@ -0,0 +1 @@
+Started including the ``llhttp`` :file:`LICENSE` file in wheels by adding ``vendor/llhttp/LICENSE`` to ``license-files`` in :file:`setup.cfg` -- by :user:`threexc`.
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index eae7c357602..935782fe357 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -354,6 +354,7 @@ Tim Menninger
Tolga Tezel
Tomasz Trebski
Toshiaki Tanaka
+Trevor Gamblin
Trinh Hoang Nhu
Tymofii Tsiapa
Vadim Suharnikov
diff --git a/setup.cfg b/setup.cfg
index cf8326f1a4c..7f783324897 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,8 +16,10 @@ long_description = file: README.rst
long_description_content_type = text/x-rst
maintainer = aiohttp team
maintainer_email = team@aiohttp.org
-license = Apache-2.0
-license_files = LICENSE.txt
+license = Apache-2.0 AND MIT
+license_files =
+ LICENSE.txt
+ vendor/llhttp/LICENSE
classifiers =
Development Status :: 5 - Production/Stable