From 7945e59f769b9ac14e8a1f1a6174366eafa68a32 Mon Sep 17 00:00:00 2001 From: Ned Batchelder <ned@edx.org> Date: Fri, 7 Dec 2018 11:23:40 -0500 Subject: [PATCH] Pin idna to prevent conflicts --- requirements/edx-sandbox/shared.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/requirements/edx-sandbox/shared.in b/requirements/edx-sandbox/shared.in index f073be0d3f7..c5057c8914e 100644 --- a/requirements/edx-sandbox/shared.in +++ b/requirements/edx-sandbox/shared.in @@ -16,6 +16,13 @@ pyparsing # Python parsing library; used by the calc p sympy==0.7.1 # Symbolic math library; used by the calc package scipy==0.14.0 # Math, science, and engineering library; used by the calc package +# Pinned early: +# edx-sandbox/shared.in has cryptography, which wants idna, and finds 2.8 +# paver.in has requests, which wants idna<2.8 +# but paver.in includes edx-sandbox/shared.txt which now pins idna==2.8 +# *conflict* +idna<2.8 + # Install these packages from the edx-platform working tree # NOTE: if you change code in these packages, you MUST change the version # number in its setup.py or the code WILL NOT be installed during deploy. -- GitLab