Merge branch 'master' into ellar_refactor_fix

Author: eadwinCode

ellar_cli/manage_commands/runserver.py

@@ -11,6 +11,7 @@
     HTTP_PROTOCOLS,
     INTERFACES,
     LIFESPAN,
+    LOG_LEVELS,
     LOGGING_CONFIG,
     LOOP_SETUPS,
     SSL_PROTOCOL_VERSION,
@@ -32,6 +33,8 @@
     "LOOP_CHOICES", *[key for key in LOOP_SETUPS.keys() if key != "none"]
 )
 INTERFACE_CHOICES = create_enums_from_list("INTERFACES", *INTERFACES)
+_LOG_LEVELS = dict(**LOG_LEVELS, NOT_SET=0)
+LOG_LEVELS_CHOICES = create_enums_from_list("LOG_LEVELS", *list(_LOG_LEVELS.keys()))
 
 
 def runserver(
@@ -112,8 +115,8 @@ def runserver(
     env_file: t.Optional[Path] = typer.Option(
         None, show_default=True, exists=True, help="Environment configuration file."
     ),
-    log_level: t.Optional[LOG_LEVELS] = typer.Option(
-        None,
+    log_level: LOG_LEVELS_CHOICES = typer.Option(
+        LOG_LEVELS_CHOICES.NOT_SET.value,
         show_default=True,
         help="Log level. [default: None]",
     ),
@@ -266,7 +269,7 @@ def runserver(
         lifespan=lifespan.value,
         env_file=env_file,
         log_config=LOGGING_CONFIG if log_config is None else log_config,
-        log_level=_log_level.name,
+        log_level=_log_level.value if _log_level.value != "NOT_SET" else None,
         access_log=access_log,
         interface=interface.value,
         reload=reload,

ellar_cli/scaffolding/module_template/module_name/tests/__init__.ellar

@@ -27,6 +27,9 @@
           "name": "tests",
           "is_directory": "true",
           "files": [
+            {
+              "name": "__init__.ellar"
+            },
             {
               "name": "test_controllers.ellar"
             },

ellar_cli/scaffolding/module_template/setup.json

@@ -43,8 +43,8 @@ classifiers = [
 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.20.0",
-    "ellar == 0.3.6"
+    "uvicorn[standard] == 0.22.0",
+    "ellar >= 0.3.8"
 ]
 
 [project.scripts]