Skip to content

Commit 8afdc4d

Browse files
threexcbefelemewebknjaz
authored
Reflect llhttp license in core packaging metadata
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 <[email protected]> Co-Authored-By: 🇺🇦 Sviatoslav Sydorenko <[email protected]>
1 parent abc1781 commit 8afdc4d

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

CHANGES/11226.packaging.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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`.

CONTRIBUTORS.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,7 @@ Tim Menninger
354354
Tolga Tezel
355355
Tomasz Trebski
356356
Toshiaki Tanaka
357+
Trevor Gamblin
357358
Trinh Hoang Nhu
358359
Tymofii Tsiapa
359360
Vadim Suharnikov

setup.cfg

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ long_description = file: README.rst
1616
long_description_content_type = text/x-rst
1717
maintainer = aiohttp team <[email protected]>
1818
maintainer_email = [email protected]
19-
license = Apache-2.0
20-
license_files = LICENSE.txt
19+
license = Apache-2.0 AND MIT
20+
license_files =
21+
LICENSE.txt
22+
vendor/llhttp/LICENSE
2123
classifiers =
2224
Development Status :: 5 - Production/Stable
2325

0 commit comments

Comments
 (0)