diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2022-06-21 23:02:41 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2022-06-21 23:02:41 +0000 |
| commit | 050fbf6d5262475f5839794ac9aeeeb388300886 (patch) | |
| tree | c6a41c17a35cc977917ea99408e3e583dea54f99 | |
| parent | 2022-06-21 22:48:23 UTC (diff) | |
| parent | dev-python/requests: fix pinned charset_normalize dep (diff) | |
| download | gentoo-050fbf6d5262475f5839794ac9aeeeb388300886.tar.gz gentoo-050fbf6d5262475f5839794ac9aeeeb388300886.tar.bz2 gentoo-050fbf6d5262475f5839794ac9aeeeb388300886.zip | |
Merge updates from master
| -rw-r--r-- | dev-python/requests/files/requests-2.28.0-unpin-charset-normalizer.patch | 33 | ||||
| -rw-r--r-- | dev-python/requests/requests-2.28.0-r1.ebuild (renamed from dev-python/requests/requests-2.28.0.ebuild) | 4 |
2 files changed, 37 insertions, 0 deletions
diff --git a/dev-python/requests/files/requests-2.28.0-unpin-charset-normalizer.patch b/dev-python/requests/files/requests-2.28.0-unpin-charset-normalizer.patch new file mode 100644 index 000000000000..b9f3a04aa02e --- /dev/null +++ b/dev-python/requests/files/requests-2.28.0-unpin-charset-normalizer.patch @@ -0,0 +1,33 @@ +https://github.com/psf/requests/pull/6169 +https://bugs.gentoo.org/853247 + +From 9e9cd2a257392988e6fa417361c3085e5b85af85 Mon Sep 17 00:00:00 2001 +From: Lumir Balhar <lbalhar@redhat.com> +Date: Mon, 20 Jun 2022 09:32:16 +0200 +Subject: [PATCH] Allow charset normalizer >=2 and <3 + +--- a/setup.py ++++ b/setup.py +@@ -59,7 +59,7 @@ def run_tests(self): + sys.exit() + + requires = [ +- "charset_normalizer~=2.0.0", ++ "charset_normalizer~=2.0", + "idna>=2.5,<4", + "urllib3>=1.21.1,<1.27", + "certifi>=2017.4.17", + +diff --git a/setup.cfg b/setup.cfg +index 751c171..99166ef 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -5,7 +5,7 @@ provides-extra = + use_chardet_on_py3 + requires-dist = + certifi>=2017.4.17 +- charset_normalizer~=2.0.0 ++ charset_normalizer~=2.0 + idna>=2.5,<4 + urllib3>=1.21.1,<1.27 + diff --git a/dev-python/requests/requests-2.28.0.ebuild b/dev-python/requests/requests-2.28.0-r1.ebuild index 4d6d1335f33e..b96762bee446 100644 --- a/dev-python/requests/requests-2.28.0.ebuild +++ b/dev-python/requests/requests-2.28.0-r1.ebuild @@ -42,6 +42,10 @@ BDEPEND=" ) " +PATCHES=( + "${FILESDIR}"/${PN}-2.28.0-unpin-charset-normalizer.patch +) + distutils_enable_tests pytest python_test() { |