From 5806674fa0eda6cedb0a71adf9e2b66c407d770b Mon Sep 17 00:00:00 2001 From: "Gerber, Mike" Date: Fri, 7 Aug 2020 18:50:46 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=89=20Checkout=20pip=2020.2's=20new=20?= =?UTF-8?q?2020-resolver=20feature?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index dfcea55..e786a5d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,7 +55,7 @@ RUN pip3 install --no-cache-dir --upgrade pip && \ tar xvz -C ocrd_olena --strip-components=1 -f ocrd_olena.tar.gz && \ cd ocrd_olena && \ sed -i 's/^install: deps$/install:/' Makefile && \ - pip3 install --no-cache-dir ocrd && \ + pip3 install --no-cache-dir --use-feature=2020-resolver ocrd && \ make install PREFIX=/usr/local && \ cd .. && rm -rf ocrd_olena ocrd_olena.tar.gz @@ -73,7 +73,7 @@ COPY data/textline_detection /var/lib/textline_detection # Using pipdeptree here to get more info than from pip3 check COPY requirements.txt /tmp/ RUN pip3 install --no-cache-dir --upgrade pip && \ - pip3 install --no-cache-dir -r /tmp/requirements.txt && \ + pip3 install --no-cache-dir --use-feature=2020-resolver -r /tmp/requirements.txt && \ pip3 install --no-cache-dir pipdeptree && \ pipdeptree -w fail