fix: resolve merge conflict

src/openeo_gfmap/features/feature_extractor.py

@@ -1,6 +1,7 @@
 """Feature extractor functionalities. Such as a base class to assist the
 implementation of feature extractors of a UDF.
 """
+
 import functools
 import inspect
 import logging
@@ -80,7 +81,6 @@ def extract_dependencies(cls, base_url: str, dependency_name: str) -> str:
 
         return abs_path
 
-
     def _common_preparations(
         self, inarr: xr.DataArray, parameters: dict
     ) -> xr.DataArray:
@@ -97,7 +97,7 @@ def _common_preparations(
     def epsg(self) -> int:
         """Returns the EPSG code of the datacube."""
         return self._epsg
-      
+
     @epsg.setter
     def epsg(self, value: int):
         self._epsg = value
@@ -115,7 +115,6 @@ def dependencies(self) -> list:
         )
         return []
 
-
     @abstractmethod
     def output_labels(self) -> list:
         """Returns a list of output labels to be assigned on the output bands,

src/openeo_gfmap/inference/model_inference.py

@@ -1,6 +1,7 @@
 """Inference functionalities. Such as a base class to assist the implementation
 of inference models on an UDF.
 """
+
 import functools
 import inspect
 import logging

tests/test_openeo_gfmap/test_model_inference.py

@@ -3,6 +3,7 @@
 from pathlib import Path
 
 import numpy as np
+import pytest
 import rasterio
 from openeo.udf import XarrayDataCube