remove pkg_resources

Author: ChristianBeilschmidt

geoengine/__init__.py

@@ -1,11 +1,11 @@
 '''Entry point for Geo Engine Python Library'''
 
-from pkg_resources import get_distribution
 from requests import utils
 from pydantic import ValidationError
 from geoengine_openapi_client.exceptions import BadRequestException, OpenApiException, ApiTypeError, ApiValueError, \
     ApiKeyError, ApiAttributeError, ApiException, NotFoundException
 from geoengine_openapi_client import UsageSummaryGranularity
+import geoengine_openapi_client
 
 from . import workflow_builder
 from .raster_workflow_rio_writer import RasterWorkflowRioWriter
@@ -39,7 +39,7 @@
     add_or_replace_dataset_with_permissions, dataset_info_by_name
 
 
-DEFAULT_USER_AGENT = f'geoengine-python/{get_distribution("geoengine").version}'
+DEFAULT_USER_AGENT = f'geoengine-python/{geoengine_openapi_client.__version__}'
 
 
 def default_user_agent(_name="python-requests"):

geoengine/auth.py

@@ -8,7 +8,6 @@
 
 import os
 from dotenv import load_dotenv
-from pkg_resources import get_distribution
 from requests.auth import AuthBase
 import urllib3
 
@@ -71,7 +70,7 @@ def __init__(self,
         # Auto-generated SessionApi cannot handle dynamically differing return types (SimpleSession or UserSession).
         # Because of that requests must be send manually.
         http = urllib3.PoolManager()
-        user_agent = f'geoengine-python/{get_distribution("geoengine").version}'
+        user_agent = f'geoengine-python/{geoengine_openapi_client.__version__}'
 
         if credentials is not None:
             session = http.request(

tests/test_auth.py

@@ -3,7 +3,7 @@
 from datetime import datetime
 import unittest
 import os
-from pkg_resources import get_distribution
+import geoengine_openapi_client
 import geoengine as ge
 from geoengine.error import GeoEngineException
 from geoengine.types import QueryRectangle
@@ -120,7 +120,7 @@ def test_initialize_env(self):
     def test_user_agent(self):
         with UrllibMocker() as m:
             m.post('http://mock-instance/anonymous',
-                   request_headers={'User-Agent': f'geoengine-python/{get_distribution("geoengine").version}'},
+                   request_headers={'User-Agent': f'geoengine-python/{geoengine_openapi_client.__version__}'},
                    json={
                        "id": "e327d9c3-a4f3-4bd7-a5e1-30b26cae8064",
                        "user": None,

tests/test_wfs.py

@@ -8,7 +8,7 @@
 import geopandas as gpd
 import geopandas.testing  # pylint: disable=unused-import
 from shapely.geometry import Point
-from pkg_resources import get_distribution
+import geoengine_openapi_client
 import geoengine as ge
 from . import UrllibMocker
 
@@ -829,7 +829,7 @@ def test_owslib_user_agent(self):
                     }]
                 },
                 request_headers={'Authorization': 'Bearer e327d9c3-a4f3-4bd7-a5e1-30b26cae8064',
-                                 'User-Agent': f'geoengine/openapi-client/python/{get_distribution("geoengine-openapi-client").version}'}
+                                 'User-Agent': f'geoengine/openapi-client/python/{geoengine_openapi_client.__version__}'}
             )
 
             ge.initialize("http://mock-instance")