diff --git a/ingest/api/ingest.py b/ingest/api/ingest.py index f56b8cbe..649b0aae 100644 --- a/ingest/api/ingest.py +++ b/ingest/api/ingest.py @@ -33,7 +33,7 @@ def __init__( self.uuid_prefix = uuid_prefix if not schema_path: - self.schema_path = pkg_resources.resource_filename("src", "schemas") + self.schema_path = pkg_resources.resource_filename("ingest", "schemas") else: self.schema_path = schema_path if not schema_file: diff --git a/ingest/pyproject.toml b/ingest/pyproject.toml index 8e3e6de9..5a5bce9b 100644 --- a/ingest/pyproject.toml +++ b/ingest/pyproject.toml @@ -24,7 +24,7 @@ classifiers = ["Programming Language :: Python :: 3"] where = ["src"] [tool.setuptools.package-data] -"ingest.schemas" = ["schemas/*.json"] +"ingest.schemas" = ["ingest/schemas/*.json"] [tool.pytest.ini_options] pythonpath = "." diff --git a/ingest/src/__init__.py b/ingest/src/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/ingest/src/schemas/bufr_to_e_soh_message.json b/ingest/src/ingest/schemas/bufr_to_e_soh_message.json similarity index 100% rename from ingest/src/schemas/bufr_to_e_soh_message.json rename to ingest/src/ingest/schemas/bufr_to_e_soh_message.json diff --git a/ingest/src/schemas/e-soh-ingest-spec.json b/ingest/src/ingest/schemas/e-soh-ingest-spec.json similarity index 100% rename from ingest/src/schemas/e-soh-ingest-spec.json rename to ingest/src/ingest/schemas/e-soh-ingest-spec.json diff --git a/ingest/src/schemas/e-soh-message-spec.json b/ingest/src/ingest/schemas/e-soh-message-spec.json similarity index 100% rename from ingest/src/schemas/e-soh-message-spec.json rename to ingest/src/ingest/schemas/e-soh-message-spec.json diff --git a/ingest/src/schemas/institution_mapping.json b/ingest/src/ingest/schemas/institution_mapping.json similarity index 100% rename from ingest/src/schemas/institution_mapping.json rename to ingest/src/ingest/schemas/institution_mapping.json diff --git a/ingest/src/schemas/netcdf_to_e_soh_message_knmi.json b/ingest/src/ingest/schemas/netcdf_to_e_soh_message_knmi.json similarity index 100% rename from ingest/src/schemas/netcdf_to_e_soh_message_knmi.json rename to ingest/src/ingest/schemas/netcdf_to_e_soh_message_knmi.json diff --git a/ingest/src/schemas/netcdf_to_e_soh_message_metno.json b/ingest/src/ingest/schemas/netcdf_to_e_soh_message_metno.json similarity index 100% rename from ingest/src/schemas/netcdf_to_e_soh_message_metno.json rename to ingest/src/ingest/schemas/netcdf_to_e_soh_message_metno.json