From e1a440b91c22777651309941f08b2c567ffbbb9d Mon Sep 17 00:00:00 2001
From: Konstantin Baierer <unixprog@gmail.com>
Date: Tue, 8 Nov 2022 16:19:23 +0100
Subject: [PATCH] install into qurator namespace

---
 ocrd-tool.json                                |  2 +-
 {tsvtools => qurator}/__init__.py             |  1 +
 qurator/tsvtools/__init__.py                  |  0
 {tsvtools => qurator/tsvtools}/cli.py         |  0
 {tsvtools => qurator/tsvtools}/ocr.py         |  0
 {tsvtools => qurator/tsvtools}/ocrd-tool.json |  0
 {tsvtools => qurator/tsvtools}/ocrd_cli.py    |  0
 .../tsvtools}/ocrd_processors.py              |  0
 setup.py                                      | 24 +++++++++++--------
 tests/test_imexport.py                        |  2 +-
 10 files changed, 17 insertions(+), 12 deletions(-)
 rename {tsvtools => qurator}/__init__.py (98%)
 create mode 100644 qurator/tsvtools/__init__.py
 rename {tsvtools => qurator/tsvtools}/cli.py (100%)
 rename {tsvtools => qurator/tsvtools}/ocr.py (100%)
 rename {tsvtools => qurator/tsvtools}/ocrd-tool.json (100%)
 rename {tsvtools => qurator/tsvtools}/ocrd_cli.py (100%)
 rename {tsvtools => qurator/tsvtools}/ocrd_processors.py (100%)

diff --git a/ocrd-tool.json b/ocrd-tool.json
index 03f3104..318676b 120000
--- a/ocrd-tool.json
+++ b/ocrd-tool.json
@@ -1 +1 @@
-tsvtools/ocrd-tool.json
\ No newline at end of file
+qurator/tsvtools/ocrd-tool.json
\ No newline at end of file
diff --git a/tsvtools/__init__.py b/qurator/__init__.py
similarity index 98%
rename from tsvtools/__init__.py
rename to qurator/__init__.py
index de40ea7..8d17c21 100644
--- a/tsvtools/__init__.py
+++ b/qurator/__init__.py
@@ -1 +1,2 @@
 __import__('pkg_resources').declare_namespace(__name__)
+
diff --git a/qurator/tsvtools/__init__.py b/qurator/tsvtools/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tsvtools/cli.py b/qurator/tsvtools/cli.py
similarity index 100%
rename from tsvtools/cli.py
rename to qurator/tsvtools/cli.py
diff --git a/tsvtools/ocr.py b/qurator/tsvtools/ocr.py
similarity index 100%
rename from tsvtools/ocr.py
rename to qurator/tsvtools/ocr.py
diff --git a/tsvtools/ocrd-tool.json b/qurator/tsvtools/ocrd-tool.json
similarity index 100%
rename from tsvtools/ocrd-tool.json
rename to qurator/tsvtools/ocrd-tool.json
diff --git a/tsvtools/ocrd_cli.py b/qurator/tsvtools/ocrd_cli.py
similarity index 100%
rename from tsvtools/ocrd_cli.py
rename to qurator/tsvtools/ocrd_cli.py
diff --git a/tsvtools/ocrd_processors.py b/qurator/tsvtools/ocrd_processors.py
similarity index 100%
rename from tsvtools/ocrd_processors.py
rename to qurator/tsvtools/ocrd_processors.py
diff --git a/setup.py b/setup.py
index f9bd980..7608048 100644
--- a/setup.py
+++ b/setup.py
@@ -8,11 +8,11 @@ with open('ocrd-tool.json') as fj:
     version = load(fj)['version']
 
 setup(
-    name="tsvtools",
+    name="qurator_tsvtools",
     version=version,
-    author="",
+    author="Kai Labusch",
     author_email="qurator@sbb.spk-berlin.de",
-    description="neath",
+    description="Working with QURATOR TSV, especially for neat",
     long_description=open("README.md", "r", encoding='utf-8').read(),
     long_description_content_type="text/markdown",
     keywords='qurator',
@@ -21,15 +21,19 @@ setup(
     packages=find_packages(exclude=["*.tests", "*.tests.*",
                                     "tests.*", "tests"]),
     install_requires=install_requires,
+    namespace_packages=['qurator'],
+    package_data={
+        '': ['*.json']
+    },
     entry_points={
       'console_scripts': [
-        "extract-doc-links=tsvtools.cli:extract_document_links",
-        "annotate-tsv=tsvtools.cli:annotate_tsv",
-        "ocrd-neat-export=tsvtools.ocrd_cli:export_cli",
-        "ocrd-neat-import=tsvtools.ocrd_cli:import_cli",
-        "page2tsv=tsvtools.cli:page2tsv_cli",
-        "tsv2page=tsvtools.cli:tsv2page_cli",
-        "make-page2tsv-commands=tsvtools.cli:make_page2tsv_commands"
+        "extract-doc-links=qurator.tsvtools.cli:extract_document_links",
+        "annotate-tsv=qurator.tsvtools.cli:annotate_tsv",
+        "ocrd-neat-export=qurator.tsvtools.ocrd_cli:export_cli",
+        "ocrd-neat-import=qurator.tsvtools.ocrd_cli:import_cli",
+        "page2tsv=qurator.tsvtools.cli:page2tsv_cli",
+        "tsv2page=qurator.tsvtools.cli:tsv2page_cli",
+        "make-page2tsv-commands=qurator.tsvtools.cli:make_page2tsv_commands"
       ]
     },
     python_requires='>=3.6.0',
diff --git a/tests/test_imexport.py b/tests/test_imexport.py
index 5b0a46b..9e9b16d 100644
--- a/tests/test_imexport.py
+++ b/tests/test_imexport.py
@@ -6,7 +6,7 @@ from ocrd_utils import pushd_popd
 from ocrd_models.ocrd_page import parse
 from ocrd import Resolver
 
-from tsvtools.ocrd_processors import OcrdNeatExportProcessor, OcrdNeatImportProcessor
+from qurator.tsvtools.ocrd_processors import OcrdNeatExportProcessor, OcrdNeatImportProcessor
 
 @fixture
 def testws(tmpdir):