From f05c26232f9455aa636b0f048662f298eb51b294 Mon Sep 17 00:00:00 2001
From: "Gerber, Mike" <mike.gerber@sbb.spk-berlin.de>
Date: Thu, 3 Dec 2020 18:45:52 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20Don't=20use=20pip=20option=20=20?=
 =?UTF-8?q?--use-feature=3D2020-resolver=20anymore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile-core                  | 2 +-
 Dockerfile-dinglehopper          | 2 +-
 Dockerfile-ocrd_calamari         | 2 +-
 Dockerfile-ocrd_calamari03       | 2 +-
 Dockerfile-ocrd_cis              | 2 +-
 Dockerfile-ocrd_fileformat       | 2 +-
 Dockerfile-ocrd_olena            | 2 +-
 Dockerfile-ocrd_tesserocr        | 2 +-
 Dockerfile-sbb_binarization      | 2 +-
 Dockerfile-sbb_textline_detector | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Dockerfile-core b/Dockerfile-core
index f548c83..97f4c87 100644
--- a/Dockerfile-core
+++ b/Dockerfile-core
@@ -1,6 +1,6 @@
 FROM ubuntu:18.04
 
-ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver"
+ARG PIP_INSTALL="pip install --no-cache-dir"
 ARG OCRD_VERSION_MINIMUM="2.21.0"
 ENV LC_ALL=C.UTF-8 LANG=C.UTF-8
 ENV PIP_DEFAULT_TIMEOUT=120
diff --git a/Dockerfile-dinglehopper b/Dockerfile-dinglehopper
index a95d487..8885325 100644
--- a/Dockerfile-dinglehopper
+++ b/Dockerfile-dinglehopper
@@ -1,6 +1,6 @@
 FROM my_ocrd_workflow-core
 
-ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver"
+ARG PIP_INSTALL="pip install --no-cache-dir"
 ARG DINGLEHOPPER_COMMIT="6e47acd"
 
 
diff --git a/Dockerfile-ocrd_calamari b/Dockerfile-ocrd_calamari
index 083d97d..d1f4493 100644
--- a/Dockerfile-ocrd_calamari
+++ b/Dockerfile-ocrd_calamari
@@ -2,7 +2,7 @@ FROM my_ocrd_workflow-core
 
 
 # XXX https://github.com/OCR-D/core/issues/642
-#ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver"
+#ARG PIP_INSTALL="pip install --no-cache-dir"
 ARG PIP_INSTALL="pip install --no-cache-dir"
 ARG OCRD_CALAMARI_VERSION="1.0.0"
 
diff --git a/Dockerfile-ocrd_calamari03 b/Dockerfile-ocrd_calamari03
index 549c4ed..6d4089b 100644
--- a/Dockerfile-ocrd_calamari03
+++ b/Dockerfile-ocrd_calamari03
@@ -1,6 +1,6 @@
 FROM my_ocrd_workflow-core
 
-ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver"
+ARG PIP_INSTALL="pip install --no-cache-dir"
 
 
 # Build pip installable stuff
diff --git a/Dockerfile-ocrd_cis b/Dockerfile-ocrd_cis
index 9cb02bd..f846251 100644
--- a/Dockerfile-ocrd_cis
+++ b/Dockerfile-ocrd_cis
@@ -1,6 +1,6 @@
 FROM my_ocrd_workflow-core
 
-ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver"
+ARG PIP_INSTALL="pip install --no-cache-dir"
 ARG OCRD_CIS_VERSION="0.1.5"
 
 
diff --git a/Dockerfile-ocrd_fileformat b/Dockerfile-ocrd_fileformat
index c1a2180..deff0c6 100644
--- a/Dockerfile-ocrd_fileformat
+++ b/Dockerfile-ocrd_fileformat
@@ -1,6 +1,6 @@
 FROM my_ocrd_workflow-core
 
-ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver"
+ARG PIP_INSTALL="pip install --no-cache-dir"
 ARG OCRD_FILEFORMAT_VERSION="0.1.1"
 
 
diff --git a/Dockerfile-ocrd_olena b/Dockerfile-ocrd_olena
index 644ad4e..1f2bcd4 100644
--- a/Dockerfile-ocrd_olena
+++ b/Dockerfile-ocrd_olena
@@ -1,6 +1,6 @@
 FROM my_ocrd_workflow-core
 
-ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver"
+ARG PIP_INSTALL="pip install --no-cache-dir"
 ARG OCRD_OLENA_VERSION="1.2.0"
 
 
diff --git a/Dockerfile-ocrd_tesserocr b/Dockerfile-ocrd_tesserocr
index 6776eff..b95ab2a 100644
--- a/Dockerfile-ocrd_tesserocr
+++ b/Dockerfile-ocrd_tesserocr
@@ -1,6 +1,6 @@
 FROM my_ocrd_workflow-core
 
-ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver"
+ARG PIP_INSTALL="pip install --no-cache-dir"
 ARG TESSDATA_BEST_VERSION="4.0.0"
 ENV TESSDATA_PREFIX /usr/local/share/tessdata
 
diff --git a/Dockerfile-sbb_binarization b/Dockerfile-sbb_binarization
index 6ee301d..64cd158 100644
--- a/Dockerfile-sbb_binarization
+++ b/Dockerfile-sbb_binarization
@@ -1,6 +1,6 @@
 FROM my_ocrd_workflow-core
 
-ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver"
+ARG PIP_INSTALL="pip install --no-cache-dir"
 ARG SBB_BINARIZATION_COMMIT="4d145cc"
 
 
diff --git a/Dockerfile-sbb_textline_detector b/Dockerfile-sbb_textline_detector
index d445bb8..9c864bb 100644
--- a/Dockerfile-sbb_textline_detector
+++ b/Dockerfile-sbb_textline_detector
@@ -1,6 +1,6 @@
 FROM my_ocrd_workflow-core
 
-ARG PIP_INSTALL="pip install --no-cache-dir --use-feature=2020-resolver"
+ARG PIP_INSTALL="pip install --no-cache-dir"
 ARG SBB_TEXTLINE_DETECTOR_COMMIT="247d5f9"