chore(*): Remove Python 3.7 support and add Python 3.12 support (#37)

Author: ticdenis

.github/workflows/cd.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
+          python-version: '3.12'
       - name: version
         run: sed -i "s/__version__ = '.*'/__version__ = '$VERSION'/g" aiocli/__init__.py
       - name: deps

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11.0' ]
+        python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12' ]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4

Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/library/python:3.7-slim AS base
+FROM docker.io/library/python:3.8-slim AS base
 
 RUN apt update -y && python3 -m pip install --upgrade pip
 

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 - 2022 aiopy
+Copyright (c) 2020 - 2023 aiopy
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

aiocli/commander.py

@@ -1,7 +1,7 @@
 import asyncio
 import signal
 import sys
-from asyncio import gather, get_event_loop
+from asyncio import all_tasks, gather, get_event_loop
 from asyncio.events import AbstractEventLoop
 from typing import Any, Callable, List, Optional, Set, Union
 
@@ -27,8 +27,6 @@
     'ApplicationParser',
 )
 
-from aiocli.helpers import all_tasks
-
 
 class GracefulExit(SystemExit):
     code = 0

aiocli/commander_app.py

@@ -1,5 +1,6 @@
 from abc import ABC, abstractmethod
 from argparse import Action, ArgumentParser, RawTextHelpFormatter
+from asyncio import iscoroutinefunction
 from dataclasses import dataclass, field
 from inspect import signature
 from typing import (
@@ -31,7 +32,7 @@
     'InternalCommandHook',
 )
 
