Merge pull request #48 from python-ellar/fix_ellar_upgrade

Ellar 0.5.3 Update: Fixed breaking changes for ellar 0.5.3

Author: eadwinCode

ellar_cli/__init__.py

@@ -1,3 +1,3 @@
 """Ellar CLI Tool for Scaffolding Ellar Projects, Modules and also running Ellar Commands"""
 
-__version__ = "0.2.3"
+__version__ = "0.2.4"

ellar_cli/main.py

@@ -5,9 +5,9 @@
 import click
 import ellar
 import typer
+from ellar.app import AppFactory
 from ellar.common.commands import EllarTyper
 from ellar.common.constants import CALLABLE_COMMAND_INFO, MODULE_METADATA
-from ellar.core.factory import AppFactory
 from ellar.core.modules import ModuleSetup
 from ellar.core.services import Reflector
 from typer.models import CommandInfo

ellar_cli/scaffolding/project_template/project_name/server.ellar

@@ -1,7 +1,7 @@
 import os
 
 from ellar.common.constants import ELLAR_CONFIG_MODULE
-from ellar.core.factory import AppFactory
+from ellar.app import AppFactory
 # from ellar.openapi import OpenAPIDocumentModule, OpenAPIDocumentBuilder, SwaggerUI
 from .root_module import ApplicationModule
 

ellar_cli/service.py

@@ -2,9 +2,10 @@
 import typing as t
 
 from click import ClickException
+from ellar.app import App
 from ellar.common.constants import ELLAR_CONFIG_MODULE
 from ellar.common.helper.importer import import_from_string
-from ellar.core import App, Config, ModuleBase
+from ellar.core import Config, ModuleBase
 from tomlkit import dumps as tomlkit_dumps
 from tomlkit import parse as tomlkit_parse
 from tomlkit import table

pyproject.toml

@@ -43,7 +43,7 @@ dependencies = [
     # exclude 0.11.2 and 0.11.3 due to https://github.com/sdispater/tomlkit/issues/225
     "tomlkit >=0.11.1,<1.0.0,!=0.11.2,!=0.11.3",
     "uvicorn[standard] == 0.23.2",
-    "ellar >= 0.4.4"
+    "ellar >= 0.5.3"
 ]
 
 [project.scripts]

tests/sample_app/example_project/server.py

@@ -1,7 +1,7 @@
 import os
 
+from ellar.app import AppFactory
 from ellar.common.constants import ELLAR_CONFIG_MODULE
-from ellar.core.factory import AppFactory
 
 # from ellar.openapi import OpenAPIDocumentModule, OpenAPIDocumentBuilder
 from .root_module import ApplicationModule

tests/sample_app/example_project_2/server.py

@@ -1,7 +1,7 @@
 import os
 
+from ellar.app import AppFactory
 from ellar.common.constants import ELLAR_CONFIG_MODULE
-from ellar.core.factory import AppFactory
 
 # from ellar.openapi import OpenAPIDocumentModule, OpenAPIDocumentBuilder
 from .root_module import ApplicationModule

tests/test_ellar_cli_service.py

@@ -1,7 +1,8 @@
 import os
 
 import pytest
-from ellar.core import App, ConfigDefaultTypesMixin, ModuleBase
+from ellar.app import App
+from ellar.core import ConfigDefaultTypesMixin, ModuleBase
 
 from ellar_cli.service import (
     PY_PROJECT_TOML,

tests/test_ellar_commands/test_create_project_command.py

@@ -1,6 +1,7 @@
 import os
 
-from ellar.core import App, Config
+from ellar.app import App
+from ellar.core import Config
 
 from ellar_cli.service import EllarCLIService