diff --git a/pyproject.toml b/pyproject.toml index d760c73..9467a1d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,8 +29,8 @@ classifiers = [ ] [project.scripts] -mods4pandas="qurator.mods4pandas.mods4pandas:main" -alto4pandas="qurator.mods4pandas.alto4pandas:main" +mods4pandas="mods4pandas.mods4pandas:main" +alto4pandas="mods4pandas.alto4pandas:main" [project.urls] @@ -43,5 +43,4 @@ dependencies = {file = ["requirements.txt"]} optional-dependencies.dev = {file = ["requirements-dev.txt"]} [tool.setuptools.packages.find] -where = ["."] -include = ["qurator"] +where = ["src"] diff --git a/qurator/__init__.py b/qurator/__init__.py deleted file mode 100644 index b0d6433..0000000 --- a/qurator/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__import__('pkg_resources').declare_namespace(__name__) \ No newline at end of file diff --git a/qurator/mods4pandas/__init__.py b/qurator/mods4pandas/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/qurator/mods4pandas/tests/__init__.py b/qurator/mods4pandas/tests/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/qurator/mods4pandas/.gitignore b/src/mods4pandas/.gitignore similarity index 100% rename from qurator/mods4pandas/.gitignore rename to src/mods4pandas/.gitignore diff --git a/qurator/mods4pandas/alto4pandas.py b/src/mods4pandas/alto4pandas.py similarity index 100% rename from qurator/mods4pandas/alto4pandas.py rename to src/mods4pandas/alto4pandas.py diff --git a/qurator/mods4pandas/lib.py b/src/mods4pandas/lib.py similarity index 100% rename from qurator/mods4pandas/lib.py rename to src/mods4pandas/lib.py diff --git a/qurator/mods4pandas/mods4pandas.py b/src/mods4pandas/mods4pandas.py similarity index 100% rename from qurator/mods4pandas/mods4pandas.py rename to src/mods4pandas/mods4pandas.py diff --git a/qurator/mods4pandas/tests/data/alto/734008031/00000005.xml b/src/mods4pandas/tests/data/alto/734008031/00000005.xml similarity index 100% rename from qurator/mods4pandas/tests/data/alto/734008031/00000005.xml rename to src/mods4pandas/tests/data/alto/734008031/00000005.xml diff --git a/qurator/mods4pandas/tests/data/alto/734008031/00000026.xml b/src/mods4pandas/tests/data/alto/734008031/00000026.xml similarity index 100% rename from qurator/mods4pandas/tests/data/alto/734008031/00000026.xml rename to src/mods4pandas/tests/data/alto/734008031/00000026.xml diff --git a/qurator/mods4pandas/tests/data/alto/734008031/00000029.xml b/src/mods4pandas/tests/data/alto/734008031/00000029.xml similarity index 100% rename from qurator/mods4pandas/tests/data/alto/734008031/00000029.xml rename to src/mods4pandas/tests/data/alto/734008031/00000029.xml diff --git a/qurator/mods4pandas/tests/data/alto/734008031/00000060.xml b/src/mods4pandas/tests/data/alto/734008031/00000060.xml similarity index 100% rename from qurator/mods4pandas/tests/data/alto/734008031/00000060.xml rename to src/mods4pandas/tests/data/alto/734008031/00000060.xml diff --git a/qurator/mods4pandas/tests/data/alto/734008031/00000102.xml b/src/mods4pandas/tests/data/alto/734008031/00000102.xml similarity index 100% rename from qurator/mods4pandas/tests/data/alto/734008031/00000102.xml rename to src/mods4pandas/tests/data/alto/734008031/00000102.xml diff --git a/qurator/mods4pandas/tests/data/alto/749782137/00000077.xml b/src/mods4pandas/tests/data/alto/749782137/00000077.xml similarity index 100% rename from qurator/mods4pandas/tests/data/alto/749782137/00000077.xml rename to src/mods4pandas/tests/data/alto/749782137/00000077.xml diff --git a/qurator/mods4pandas/tests/data/alto/749782137/00000085.xml b/src/mods4pandas/tests/data/alto/749782137/00000085.xml similarity index 100% rename from qurator/mods4pandas/tests/data/alto/749782137/00000085.xml rename to src/mods4pandas/tests/data/alto/749782137/00000085.xml diff --git a/qurator/mods4pandas/tests/data/alto/749782137/00000464.xml b/src/mods4pandas/tests/data/alto/749782137/00000464.xml similarity index 100% rename from qurator/mods4pandas/tests/data/alto/749782137/00000464.xml rename to src/mods4pandas/tests/data/alto/749782137/00000464.xml diff --git a/qurator/mods4pandas/tests/data/alto/749782137/00000651.xml b/src/mods4pandas/tests/data/alto/749782137/00000651.xml similarity index 100% rename from qurator/mods4pandas/tests/data/alto/749782137/00000651.xml rename to src/mods4pandas/tests/data/alto/749782137/00000651.xml diff --git a/qurator/mods4pandas/tests/data/alto/749782137/00000915.xml b/src/mods4pandas/tests/data/alto/749782137/00000915.xml similarity index 100% rename from qurator/mods4pandas/tests/data/alto/749782137/00000915.xml rename to src/mods4pandas/tests/data/alto/749782137/00000915.xml diff --git a/qurator/mods4pandas/tests/data/alto/749782137/00001120.xml b/src/mods4pandas/tests/data/alto/749782137/00001120.xml similarity index 100% rename from qurator/mods4pandas/tests/data/alto/749782137/00001120.xml rename to src/mods4pandas/tests/data/alto/749782137/00001120.xml diff --git a/qurator/mods4pandas/tests/data/alto/PPN636777308/00000002.xml b/src/mods4pandas/tests/data/alto/PPN636777308/00000002.xml similarity index 100% rename from qurator/mods4pandas/tests/data/alto/PPN636777308/00000002.xml rename to src/mods4pandas/tests/data/alto/PPN636777308/00000002.xml diff --git a/qurator/mods4pandas/tests/data/alto/PPN640992293/00000017.xml b/src/mods4pandas/tests/data/alto/PPN640992293/00000017.xml similarity index 100% rename from qurator/mods4pandas/tests/data/alto/PPN640992293/00000017.xml rename to src/mods4pandas/tests/data/alto/PPN640992293/00000017.xml diff --git a/qurator/mods4pandas/tests/data/alto/PPN715049151/00000017.xml b/src/mods4pandas/tests/data/alto/PPN715049151/00000017.xml similarity index 100% rename from qurator/mods4pandas/tests/data/alto/PPN715049151/00000017.xml rename to src/mods4pandas/tests/data/alto/PPN715049151/00000017.xml diff --git a/qurator/mods4pandas/tests/data/alto/PPN767883624/00000001.xml b/src/mods4pandas/tests/data/alto/PPN767883624/00000001.xml similarity index 100% rename from qurator/mods4pandas/tests/data/alto/PPN767883624/00000001.xml rename to src/mods4pandas/tests/data/alto/PPN767883624/00000001.xml diff --git a/qurator/mods4pandas/tests/data/alto/PPN767883624/00000002.xml b/src/mods4pandas/tests/data/alto/PPN767883624/00000002.xml similarity index 100% rename from qurator/mods4pandas/tests/data/alto/PPN767883624/00000002.xml rename to src/mods4pandas/tests/data/alto/PPN767883624/00000002.xml diff --git a/qurator/mods4pandas/tests/data/alto/PPN895016346/00000022.xml b/src/mods4pandas/tests/data/alto/PPN895016346/00000022.xml similarity index 100% rename from qurator/mods4pandas/tests/data/alto/PPN895016346/00000022.xml rename to src/mods4pandas/tests/data/alto/PPN895016346/00000022.xml diff --git a/qurator/mods4pandas/tests/data/alto/alto-ner/00000046.xml b/src/mods4pandas/tests/data/alto/alto-ner/00000046.xml similarity index 100% rename from qurator/mods4pandas/tests/data/alto/alto-ner/00000046.xml rename to src/mods4pandas/tests/data/alto/alto-ner/00000046.xml diff --git a/qurator/mods4pandas/tests/data/alto/alto-ner/00000102.xml b/src/mods4pandas/tests/data/alto/alto-ner/00000102.xml similarity index 100% rename from qurator/mods4pandas/tests/data/alto/alto-ner/00000102.xml rename to src/mods4pandas/tests/data/alto/alto-ner/00000102.xml diff --git a/qurator/mods4pandas/tests/data/alto/alto-ner/00000217.xml b/src/mods4pandas/tests/data/alto/alto-ner/00000217.xml similarity index 100% rename from qurator/mods4pandas/tests/data/alto/alto-ner/00000217.xml rename to src/mods4pandas/tests/data/alto/alto-ner/00000217.xml diff --git a/qurator/mods4pandas/tests/data/alto/weird-ns/00000007.xml b/src/mods4pandas/tests/data/alto/weird-ns/00000007.xml similarity index 100% rename from qurator/mods4pandas/tests/data/alto/weird-ns/00000007.xml rename to src/mods4pandas/tests/data/alto/weird-ns/00000007.xml diff --git a/qurator/mods4pandas/tests/data/mets-mods/PPN1678618276.xml b/src/mods4pandas/tests/data/mets-mods/PPN1678618276.xml similarity index 100% rename from qurator/mods4pandas/tests/data/mets-mods/PPN1678618276.xml rename to src/mods4pandas/tests/data/mets-mods/PPN1678618276.xml diff --git a/qurator/mods4pandas/tests/data/mets-mods/PPN1727545451.xml b/src/mods4pandas/tests/data/mets-mods/PPN1727545451.xml similarity index 100% rename from qurator/mods4pandas/tests/data/mets-mods/PPN1727545451.xml rename to src/mods4pandas/tests/data/mets-mods/PPN1727545451.xml diff --git a/qurator/mods4pandas/tests/data/mets-mods/PPN1737752050.xml b/src/mods4pandas/tests/data/mets-mods/PPN1737752050.xml similarity index 100% rename from qurator/mods4pandas/tests/data/mets-mods/PPN1737752050.xml rename to src/mods4pandas/tests/data/mets-mods/PPN1737752050.xml diff --git a/qurator/mods4pandas/tests/data/mets-mods/PPN1769395962.xml b/src/mods4pandas/tests/data/mets-mods/PPN1769395962.xml similarity index 100% rename from qurator/mods4pandas/tests/data/mets-mods/PPN1769395962.xml rename to src/mods4pandas/tests/data/mets-mods/PPN1769395962.xml diff --git a/qurator/mods4pandas/tests/data/mets-mods/PPN3348760607-mehrere-shelfLocator.xml b/src/mods4pandas/tests/data/mets-mods/PPN3348760607-mehrere-shelfLocator.xml similarity index 100% rename from qurator/mods4pandas/tests/data/mets-mods/PPN3348760607-mehrere-shelfLocator.xml rename to src/mods4pandas/tests/data/mets-mods/PPN3348760607-mehrere-shelfLocator.xml diff --git a/qurator/mods4pandas/tests/data/mets-mods/PPN717884805-multivolume_work-no-structMap-PHYSICAL.xml b/src/mods4pandas/tests/data/mets-mods/PPN717884805-multivolume_work-no-structMap-PHYSICAL.xml similarity index 100% rename from qurator/mods4pandas/tests/data/mets-mods/PPN717884805-multivolume_work-no-structMap-PHYSICAL.xml rename to src/mods4pandas/tests/data/mets-mods/PPN717884805-multivolume_work-no-structMap-PHYSICAL.xml diff --git a/qurator/mods4pandas/tests/data/mets-mods/PPN773555676.xml b/src/mods4pandas/tests/data/mets-mods/PPN773555676.xml similarity index 100% rename from qurator/mods4pandas/tests/data/mets-mods/PPN773555676.xml rename to src/mods4pandas/tests/data/mets-mods/PPN773555676.xml diff --git a/qurator/mods4pandas/tests/data/mets-mods/PPN821507109-1361-pages.xml b/src/mods4pandas/tests/data/mets-mods/PPN821507109-1361-pages.xml similarity index 100% rename from qurator/mods4pandas/tests/data/mets-mods/PPN821507109-1361-pages.xml rename to src/mods4pandas/tests/data/mets-mods/PPN821507109-1361-pages.xml diff --git a/qurator/mods4pandas/tests/test_alto.py b/src/mods4pandas/tests/test_alto.py similarity index 94% rename from qurator/mods4pandas/tests/test_alto.py rename to src/mods4pandas/tests/test_alto.py index 2758061..827bc7a 100644 --- a/qurator/mods4pandas/tests/test_alto.py +++ b/src/mods4pandas/tests/test_alto.py @@ -1,8 +1,8 @@ from lxml import etree as ET -from qurator.mods4pandas.alto4pandas import alto_to_dict -from qurator.mods4pandas.lib import flatten +from mods4pandas.alto4pandas import alto_to_dict +from mods4pandas.lib import flatten def dict_fromstring(x): @@ -78,4 +78,4 @@ def test_String_TAGREF_counts(): """) assert d['Layout_Page_//alto:String[@TAGREFS]-count'] == 3 - assert d['Layout_Page_String-count'] == 4 \ No newline at end of file + assert d['Layout_Page_String-count'] == 4 diff --git a/qurator/mods4pandas/tests/test_mets.py b/src/mods4pandas/tests/test_mets.py similarity index 92% rename from qurator/mods4pandas/tests/test_mets.py rename to src/mods4pandas/tests/test_mets.py index 5e4c118..f06cc04 100644 --- a/qurator/mods4pandas/tests/test_mets.py +++ b/src/mods4pandas/tests/test_mets.py @@ -1,8 +1,8 @@ from lxml import etree as ET -from qurator.mods4pandas.mods4pandas import mets_to_dict -from qurator.mods4pandas.lib import flatten +from mods4pandas.mods4pandas import mets_to_dict +from mods4pandas.lib import flatten def dict_fromstring(x): diff --git a/qurator/mods4pandas/tests/test_mods4pandas.py b/src/mods4pandas/tests/test_mods4pandas.py similarity index 98% rename from qurator/mods4pandas/tests/test_mods4pandas.py rename to src/mods4pandas/tests/test_mods4pandas.py index 3fb6460..f9a98d7 100644 --- a/qurator/mods4pandas/tests/test_mods4pandas.py +++ b/src/mods4pandas/tests/test_mods4pandas.py @@ -2,8 +2,8 @@ from lxml import etree as ET import pytest -from qurator.mods4pandas.mods4pandas import mods_to_dict -from qurator.mods4pandas.lib import flatten +from mods4pandas.mods4pandas import mods_to_dict +from mods4pandas.lib import flatten def dict_fromstring(x): diff --git a/qurator/mods4pandas/tests/test_page_info.py b/src/mods4pandas/tests/test_page_info.py similarity index 96% rename from qurator/mods4pandas/tests/test_page_info.py rename to src/mods4pandas/tests/test_page_info.py index 87eeac7..eb29f9a 100644 --- a/qurator/mods4pandas/tests/test_page_info.py +++ b/src/mods4pandas/tests/test_page_info.py @@ -3,7 +3,7 @@ from pathlib import Path from lxml import etree as ET -from qurator.mods4pandas.mods4pandas import pages_to_dict +from mods4pandas.mods4pandas import pages_to_dict TESTS_DATA_DIR = Path(__file__).parent / "data"