Merge branch 'drop-3.6'

.circleci/config.yml

@@ -16,39 +16,49 @@ jobs:
       - run: make deps-test install PIP=pip3
       - run: make test benchmark PYTHON=python3
 
-  test-python36:
+  test-python37:
     docker:
-      - image: python:3.6.12
+      - image: python:3.7.16
     working_directory: ~/ocrd-core
     steps:
       - checkout
       - run: apt-get -y update
       - run: make deps-ubuntu deps-test install
       - run: make test benchmark
 
-  test-python37:
+  test-python38:
     docker:
-      - image: python:3.7.9
+      - image: python:3.8.16
     working_directory: ~/ocrd-core
     steps:
       - checkout
       - run: apt-get -y update
       - run: make deps-ubuntu deps-test install
       - run: make test benchmark
 
-  test-python38:
+  test-python39:
     docker:
-      - image: python:3.8.5
+      - image: python:3.9.16
     working_directory: ~/ocrd-core
     steps:
       - checkout
       - run: apt-get -y update
       - run: make deps-ubuntu deps-test install
       - run: make test benchmark
 
-  test-python39:
+  test-python310:
+    docker:
+      - image: python:3.10.10
+    working_directory: ~/ocrd-core
+    steps:
+      - checkout
+      - run: apt-get -y update
+      - run: make deps-ubuntu deps-test install
+      - run: make test benchmark
+
+  test-python311:
     docker:
-      - image: python:3.9
+      - image: python:3.11.2
     working_directory: ~/ocrd-core
     steps:
       - checkout
@@ -80,8 +90,9 @@ workflows:
               only: master
   test-pull-request:
     jobs:
-      - test-python36
       - test-python37
       - test-python38
       - test-python39
+      - test-python310
+      - test-python311
       - test-macos

Dockerfile

@@ -18,20 +18,23 @@ COPY Makefile .
 COPY README.md .
 COPY LICENSE .
 RUN echo 'APT::Install-Recommends "0"; APT::Install-Suggests "0";' >/etc/apt/apt.conf.d/ocr-d.conf
-RUN apt-get update && apt-get -y install \
-    ca-certificates \
-    software-properties-common \
-    python3-dev \
-    python3-pip \
-    make \
-    wget \
-    time \
-    curl \
-    sudo \
-    git \
+RUN apt-get update && apt-get -y install software-properties-common \
+    && apt-get update && apt-get -y install \
+        ca-certificates \
+        python3-dev \
+        python3-pip \
+        gcc \
+        make \
+        wget \
+        time \
+        curl \
+        sudo \
+        git \
     && make deps-ubuntu \
-    && pip3 install --upgrade pip setuptools \
+    && pip install --upgrade pip setuptools \
     && make install \
+    && apt-get remove -y gcc \
+    && apt-get autoremove -y \
     && $FIXUP \
     && rm -rf /build-ocrd
 

Makefile

@@ -49,7 +49,7 @@ help:
 DOCKER_TAG = ocrd/core
 
 # Docker base image. Default: '$(DOCKER_BASE_IMAGE)'.
-DOCKER_BASE_IMAGE = ubuntu:18.04
+DOCKER_BASE_IMAGE = ubuntu:20.04
 
 # Additional arguments to docker build. Default: '$(DOCKER_ARGS)'
 DOCKER_ARGS = 

README.md

@@ -62,7 +62,7 @@ pip install ocrd
 pip install ocrd_modelfactory
 ```
 
-All python software released by [OCR-D](https://github.com/OCR-D) requires Python 3.6 or higher.
+All python software released by [OCR-D](https://github.com/OCR-D) requires Python 3.7 or higher.
 
 **NOTE** Some OCR-D-Tools (or even test cases) _might_ reveal an unintended behavior if you have specific environment modifications, like:
 * using a custom build of [ImageMagick](https://github.com/ImageMagick/ImageMagick), whose format delegates are different from what OCR-D supposes