rearrangement lib dependencies

Author: eadwinCode

.github/workflows/publish.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Install Flit
         run: pip install flit
       - name: Install Dependencies
-        run: flit install --symlink
+        run: make install
       - name: Install build dependencies
         run: pip install build
       - name: Build distribution

.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Install Flit
         run: pip install flit
       - name: Install Dependencies
-        run: flit install --symlink
+        run: make install
       - name: Test
         run: make test-cov
       - name: Coverage

.github/workflows/test_full.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Install Flit
         run: pip install flit
       - name: Install Dependencies
-        run: flit install --symlink
+        run: make install
       - name: Test
         run: pytest tests
 
@@ -48,9 +48,7 @@ jobs:
       - name: Install Flit
         run: pip install flit
       - name: Install Dependencies
-        run: flit install --symlink
-      - name: Black
-        run: black --check ellar_django tests
+        run: make install
       - name: Ruff Linting Check
         run: ruff check ellar_django tests
       - name: mypy

Makefile

@@ -11,19 +11,19 @@ clean: ## Removing cached python compiled files
 	find . -name __pycache__  | xargs  rm -rfv
 
 install: ## Install dependencies
-	flit install --deps develop --symlink
+	pip install -r requirements.txt
+	flit install --symlink
 
 install-full: ## Install dependencies
 	make install
 	pre-commit install -f
 
 lint: ## Run code linters
-	black --check ellar_django tests
 	ruff check ellar_django tests
 	mypy ellar_django
 
 fmt format: ## Run code formatters
-	black ellar_django tests
+	ruff format ellar_django tests
 	ruff check --fix ellar_django tests
 
 test: ## Run tests

ellar_django/commands.py

@@ -1,18 +1,18 @@
 import sys
 
-from ellar.common.commands import command
+import click
 
 HELP_MESSAGE = """
 Ellar will always intercept and command with '--help'.
 
 So if you want to get help on any django command,
 simply wrap the command and --help in quotes
 
-For example: ellar django 'migrate --help'
+For example: ellar django 'migrate --help' or python manage.py django 'migrate --help'
 """
 
 
-@command(
+@click.command(
     name="django",
     context_settings={"ignore_unknown_options": True, "allow_extra_args": True},
     help=HELP_MESSAGE,
@@ -21,6 +21,11 @@ def django_command_wrapper() -> None:
     from django.core.management import execute_from_command_line
 
     args = []
-    for item in sys.argv[1:]:
+    skip = 1
+
+    if "manage.py" in sys.argv:
+        skip = 2
+
+    for item in sys.argv[skip:]:
         args.extend(item.split(" "))
     execute_from_command_line(args)

ellar_django/module.py

@@ -2,10 +2,10 @@
 
 from django.core.asgi import get_asgi_application
 from ellar.common import IModuleSetup, Module, ModuleRouter
-from ellar.common.routing import Mount
 from ellar.core import DynamicModule, Request
-from ellar.core.routing import ModuleRouterFactory
+from ellar.core.router_builders import ModuleRouterBuilder
 from starlette.responses import RedirectResponse
+from starlette.routing import Mount
 
 from .commands import django_command_wrapper
 
@@ -22,9 +22,13 @@ class DjangoModule(IModuleSetup):
     @classmethod
     def setup(cls, settings_module: str, path_prefix: str = "/dj") -> "DynamicModule":
         os.environ.setdefault("DJANGO_SETTINGS_MODULE", settings_module)
-        ModuleRouterFactory.build(_router)
+        ModuleRouterBuilder.build(_router)
 
         mount = Mount(
-            path_prefix, routes=[_router, Mount("/", app=get_asgi_application())]
+            path_prefix,
+            routes=[
+                _router,  # type:ignore[list-item]
+                Mount("/", app=get_asgi_application()),
+            ],
         )
         return DynamicModule(cls, routers=[mount])

pyproject.toml

@@ -47,8 +47,8 @@ classifiers = [
 ]
 
 dependencies = [
-    "ellar-cli >= 0.2.0",
-    "Django >= 3.0",
+    "ellar-cli >= 0.3.7",
+    "Django >= 3.1",
 ]
 
 
@@ -57,21 +57,6 @@ Documentation = "https://github.com/python-ellar/ellar-django-module"
 Source = "https://github.com/python-ellar/ellar-django-module"
 Homepage = "https://python-ellar.github.io/ellar-django-module/"
 
-[project.optional-dependencies]
-test = [
-    "pytest >= 7.1.3,<8.0.0",
-    "pytest-django",
-    "pytest-cov >= 2.12.0,<5.0.0",
-    "mypy == 1.7.1",
-    "ruff ==0.1.7",
-    "black == 23.11.0",
-    "pytest-asyncio",
-    "autoflake",
-]
-dev = [
-    "pre-commit"
-]
-
 [tool.ruff]
 select = [
     "E",  # pycodestyle errors

requirements-tests.txt

@@ -0,0 +1,6 @@
+autoflake
+mypy == 1.8.0
+pytest >=7.1.3,<9.0.0
+pytest-asyncio
+pytest-cov >=2.12.0,<5.0.0
+ruff ==0.3.0

requirements.txt

@@ -0,0 +1,4 @@
+-e .
+-r requirements-tests.txt
+
+pre-commit >=2.17.0,<4.0.0

tests/example_app/apps/event/controllers.py

@@ -8,6 +8,7 @@ class MyController(ControllerBase):
     def index(self):
         return {'detail': "Welcome Dog's Resources"}
 """
+
 import typing as t
 
 from ellar.common import Controller, ControllerBase, get, post