From 03bfd7a3906cb956879195ce93e61a6eee59fd86 Mon Sep 17 00:00:00 2001 From: Clemens Neudecker <952378+cneud@users.noreply.github.com> Date: Tue, 26 Sep 2023 18:16:20 +0200 Subject: [PATCH 1/5] Update requirements.txt Update to `tensorflow>=2.12` (drops Python 3.7 support) * fix #114 * fix #115 Tested by @vahidrezanezhad @cneud --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a19a191..530dac2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ ocrd >= 2.23.3 numpy <1.24.0 scikit-learn >= 0.23.2 -tensorflow >= 2.4.0, <2.12.0 +tensorflow >=2.12.0 imutils >= 0.5.3 matplotlib setuptools >= 50 From 9d3a1a5b769e6a34b1e26255f999ac4b45f72b94 Mon Sep 17 00:00:00 2001 From: Clemens Neudecker <952378+cneud@users.noreply.github.com> Date: Tue, 26 Sep 2023 18:32:20 +0200 Subject: [PATCH 2/5] Update test-eynollah.yml --- .github/workflows/test-eynollah.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-eynollah.yml b/.github/workflows/test-eynollah.yml index e06cb35..d380408 100644 --- a/.github/workflows/test-eynollah.yml +++ b/.github/workflows/test-eynollah.yml @@ -3,7 +3,7 @@ name: Python package -on: [push, pull_request] +on: [push] jobs: build: @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.7', '3.8'] + python-version: ['3.8', '3.8', '3.9', '3.10', '3.11'] steps: - uses: actions/checkout@v2 @@ -33,4 +33,4 @@ jobs: pip install . pip install -r requirements-test.txt - name: Test with pytest - run: make test \ No newline at end of file + run: make test From 6c65fc4dfe54f0471d0178640a68581e37d9ae56 Mon Sep 17 00:00:00 2001 From: Clemens Neudecker <952378+cneud@users.noreply.github.com> Date: Tue, 26 Sep 2023 18:33:05 +0200 Subject: [PATCH 3/5] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a782d8f..d2b7057 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,5 +47,5 @@ workflows: version: 2 build: jobs: - - build-python37 + # - build-python37 - build-python38 From 56934c876a796cfe45bcbc1f0ce1e070234c3de7 Mon Sep 17 00:00:00 2001 From: cneud <952378+cneud@users.noreply.github.com> Date: Tue, 26 Sep 2023 18:53:10 +0200 Subject: [PATCH 4/5] remove duplicate test for Python 3.8 --- .github/workflows/test-eynollah.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-eynollah.yml b/.github/workflows/test-eynollah.yml index d380408..30c9729 100644 --- a/.github/workflows/test-eynollah.yml +++ b/.github/workflows/test-eynollah.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.8', '3.8', '3.9', '3.10', '3.11'] + python-version: ['3.8', '3.9', '3.10', '3.11'] steps: - uses: actions/checkout@v2 From 4254ce3bdbabaf34bcf79d06df6acc6a1c128527 Mon Sep 17 00:00:00 2001 From: cneud <952378+cneud@users.noreply.github.com> Date: Tue, 26 Sep 2023 18:54:14 +0200 Subject: [PATCH 5/5] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 003cc2d..47d81bc 100644 --- a/README.md +++ b/README.md @@ -19,9 +19,9 @@ * [OCR-D](https://github.com/qurator-spk/eynollah#use-as-ocr-d-processor) interface ## Installation -Python versions `3.7-3.10` with Tensorflow versions `2.4-2.11` are currently supported. +Python versions `3.8-3.11` with Tensorflow versions >=`2.12` are currently supported. -For (limited) GPU support the [matching](https://www.tensorflow.org/install/source#gpu) CUDA toolkit needs to be installed. +For (limited) GPU support the CUDA toolkit needs to be installed. You can either install via