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/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 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