Thanks to visit codestin.com
Credit goes to github.com

Skip to content

🔥 require python >= 3.7 #956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kba merged 7 commits into from
Feb 16, 2023
Merged

🔥 require python >= 3.7 #956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2849f5f
:fire: require python >= 3.7
kba Nov 22, 2022
506234e
Merge branch 'master' into drop-3.6
kba Nov 30, 2022
f1527a2
:fire: upgrade base image to 20.04
kba Dec 12, 2022
b4c98ce
dockerfile: venv not needed, autoremove gcc
kba Jan 20, 2023
c35a753
ci: test with newest python versions
kba Feb 15, 2023
8698fc2
test for python 3.11;
kba Feb 15, 2023
27427e2
ci: typo 3.7.1{7,6}
kba Feb 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
27 changes: 15 additions & 12 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down