-from .helpers import iscoroutinefunction, resolve_coroutine, resolve_function
+from .helpers import resolve_coroutine, resolve_function
 from .logger import logger
 
 CommandHandler = Callable[
@@ -519,7 +520,7 @@ def _resolve_state(cls, state: ArgumentState) -> State:
         if isinstance(state, Dict):
             return State(state)
         if iscoroutinefunction(state):
-            return cls._resolve_state(resolve_coroutine(state))  # type: ignore
+            return cls._resolve_state(resolve_coroutine(state))
         if callable(state):
             return cls._resolve_state(state())  # type: ignore
         return State()

aiocli/helpers.py

@@ -1,37 +1,13 @@
-import asyncio
-from asyncio import get_event_loop_policy
-from functools import partial
-from sys import version_info
-from typing import Any, Callable, Coroutine, Optional, Set
+from asyncio import get_event_loop_policy, iscoroutinefunction
+from typing import Any, Callable, Coroutine
 
 __all__ = (
     # helpers
-    'all_tasks',
-    'iscoroutinefunction',
     'resolve_function',
     'resolve_coroutine',
 )
 
 
-def all_tasks(loop: Optional[asyncio.AbstractEventLoop] = None) -> Set["asyncio.Task[Any]"]:
-    tasks = list(getattr(asyncio.Task, 'all_tasks')(loop))
-    return {t for t in tasks if not t.done()}
-
-
-if version_info >= (3, 7):
-    all_tasks = getattr(asyncio, 'all_tasks')
-
-
-def iscoroutinefunction(func: Callable[..., Any]) -> bool:
-    while isinstance(func, partial):
-        func = func.func
-    return asyncio.iscoroutinefunction(func)
-
-
-if version_info >= (3, 8):
-    iscoroutinefunction = asyncio.iscoroutinefunction
-
-
 async def resolve_function(func: Callable[..., Any], *args, **kwargs) -> Any:  # type: ignore
     if iscoroutinefunction(func):
         return await func(*args, **kwargs)

docker-compose.yml

@@ -8,4 +8,4 @@ services:
     volumes:
       - .:/app
 
-version: "3.7"
+version: "3.8"

pyproject.toml

@@ -24,11 +24,11 @@ classifiers = [
   "Intended Audience :: Developers",
   "License :: OSI Approved :: MIT License",
   "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.7",
   "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
 ]
 dependencies = []
 description = "Simple and lightweight async console runner."
@@ -37,42 +37,42 @@ keywords = ["asyncio", "async", "aio", "cli", "console"]
 license = { text = "MIT" }
 name = "aiocli"
 readme = "README.md"
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 
 [project.optional-dependencies]
 dev = [
-  "pre-commit==2.20.0",
-  'tomli==2.0.1; python_version<"3.11"',
-  'types-toml==0.10.8.1; python_version<"3.11"',
+  'pre-commit>=3.3.3',
+  'tomli>=2.0.1; python_version<"3.11"',
+  'types-toml>=0.10.8.7; python_version<"3.11"',
 ]
 deploy = [
-  "build==0.9.0",
-  "setuptools==65.6.0",
-  "twine==4.0.1",
-  "wheel==0.38.4",
+  "build>=0.10.0",
+  'setuptools>=68.1.2',
+  "twine>=4.0.2",
+  "wheel>=0.41.1",
 ]
 docs = [
-  "mkdocs==1.4.2",
-  "mkdocs-material==8.5.10",
+  "mkdocs>=1.5.2",
+  "mkdocs-material>=9.1.21",
 ]
 fmt = [
-  "black==22.10.0",
-  "isort==5.10.1",
+  'black>=23.7.0',
+  'isort>=5.12.0',
 ]
 security-analysis = [
-  "bandit==1.7.4",
-  "liccheck==0.7.3",
+  "bandit>=1.7.5",
+  "liccheck>=0.9.1",
 ]
 static-analysis = [
-  "mypy==0.991",
-  "pylint==2.15.6",
+  'mypy>=1.5.1',
+  "pylint>=2.17.5",
 ]
 test = [
-  "psutil==5.9.4",
-  "pytest==7.2.0",
-  "pytest-asyncio==0.20.2",
-  "pytest-cov==4.0.0",
-  "pytest-xdist==3.0.2",
+  "psutil>=5.9.5",
+  "pytest>=7.4.0",
+  "pytest-asyncio>=0.21.1",
+  "pytest-cov>=4.1.0",
+  "pytest-xdist>=3.3.1",
 ]
 
 [project.urls]
@@ -152,23 +152,54 @@ for pathname in ['./build', './*.egg-info', './dist', './var', '**/__pycache__']
   for path in iglob(pathname, recursive=True):
     rmtree(path, ignore_errors=True)
 \""""
+dev-server = """python3 -c \"
+from asyncio import CancelledError, TimeoutError as AsyncTimeoutError, get_event_loop, sleep, wait_for
+from contextlib import suppress
+from signal import SIGHUP, SIGINT, SIGTERM
+
+async def development_server(timeout: int) -> None:
+  retry = True
+  async def _check() -> None:
+    if not retry:
+      return
+    while retry:
+      await sleep(1)
+  try:
+    print('Development server running...', '')
+    await wait_for(fut=_check(), timeout=timeout)
+  except (TimeoutError, AsyncTimeoutError):
+    pass
+  finally:
+    retry = False
+
+async def run_development_server(timeout: int) -> None:
+  loop = get_event_loop()  # lazy
+  coro = development_server(timeout)
+  task = loop.create_task(coro)
+  _ = [loop.add_signal_handler(sig, task.cancel) for sig in (SIGHUP, SIGTERM, SIGINT)]
+  with suppress(CancelledError):
+    await task
+
+if __name__ >= '__main__':
+  get_event_loop().run_until_complete(run_development_server(timeout=3600))  # 1h
+\""""
 
 [tool.tox]
 legacy_tox_ini = """
 [tox]
-envlist = py37, py38, py39, py310, py311
+envlist = py38, py39, py310, py311, py312
 isolated_build = True
 skipsdist = True
 skip_missing_interpreters = True
 toxworkdir = var/tox
 
 [gh-actions]
 python =
-    3.7: py37
     3.8: py38
     3.9: py39
     3.10: py310
     3.11: py311
+    3.12: py312
 
 [testenv]
 deps = .[dev,deploy,docs,fmt,security-analysis,static-analysis,test]