Merge pull request #24 from actinia-org/import-error-fix

Fix import error

src/actinia_tiling_plugin/__init__.py

@@ -25,13 +25,11 @@
 __maintainer__ = "mundialis GmbH % Co. KG"
 
 
-from pkg_resources import get_distribution, DistributionNotFound
+import importlib.metadata
 
 try:
     # Change here if project is renamed and does not equal the package name
-    dist_name = __name__
-    __version__ = get_distribution(dist_name).version
-except DistributionNotFound:
-    __version__ = "unknown"
-finally:
-    del get_distribution, DistributionNotFound
+    dist_name = 'actinia_metadata_plugin.wsgi'
+    __version__ = importlib.metadata.version(dist_name)
+except Exception:
+    __version__ = 'unknown'

tests/integrationtests/test_grid_tiling.py

@@ -26,7 +26,6 @@
 
 
 import pytest
-from flask import Response
 
 from ..test_resource_base import URL_PREFIX
 from ..test_resource_base import ActiniaResourceTestCaseBase
@@ -96,7 +95,7 @@ def test_get_grid_apidocs(self):
         url = f"{self.base_url}/tiling_processes/grid"
         resp = self.server.get(url, headers=self.user_auth_header)
 
-        assert type(resp) is Response, "The response is not of type Response"
+        print(type(resp))
         assert resp.status_code == 200, "The status code is not 200"
         assert "description" in resp.json, "No 'description' in response"
         assert "parameters" in resp.json, "No 'parameters' in response"

tests/integrationtests/test_list_merge.py

@@ -26,7 +26,6 @@
 
 
 import pytest
-from flask import Response
 
 from ..test_resource_base import URL_PREFIX
 from ..test_resource_base import ActiniaResourceTestCaseBase
@@ -69,7 +68,6 @@ def test_get_merge_apidocs(self):
         url = f"{self.base_url}/merge_processes"
         resp = self.server.get(url, headers=self.user_auth_header)
 
-        assert type(resp) is Response, "The response is not of type Response"
         assert resp.status_code == 200, "The status code is not 200"
         assert "merge_processes" in resp.json[0], \
             "No 'merge_processes' in response"

tests/integrationtests/test_list_tiling.py

@@ -26,7 +26,6 @@
 
 
 import pytest
-from flask import Response
 
 from ..test_resource_base import URL_PREFIX
 from ..test_resource_base import ActiniaResourceTestCaseBase
@@ -69,7 +68,6 @@ def test_get_tiling_list_apidocs(self):
         url = f"{self.base_url}/tiling_processes"
         resp = self.server.get(url, headers=self.user_auth_header)
 
-        assert type(resp) is Response, "The response is not of type Response"
         assert resp.status_code == 200, "The status code is not 200"
         assert "tiling_processes" in resp.json[0], \
             "No 'tiling_processes' in response"

tests/integrationtests/test_patch_merge.py

@@ -26,7 +26,6 @@
 
 
 import pytest
-from flask import Response
 from flask.json import loads as json_loads
 from jinja2 import Template
 
@@ -290,7 +289,6 @@ def test_get_patch_apidocs(self):
         url = f"{self.base_url}/merge_processes/patch"
         resp = self.server.get(url, headers=self.user_auth_header)
 
-        assert type(resp) is Response, "The response is not of type Response"
         assert resp.status_code == 200, "The status code is not 200"
         assert "description" in resp.json, "No 'description' in response"
         assert "parameters" in resp.json, "No 'parameters' in response"