b360f25d6c
quilt cannot handle two patches in one file. It ends up merging them and removing the description from the second. To avoid this, split into two. Signed-off-by: Rosen Penev <rosenp@gmail.com>
25 lines
751 B
Diff
25 lines
751 B
Diff
From 9484e13c7da927119fe82794bb5571cec144b6d7 Mon Sep 17 00:00:00 2001
|
|
From: Naor Livne <naorlivne@gmail.com>
|
|
Date: Fri, 1 Jan 2021 14:31:14 +0200
|
|
Subject: [PATCH 1/2] bump idna has version 3.0 was released
|
|
|
|
Fixes issue (https://github.com/psf/requests/issues/5710):
|
|
pkg_resources.ContextualVersionConflict: (idna 3.0 (/usr/lib/python3.9/site-packages), Requirement.parse('idna<3,>=2.5'), {'requests'})
|
|
Origin of this patch:
|
|
https://github.com/psf/requests/pull/5711
|
|
|
|
---
|
|
setup.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -43,7 +43,7 @@ packages = ['requests']
|
|
|
|
requires = [
|
|
'chardet>=3.0.2,<5',
|
|
- 'idna>=2.5,<3',
|
|
+ 'idna>=2.5,<4',
|
|
'urllib3>=1.21.1,<1.27',
|
|
'certifi>=2017.4.17'
|
|
|