From 6e189f734c7176e010cc3cf8f60c36902e3e64d2 Mon Sep 17 00:00:00 2001 From: Luis Martinez de Bartolome Izquierdo Date: Mon, 11 Jun 2018 13:23:04 +0200 Subject: [PATCH 1/2] pip conflict idna resolution --- conans/requirements_osx.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conans/requirements_osx.txt b/conans/requirements_osx.txt index 16fce9b96ac..287ac5ce523 100644 --- a/conans/requirements_osx.txt +++ b/conans/requirements_osx.txt @@ -1,5 +1,5 @@ +idna==2.6 # Solving conflict, requests requires idna<2.7 and cryptography idna=2.7 cryptography>=1.3.4, <2.2.0 pyOpenSSL>=16.0.0, <18.0.0 ndg-httpsclient>=0.4.1, <0.5.0 pyasn>=1.5.0b7, <1.6.0 - From 42dcb2ab84f6b3f37681f4c5d08a92c18554d4db Mon Sep 17 00:00:00 2001 From: Luis Martinez de Bartolome Izquierdo Date: Mon, 11 Jun 2018 13:38:23 +0200 Subject: [PATCH 2/2] Update comment --- conans/requirements_osx.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conans/requirements_osx.txt b/conans/requirements_osx.txt index 287ac5ce523..0774179b56a 100644 --- a/conans/requirements_osx.txt +++ b/conans/requirements_osx.txt @@ -1,4 +1,4 @@ -idna==2.6 # Solving conflict, requests requires idna<2.7 and cryptography idna=2.7 +idna==2.6 # Solving conflict, somehow is installing 2.7 when requests require 2.6 cryptography>=1.3.4, <2.2.0 pyOpenSSL>=16.0.0, <18.0.0 ndg-httpsclient>=0.4.1, <0.5.0