switch from qurator namespace to src-layout

qurator-spk · Aug 29, 2024 · 84b8442 · 84b8442
1 parent 9367f86
commit 84b8442
Show file tree

Hide file tree

Showing 27 changed files with 15 additions and 15 deletions.
diff --git a/ocrd-tool.json b/ocrd-tool.json
@@ -1 +1 @@
-qurator/eynollah/ocrd-tool.json
+src/eynollah/ocrd-tool.json
diff --git a/pyproject.toml b/pyproject.toml
@@ -26,8 +26,8 @@ classifiers = [
 ]
 
 [project.scripts]
-eynollah = "qurator.eynollah.cli:main"
-ocrd-eynollah-segment = "qurator.eynollah.ocrd_cli:main"
+eynollah = "eynollah.cli:main"
+ocrd-eynollah-segment = "eynollah.ocrd_cli:main"
 
 [project.urls]
 Homepage = "https://github.com/qurator-spk/eynollah"
@@ -37,7 +37,7 @@ Repository = "https://github.com/qurator-spk/eynollah.git"
 dependencies = {file = ["requirements.txt"]}
 
 [tool.setuptools.packages.find]
-where = ["qurator"]
+where = ["src"]
 
 [tool.setuptools.package-data]
 "*" = ["*.json", '*.yml', '*.xml', '*.xsd']
diff --git a/qurator/.gitkeep b/qurator/.gitkeep
diff --git a/qurator/eynollah/__init__.py → src/eynollah/__init__.py b/qurator/eynollah/__init__.py → src/eynollah/__init__.py
diff --git a/qurator/eynollah/cli.py → src/eynollah/cli.py b/qurator/eynollah/cli.py → src/eynollah/cli.py
@@ -1,7 +1,7 @@
 import sys
 import click
 from ocrd_utils import initLogging, setOverrideLogLevel
-from qurator.eynollah.eynollah import Eynollah
+from eynollah.eynollah import Eynollah
 
 
 @click.command()

diff --git a/qurator/eynollah/eynollah.py → src/eynollah/eynollah.py b/qurator/eynollah/eynollah.py → src/eynollah/eynollah.py
diff --git a/qurator/eynollah/ocrd-tool.json → src/eynollah/ocrd-tool.json b/qurator/eynollah/ocrd-tool.json → src/eynollah/ocrd-tool.json
diff --git a/qurator/eynollah/ocrd_cli.py → src/eynollah/ocrd_cli.py b/qurator/eynollah/ocrd_cli.py → src/eynollah/ocrd_cli.py
diff --git a/qurator/eynollah/plot.py → src/eynollah/plot.py b/qurator/eynollah/plot.py → src/eynollah/plot.py
diff --git a/qurator/eynollah/processor.py → src/eynollah/processor.py b/qurator/eynollah/processor.py → src/eynollah/processor.py
diff --git a/qurator/eynollah/utils/__init__.py → src/eynollah/utils/__init__.py b/qurator/eynollah/utils/__init__.py → src/eynollah/utils/__init__.py
diff --git a/qurator/eynollah/utils/contour.py → src/eynollah/utils/contour.py b/qurator/eynollah/utils/contour.py → src/eynollah/utils/contour.py
diff --git a/qurator/eynollah/utils/counter.py → src/eynollah/utils/counter.py b/qurator/eynollah/utils/counter.py → src/eynollah/utils/counter.py
diff --git a/qurator/eynollah/utils/drop_capitals.py → src/eynollah/utils/drop_capitals.py b/qurator/eynollah/utils/drop_capitals.py → src/eynollah/utils/drop_capitals.py
diff --git a/qurator/eynollah/utils/is_nan.py → src/eynollah/utils/is_nan.py b/qurator/eynollah/utils/is_nan.py → src/eynollah/utils/is_nan.py
diff --git a/qurator/eynollah/utils/marginals.py → src/eynollah/utils/marginals.py b/qurator/eynollah/utils/marginals.py → src/eynollah/utils/marginals.py
diff --git a/qurator/eynollah/utils/pil_cv2.py → src/eynollah/utils/pil_cv2.py b/qurator/eynollah/utils/pil_cv2.py → src/eynollah/utils/pil_cv2.py
diff --git a/qurator/eynollah/utils/resize.py → src/eynollah/utils/resize.py b/qurator/eynollah/utils/resize.py → src/eynollah/utils/resize.py
diff --git a/qurator/eynollah/utils/rotate.py → src/eynollah/utils/rotate.py b/qurator/eynollah/utils/rotate.py → src/eynollah/utils/rotate.py
diff --git a/qurator/eynollah/utils/separate_lines.py → src/eynollah/utils/separate_lines.py b/qurator/eynollah/utils/separate_lines.py → src/eynollah/utils/separate_lines.py
diff --git a/qurator/eynollah/utils/xml.py → src/eynollah/utils/xml.py b/qurator/eynollah/utils/xml.py → src/eynollah/utils/xml.py
diff --git a/qurator/eynollah/writer.py → src/eynollah/writer.py b/qurator/eynollah/writer.py → src/eynollah/writer.py
diff --git a/tests/test_counter.py b/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()

diff --git a/tests/test_dpi.py b/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():

diff --git a/tests/test_run.py b/tests/test_run.py
@@ -2,7 +2,7 @@
 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()
 

diff --git a/tests/test_smoke.py b/tests/test_smoke.py
@@ -1,7 +1,7 @@
 def test_utils_import():
-    import qurator.eynollah.utils
-    import qurator.eynollah.utils.contour
-    import qurator.eynollah.utils.drop_capitals
-    import qurator.eynollah.utils.drop_capitals
-    import qurator.eynollah.utils.is_nan
-    import qurator.eynollah.utils.rotate
+    import eynollah.utils
+    import eynollah.utils.contour
+    import eynollah.utils.drop_capitals
+    import eynollah.utils.drop_capitals
+    import eynollah.utils.is_nan
+    import eynollah.utils.rotate
diff --git a/tests/test_xml.py b/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'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		qurator/eynollah/ocrd-tool.json
		src/eynollah/ocrd-tool.json