🧹 Don't use pip option --use-feature=2020-resolver anymore

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

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"
 
 

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"
 

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

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"
 
 

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"
 
 

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"
 
 

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
 

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"
 
 

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"