From 916e0a1870a2543ee5658e5d5ae8afb90f9d378e Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Thu, 4 Feb 2021 15:37:36 +0100 Subject: [PATCH 1/4] restrict keras version to < 2.4 --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8368e37..4bb6103 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ # ocrd includes opencv, numpy, shapely, click -ocrd >= 2.20.1 -keras >= 2.3.1 +ocrd >= 2.20.3 +keras >= 2.3.1, < 2.4 scikit-learn >= 0.23.2 tensorflow-gpu >= 1.15, < 2 imutils >= 0.5.3 From f043eea273334ca0de2b97c7e743fa128cd264e6 Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Fri, 5 Feb 2021 13:26:14 +0100 Subject: [PATCH 2/4] setup.py: install also .utils --- setup.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index a2cb66c..1fc014a 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,4 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -from setuptools import setup +from setuptools import setup, find_packages install_requires = open('requirements.txt').read().split('\n') @@ -12,7 +10,7 @@ setup( author='Vahid Rezanezhad', url='https://github.com/qurator-spk/eynollah', license='Apache License 2.0', - packages=['sbb_newspapers_org_image'], + packages=find_packages, install_requires=install_requires, entry_points={ 'console_scripts': [ From da563519ec41ebe748d7c24adcff557847cc0333 Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Fri, 5 Feb 2021 13:34:17 +0100 Subject: [PATCH 3/4] require setuptools >= 50 --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 4bb6103..9fd7bd8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,3 +5,4 @@ scikit-learn >= 0.23.2 tensorflow-gpu >= 1.15, < 2 imutils >= 0.5.3 matplotlib +setuptools >= 50 From e97cc824177c36da503af0a248614d5edf628891 Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Fri, 5 Feb 2021 13:36:13 +0100 Subject: [PATCH 4/4] typo in setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 1fc014a..8e34b43 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setup( author='Vahid Rezanezhad', url='https://github.com/qurator-spk/eynollah', license='Apache License 2.0', - packages=find_packages, + packages=find_packages(), install_requires=install_requires, entry_points={ 'console_scripts': [