Merge branch 'main' into v3-api

# Conflicts:
#	pyproject.toml
#	src/eynollah/cli.py

ocrd-tool.json

@@ -1 +1 @@
-qurator/eynollah/ocrd-tool.json
+src/eynollah/ocrd-tool.json

pyproject.toml

@@ -3,7 +3,6 @@ requires = ["setuptools>=61.0", "wheel", "setuptools-ocrd"]
 
 [project]
 name = "eynollah"
-version = "0.3.1"
 authors = [
     {name = "Vahid Rezanezhad"},
     {name = "Staatsbibliothek zu Berlin - Preußischer Kulturbesitz"},
@@ -14,7 +13,7 @@ license.file = "LICENSE"
 requires-python = ">=3.8"
 keywords = ["document layout analysis", "image segmentation"]
 
-dynamic = ["dependencies"]
+dynamic = ["dependencies", "version"]
 
 classifiers = [
     "Development Status :: 4 - Beta",
@@ -27,8 +26,8 @@ classifiers = [
 ]
 
 [project.scripts]
-eynollah = "qurator.eynollah.cli:main"
+eynollah = "eynollah.cli:main"
-ocrd-eynollah-segment = "qurator.eynollah.ocrd_cli:main"
+ocrd-eynollah-segment = "eynollah.ocrd_cli:main"
 
 [project.urls]
 Homepage = "https://github.com/qurator-spk/eynollah"
@@ -37,5 +36,8 @@ Repository = "https://github.com/qurator-spk/eynollah.git"
 [tool.setuptools.dynamic]
 dependencies = {file = ["requirements.txt"]}
 
+[tool.setuptools.packages.find]
+where = ["src"]
+
 [tool.setuptools.package-data]
 "*" = ["*.json", '*.yml', '*.xml', '*.xsd']

setup.py

@@ -1,27 +0,0 @@
-from setuptools import setup, find_namespace_packages
-from json import load
-
-install_requires = open('requirements.txt').read().split('\n')
-with open('ocrd-tool.json', 'r', encoding='utf-8') as f:
-    version = load(f)['version']
-
-setup(
-    name='eynollah',
-    version=version,
-    long_description=open('README.md').read(),
-    long_description_content_type='text/markdown',
-    author='Vahid Rezanezhad',
-    url='https://github.com/qurator-spk/eynollah',
-    license='Apache License 2.0',
-    packages=find_namespace_packages(include=['qurator']),
-    install_requires=install_requires,
-    package_data={
-        '': ['*.json']
-    },
-    entry_points={
-        'console_scripts': [
-            'eynollah=qurator.eynollah.cli:main',
-            'ocrd-eynollah-segment=qurator.eynollah.ocrd_cli:main',
-        ]
-    },
-)

src/eynollah/cli.py

@@ -1,7 +1,7 @@
 import sys
 import click
-from ocrd_utils import getLogger, initLogging, setOverrideLogLevel
+from ocrd_utils import initLogging, setOverrideLogLevel, getLogger
-from qurator.eynollah.eynollah import Eynollah
+from eynollah.eynollah import Eynollah
 
 
 @click.command()

tests/test_counter.py

@@ -1,5 +1,5 @@
 from tests.base import main
-from qurator.eynollah.utils.counter import EynollahIdCounter
+from eynollah.utils.counter import EynollahIdCounter
 
 def test_counter_string():
     c = EynollahIdCounter()

tests/test_dpi.py

@@ -1,6 +1,6 @@
 import cv2
 from pathlib import Path
-from qurator.eynollah.utils.pil_cv2 import check_dpi
+from eynollah.utils.pil_cv2 import check_dpi
 from tests.base import main
 
 def test_dpi():

tests/test_run.py

@@ -2,7 +2,7 @@ from os import environ
 from pathlib import Path
 from ocrd_utils import pushd_popd
 from tests.base import CapturingTestCase as TestCase, main
-from qurator.eynollah.cli import main as eynollah_cli
+from eynollah.cli import main as eynollah_cli
 
 testdir = Path(__file__).parent.resolve()
 

tests/test_smoke.py

@@ -1,7 +1,7 @@
 def test_utils_import():
-    import qurator.eynollah.utils
+    import eynollah.utils
-    import qurator.eynollah.utils.contour
+    import eynollah.utils.contour
-    import qurator.eynollah.utils.drop_capitals
+    import eynollah.utils.drop_capitals
-    import qurator.eynollah.utils.drop_capitals
+    import eynollah.utils.drop_capitals
-    import qurator.eynollah.utils.is_nan
+    import eynollah.utils.is_nan
-    import qurator.eynollah.utils.rotate
+    import eynollah.utils.rotate

tests/test_xml.py

@@ -1,5 +1,5 @@
 from pytest import main
-from qurator.eynollah.utils.xml import create_page_xml
+from eynollah.utils.xml import create_page_xml
 from ocrd_models.ocrd_page import to_xml
 
 PAGE_2019 = 'http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15'