Merge pull request #89 from geobeyond/fix/85-make-internal-imports-as-relative-path

Fix/85-make-internal-imports-as-relative-path

Author: ricardogsilva

tests/_async/__init__.py __init__.py

@@ -36,3 +36,6 @@ CairoSVG= "*"
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]

poetry.lock

@@ -1,5 +0,0 @@
-from . import _async, _sync, models, utils
-
-__version__ = "0.1.0"
-__author__ = "krishnaglodha <[email protected]>"
-__all__ = [_sync, _async, utils, models]

pyproject.toml

@@ -3,34 +3,34 @@
 
 import httpx
 
-from geoserverx.models.coverages_store import CoveragesStoreModel, CoveragesStoresModel
-from geoserverx.models.data_store import (
+from ..models.coverages_store import CoveragesStoreModel, CoveragesStoresModel
+from ..models.data_store import (
     CreateDataStoreModel,
     CreateStoreItem,
     DataStoreModel,
     DataStoresModel,
     MainCreateDataStoreModel,
 )
-from geoserverx.models.geofence import NewRule, Rule, RulesResponse
-from geoserverx.models.gs_response import GSResponse
-from geoserverx.models.layer_group import LayerGroupsModel
-from geoserverx.models.layers import LayerModel, LayersModel
-from geoserverx.models.style import AllStylesModel, StyleModel
-from geoserverx.models.workspace import (
+from ..models.geofence import NewRule, Rule, RulesResponse
+from ..models.gs_response import GSResponse
+from ..models.layer_group import LayerGroupsModel
+from ..models.layers import LayerModel, LayersModel
+from ..models.style import AllStylesModel, StyleModel
+from ..models.workspace import (
     NewWorkspace,
     NewWorkspaceInfo,
     UpdateWorkspace,
     UpdateWorkspaceInfo,
     WorkspaceModel,
     WorkspacesModel,
 )
-from geoserverx.utils.auth import GeoServerXAuth
-from geoserverx.utils.custom_exceptions import GSModuleNotFound
-from geoserverx.utils.enums import GSResponseEnum
-from geoserverx.utils.errors import GeoServerXError
-from geoserverx.utils.http_client import AsyncClient
-from geoserverx.utils.logger import std_out_logger
-from geoserverx.utils.services.async_datastore import (
+from ..utils.auth import GeoServerXAuth
+from ..utils.custom_exceptions import GSModuleNotFound
+from ..utils.enums import GSResponseEnum
+from ..utils.errors import GeoServerXError
+from ..utils.http_client import AsyncClient
+from ..utils.logger import std_out_logger
+from ..utils.services.async_datastore import (
     AddDataStoreProtocol,
     CreateFileStore,
     GPKGfileStore,

tests/_sync/__init__.py src/__init__.py

@@ -4,36 +4,36 @@
 import httpx
 from pydantic import ValidationError
 
-from geoserverx.models.coverages_layer import CoverageModel
-from geoserverx.models.coverages_store import CoveragesStoreModel, CoveragesStoresModel
-from geoserverx.models.data_store import (
+from ..models.coverages_layer import CoverageModel
+from ..models.coverages_store import CoveragesStoreModel, CoveragesStoresModel
+from ..models.data_store import (
     CreateDataStoreModel,
     CreateStoreItem,
     DataStoreModel,
     DataStoresModel,
     MainCreateDataStoreModel,
 )
-from geoserverx.models.featuretypes_layer import FeatureTypesModel
-from geoserverx.models.geofence import GetRule, NewRule, Rule, RulesResponse
-from geoserverx.models.gs_response import GSResponse
-from geoserverx.models.layer_group import LayerGroupsModel
-from geoserverx.models.layers import LayerModel, LayersModel
-from geoserverx.models.style import AllStylesModel, StyleModel
-from geoserverx.models.workspace import (
+from ..models.featuretypes_layer import FeatureTypesModel
+from ..models.geofence import GetRule, NewRule, Rule, RulesResponse
+from ..models.gs_response import GSResponse
+from ..models.layer_group import LayerGroupsModel
+from ..models.layers import LayerModel, LayersModel
+from ..models.style import AllStylesModel, StyleModel
+from ..models.workspace import (
     NewWorkspace,
     NewWorkspaceInfo,
     UpdateWorkspace,
     UpdateWorkspaceInfo,
     WorkspaceModel,
     WorkspacesModel,
 )
-from geoserverx.utils.auth import GeoServerXAuth
-from geoserverx.utils.custom_exceptions import GSModuleNotFound
-from geoserverx.utils.enums import GSResponseEnum
-from geoserverx.utils.errors import GeoServerXError
-from geoserverx.utils.http_client import SyncClient
-from geoserverx.utils.logger import std_out_logger
-from geoserverx.utils.services.datastore import (
+from ..utils.auth import GeoServerXAuth
+from ..utils.custom_exceptions import GSModuleNotFound
+from ..utils.enums import GSResponseEnum
+from ..utils.errors import GeoServerXError
+from ..utils.http_client import SyncClient
+from ..utils.logger import std_out_logger
+from ..utils.services.datastore import (
     AddDataStoreProtocol,
     CreateFileStore,
     GPKGfileStore,

src/geoserverx/__init__.py

@@ -0,0 +1,5 @@
+from . import _async, _sync, models, utils
+
+__version__ = "0.1.0"
+__author__ = "krishnaglodha <[email protected]>"
+__all__ = [_sync, _async, utils, models]

src/geoserverx/_async/gsx.py

@@ -7,8 +7,8 @@
 from rich.console import Console
 from rich.table import Table
 
-from geoserverx._sync.gsx import SyncGeoServerX
-from geoserverx.models.workspace import UpdateWorkspaceInfo
+from .._sync.gsx import SyncGeoServerX
+from ..models.workspace import UpdateWorkspaceInfo
 
 app = typer.Typer()
 console = Console()

src/geoserverx/_sync/gsx.py

@@ -2,7 +2,7 @@
 
 from pydantic import BaseModel
 
-from geoserverx.models.workspace import WorkspaceInBulk
+from ..models.workspace import WorkspaceInBulk
 
 
 class CoveragesStoreInBulk(BaseModel):

src/geoserverx/aa__init__.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 
-from geoserverx.utils.errors import GeoServerXError
+from ..utils.errors import GeoServerXError
 
 
 @dataclass

src/geoserverx/cli/__init__.py

@@ -1,6 +1,6 @@
 from enum import Enum
 
-from geoserverx.models.gs_response import GSResponse
+from ..models.gs_response import GSResponse
 
 
 class GSResponseEnum(Enum):