From dc7fb7df60dd3c9f1e4f6f2db54547f9d642cc26 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 17 Dec 2020 11:10:49 -0500 Subject: [PATCH] python3-aiohttp: include upstream patch to support new python3-chardet --- .../patches/chardet-version.patch | 30 +++++++++++++++++++ srcpkgs/python3-aiohttp/template | 8 ++--- srcpkgs/python3-aiohttp/update | 1 + 3 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/python3-aiohttp/patches/chardet-version.patch create mode 100644 srcpkgs/python3-aiohttp/update diff --git a/srcpkgs/python3-aiohttp/patches/chardet-version.patch b/srcpkgs/python3-aiohttp/patches/chardet-version.patch new file mode 100644 index 00000000000..43fac97ac8f --- /dev/null +++ b/srcpkgs/python3-aiohttp/patches/chardet-version.patch @@ -0,0 +1,30 @@ +From b0ed732d0a637e43c72bb1a777d02776cde37376 Mon Sep 17 00:00:00 2001 +From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> +Date: Fri, 11 Dec 2020 10:24:17 +0200 +Subject: [PATCH] Bump chardet from 3.0.4 to 4.0.0 (#5333) + +Bumps [chardet](https://github.com/chardet/chardet) from 3.0.4 to 4.0.0. +- [Release notes](https://github.com/chardet/chardet/releases) +- [Commits](https://github.com/chardet/chardet/compare/3.0.4...4.0.0) + +Signed-off-by: dependabot[bot] + +Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> +--- + requirements/base.txt | 2 +- + setup.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git setup.py setup.py +index a9edd5d0c8..54b548c7b4 100644 +--- setup.py ++++ setup.py +@@ -66,7 +66,7 @@ + + install_requires = [ + "attrs>=17.3.0", +- "chardet>=2.0,<4.0", ++ "chardet>=2.0,<5.0", + "multidict>=4.5,<7.0", + "async_timeout>=4.0a2,<5.0", + 'asynctest==0.13.0; python_version<"3.8"', diff --git a/srcpkgs/python3-aiohttp/template b/srcpkgs/python3-aiohttp/template index 2f750504163..bc5e18b1fe0 100644 --- a/srcpkgs/python3-aiohttp/template +++ b/srcpkgs/python3-aiohttp/template @@ -1,7 +1,7 @@ # Template file for 'python3-aiohttp' pkgname=python3-aiohttp version=3.7.3 -revision=1 +revision=2 wrksrc="aiohttp-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -15,8 +15,8 @@ homepage="https://aiohttp.readthedocs.io/" distfiles="${PYPI_SITE}/a/aiohttp/aiohttp-${version}.tar.gz" checksum=9c1a81af067e72261c9cbe33ea792893e83bc6aa987bfbd6fdc1e5e7b22777c4 -pre_build() { +post_patch() { # use system http-parser - sed -i '/http_parser\.c/d' setup.py - sed -i '/http_parser\.h/s/".*\//"/' aiohttp/_cparser.pxd + vsed -i '/http_parser\.c/d' -i setup.py + vsed -i '/http_parser\.h/s/".*\//"/' -i aiohttp/_cparser.pxd } diff --git a/srcpkgs/python3-aiohttp/update b/srcpkgs/python3-aiohttp/update new file mode 100644 index 00000000000..89e510abc95 --- /dev/null +++ b/srcpkgs/python3-aiohttp/update @@ -0,0 +1 @@ +pattern="aiohttp-\K[0-9.]+(?=\.tar\.gz)"