MetadataMapper reads mappings from package data, not file system

tillbiskup · Nov 5, 2021 · 557c510 · 557c510
1 parent 616ecbc
commit 557c510
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -9,3 +9,6 @@ include LICENSE*
 
 # Include mapper recipes
 include aspecd/*_mapper.yaml
+
+# Include templates
+recursive-include aspecd/templates *
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.6.0.dev25
+0.6.0.dev26
diff --git a/aspecd/metadata.py b/aspecd/metadata.py
@@ -155,7 +155,6 @@ class needs to make sure that as many metadata as possible are read and
 
 import datetime
 import logging
-import os
 
 import aspecd.exceptions
 import aspecd.utils
@@ -1165,9 +1164,10 @@ def create_mappings(self):
         self._add_mappings_from_recipe()
 
     def _load_mapping_recipe_from_file(self):
-        root_path = os.path.split(os.path.abspath(__file__))[0]
         yaml_file = aspecd.utils.Yaml()
-        yaml_file.read_from(os.path.join(root_path, self.recipe_filename))
+        # noinspection PyTypeChecker
+        yaml_file.read_stream(
+            aspecd.utils.get_package_data(self.recipe_filename))
         self._mapping_recipes = yaml_file.dict
 
     def _choose_mapping_recipe(self):

diff --git a/docs/roadmap.rst b/docs/roadmap.rst
@@ -10,8 +10,6 @@ For version 0.6
 
 * Report task: automatically generate filenames in case they are not given, similar to plots
 
-* Handling of mapper recipe (from package source, not from directory)
-
 
 For version 0.7
 ===============