Merge pull request #139 from python-ellar/ci_errors

fix: CI Errors and added support for Py3.13

Author: eadwinCode

.github/workflows/publish.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: '3.12'
       - name: Install Flit
         run: pip install flit
       - name: Install Dependencies

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: '3.12'
       - name: Install Flit
         run: pip install flit
       - name: Install Dependencies

.github/workflows/test_full.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.10', '3.11', '3.12', '3.13']
 
     steps:
       - uses: actions/checkout@v4
@@ -32,7 +32,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: '3.12'
       - name: Install Flit
         run: pip install flit
       - name: Install Dependencies

ellar_cli/click/argument.py

@@ -23,7 +23,7 @@ def __init__(
         self.hidden = hidden
 
     # overridden to customize the automatic formatting of metavars
-    def make_metavar(self) -> str:
+    def make_metavar(self, *args: t.Any) -> str:
         if self.metavar is not None:
             return self.metavar
         var = "" if self.required else "["
@@ -47,7 +47,7 @@ def _write_opts(opts: t.Any) -> str:
             if any_slashes:
                 # TODO: test
                 any_prefix_is_slash[:] = [True]
-            rv += ": " + self.make_metavar()
+            rv += ": " + self.make_metavar(ctx)
             return rv
 
         rv = [_write_opts(self.opts)]

ellar_cli/manage_commands/runserver.py

@@ -14,7 +14,7 @@
     LIFESPAN,
     LOG_LEVELS,
     LOGGING_CONFIG,
-    LOOP_SETUPS,
+    LOOP_FACTORIES,
     SSL_PROTOCOL_VERSION,
     WS_PROTOCOLS,
 )
@@ -33,7 +33,7 @@
 WS_CHOICES = eClick.Choice(list(WS_PROTOCOLS.keys()))
 
 LIFESPAN_CHOICES = eClick.Choice(list(LIFESPAN.keys()))
-LOOP_CHOICES = eClick.Choice([key for key in LOOP_SETUPS.keys() if key != "none"])
+LOOP_CHOICES = eClick.Choice([key for key in LOOP_FACTORIES.keys() if key != "none"])
 INTERFACE_CHOICES = eClick.Choice(INTERFACES)
 
 
@@ -101,7 +101,7 @@
     "--loop",
     type=LOOP_CHOICES,
     default="auto",
-    help="Event loop implementation.",
+    help="Event loop factory implementation.",
     show_default=True,
 )
 @eClick.option(

pyproject.toml

@@ -43,8 +43,8 @@ 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",
     "ellar >= 0.8.1",
-    "uvicorn[standard] == 0.34.2",
-    "click >= 8.1.7",
+    "uvicorn[standard] == 0.37.0",
+    "click >= 8.1.8",
 ]
 
 [project.scripts]

tests/click/test_app_context_group.py

@@ -19,7 +19,7 @@ def invoke_without_app_context():
 def test_app_group_is_of_type_application_context_group():
     assert isinstance(app_group, AppContextGroup)
     assert len(app_group.commands) == 1
-    assert "app-group" in app.commands
+    assert "app" in app.commands
 
 
 def test_invoke_without_app_context_fails(cli_runner):

tests/click/test_command_args_printing.py

@@ -4,8 +4,8 @@
 output_1 = """Usage: args-print <arg1> [<arg2>] [OPTIONS]
 
 ARGUMENTS:
-  arg1: <arg1>    Arg1 description  [required]
-  arg2: [<arg2>]  Arg2 description
+  arg1: <arg1>    Arg1 description  [default: Sentinel.UNSET; required]
+  arg2: [<arg2>]  Arg2 description  [default: Sentinel.UNSET]
 
 [OPTIONS]:
   --help  Show this message and exit.
@@ -14,8 +14,8 @@
 output_2 = """Usage: args-print-no-description <arg1> [<arg2>] [OPTIONS]
 
 ARGUMENTS:
-  arg1: <arg1>    [required]
-  arg2: [<arg2>]
+  arg1: <arg1>    [default: Sentinel.UNSET; required]
+  arg2: [<arg2>]  [default: Sentinel.UNSET]
 
 [OPTIONS]:
   --help  Show this message and exit.

tests/test_ellar_cli_service.py

@@ -12,15 +12,24 @@
 )
 from ellar_cli.service.pyproject import PY_PROJECT_TOML
 
-good_app_info = (
-    b"Usage: good_app.py [OPTIONS] COMMAND [ARGS]...\n\n  "
-    b"Ellar, ASGI Python Web framework\n\nOptions:\n  --project TEXT  "
-    b"Run Specific Command on a specific project  [default:\n                  "
-    b"default]\n  -v, --version   Show the version and exit.\n  --help          "
-    b"Show this message and exit.\n\nCommands:\n  create-module  - Scaffolds Ellar Application Module -\n  "
-    b"failing-1\n  failing-2\n  failing-3\n  runserver      - "
-    b"Starts Uvicorn Server -\n  working\n"
-)
+good_app_info = """Usage: good_app.py [OPTIONS] COMMAND [ARGS]...
+
+  Ellar, ASGI Python Web framework
+
+Options:
+  --project TEXT  Run Specific Command on a specific project  [default:
+                  default]
+  -v, --version   Show the version and exit.
+  --help          Show this message and exit.
+
+Commands:
+  create-module  - Scaffolds Ellar Application Module -
+  failing-1
+  failing-2
+  failing-3
+  runserver      - Starts Uvicorn Server -
+  working
+"""
 
 
 def test_import_project_meta_returns_default_when_py_project_is_none(tmp_path):
@@ -194,9 +203,11 @@ def test_version_works(write_empty_py_project, process_runner):
 
 
 def test_apps_good_app_cli_works(change_os_dir):
-    result = subprocess.run(["python", "apps/good_app.py"], stdout=subprocess.PIPE)
+    result = subprocess.run(
+        ["python", "apps/good_app.py", "--help"], stdout=subprocess.PIPE
+    )
     assert result.returncode == 0
-    assert result.stdout == good_app_info
+    assert result.stdout.decode("utf-8") == good_app_info
 
 
 def test_apps_good_app_working_command(change_os_dir):