bump ruff to 0.4.2

mainpy/__init__.py

@@ -2,7 +2,6 @@
 
 import asyncio
 import functools
-import importlib.util
 import inspect
 import os
 import sys
@@ -21,15 +20,13 @@
 if TYPE_CHECKING:
     import contextvars
 
-
-if sys.version_info < (3, 10):
-    from typing_extensions import TypeAlias
+if sys.version_info < (3, 11):
+    from typing_extensions import Never, TypeAlias
 else:
-    from typing import TypeAlias
+    from typing import Never, TypeAlias
 
 __all__ = ('main',)
 
-
 _R = TypeVar('_R')
 _F = TypeVar('_F', bound=Callable[..., Any])
 
@@ -57,9 +54,8 @@ def _infer_debug() -> bool:
     try:
         env_debug = int(env_debug)
     except ValueError as e:
-        raise OSError(
-            f'Invalid value for `DEBUG` env var: {env_debug!r}',
-        ) from e
+        errmsg = f'Invalid value for `DEBUG` env var: {env_debug!r}'
+        raise OSError(errmsg) from e
 
     return bool(env_debug)
 
@@ -69,10 +65,12 @@ def _infer_uvloop() -> bool:
     if 'uvloop' in sys.modules:
         return True
 
+    import importlib.util
+
     return importlib.util.find_spec('uvloop') is not None
 
 
-def _enable_debug():
+def _enable_debug() -> None:
     """Enable debug mode."""
     env = os.environ
 
@@ -91,7 +89,6 @@ def _enable_debug():
 def main(__f: _AFunc[_R], /) -> _R | _AFunc[_R]: ...
 @overload
 def main(__f: _SFunc[_R], /) -> _R | _SFunc[_R]: ...
-
 @overload
 def main(
     *,
@@ -127,19 +124,20 @@ def main(
         )
 
     if not callable(func):
-        raise TypeError(f'expected a callable, got {func!r}')
+        errmsg = f'expected a callable, got {type(func)}'
+        raise TypeError(errmsg)
 
     if func.__module__ != '__main__':
         frame = inspect.currentframe()
         if not frame or frame.f_globals.get('__name__') != '__main__':
             return func
 
-    if debug or debug is None and _infer_debug():
+    if debug or (debug is None and _infer_debug()):
         _enable_debug()
 
-    if (
-        is_async is False
-        or is_async is None and not asyncio.iscoroutinefunction(func)
+    if is_async is False or (
+        is_async is None
+        and not asyncio.iscoroutinefunction(func)
     ):
         return func()
 
@@ -165,6 +163,6 @@ def main(
 
 
 @main
-def __main():
+def __main() -> Never:
     # this should never run
     raise AssertionError

pyproject.toml

@@ -13,16 +13,13 @@ readme = "README.md"
 repository = "https://github.com/jorenham/mainpy"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
-    "Intended Audience :: Developers",
-    "Natural Language :: English",
-    "Topic :: Software Development",
-    "Topic :: Utilities",
+    "Operating System :: OS Independent",
     "Typing :: Typed",
 ]
 
 [tool.poetry.dependencies]
 python = "^3.8"
-typing_extensions = {version = "^4.1", python = "<3.10"}
+typing_extensions = {version = "^4.1", python = "<3.11"}
 
 [tool.poetry.dependencies.uvloop]
 version = ">=0.14,<1.0"
@@ -31,7 +28,7 @@ markers = 'sys_platform != "win32"'
 
 [tool.poetry.group.lint.dependencies]
 codespell = "^2.2.6"
-ruff = "^0.3.0"
+ruff = "^0.4.2"
 
 [tool.poetry.group.typecheck.dependencies]
 pyright = "^1.1.351"
@@ -43,7 +40,7 @@ pytest = "^8.0"
 [tool.poetry.group.test-github]
 optional = true
 [tool.poetry.group.test-github.dependencies]
-pytest-github-actions-annotate-failures = ">=0.2,<1.0"
+pytest-github-actions-annotate-failures = ">=0.2.0,<1"
 
 [tool.poetry.extras]
 uvloop = ["uvloop"]
@@ -98,13 +95,9 @@ src = ["mainpy", "tests"]
 target-version = "py38"
 line-length = 79
 indent-width = 4
+show-fixes = true
 force-exclude = true
-extend-exclude = [
-    ".github",
-    ".vscode",
-    ".venv",
-    "py.typed",
-]
+extend-exclude = [".github", ".vscode"]
 
 [tool.ruff.lint]
 ignore-init-module-imports = true
@@ -119,6 +112,7 @@ select = [
     "YTT",      # flake8-2020
     "ANN",      # flake8-annotations
     "ASYNC",    # flake8-async
+    "TRIO",     # flake8-trio
     "S",        # flake8-bandit
     "BLE",      # flake8-blind-except
     "B",        # flake8-bugbear
@@ -147,41 +141,30 @@ select = [
     "TCH",      # flake8-type-checking
     "ARG",      # flake8-unused-arguments
     "PTH",      # flake8-use-pathlib
+    "TD",       # flake8-todos
+    "FIX",      # flake8-fixme
     "ERA",      # eradicate
+    "PD",       # pandas-vet
     "PGH",      # pygrep-hooks
     "PL",       # pylint
     "TRY",      # tryceratops
     "FLY",      # flynt
+    "NPY",      # numpy
+    "AIR",      # airflow
     "PERF",     # perflint,
     "FURB",     # refurb
     "LOG",      # flake8-logging
     "RUF",      # ruff
 ]
-extend-ignore = [
-    # flake8-annotations
-    "ANN001",   # missing-type-function-argument (deprecated)
-    "ANN002",   # missing-type-args (deprecated)
-    "ANN401",   # any-type
-    # flake8-bandit
-    "S101",     # assert
-    # pylint
-    "PLC0415",  # import-outside-top-level
-    "PLW1641",  # eq-without-hash (bug: doesn't consider super)
-    # tryceratops
-    "TRY003",   # raise-vanilla-args
-    # ruff
-    "RUF021",   # parenthesize-chained-operators
+ignore = [
+    "PLC0415",  # pylint: import-outside-top-level
 ]
 [tool.ruff.lint.per-file-ignores]
-"**/__init__.py" = [
-    "F401",     # pyflakes: unused-import
-]
 "tests/*" = [
-    "D",        # pydocstyle
+    "S",        # flake8-bandit
     "ANN",      # flake8-annotations
     "ARG001",   # flake8-unused-arguments: unused-function-argument
     "SLF001",   # flake8-self: private-member-access
-    "PT004",    # flake8-pytest-style: pytest-missing-fixture-name-underscore
 ]
 
 [tool.ruff.lint.pycodestyle]
@@ -190,28 +173,21 @@ max-line-length = 79
 [tool.ruff.lint.isort]
 case-sensitive = true
 combine-as-imports = true
-force-wrap-aliases = true
 known-first-party = ["mainpy"]
 lines-after-imports = 2
 lines-between-types = 0
-no-lines-before = ["future", "local-folder"]
-split-on-trailing-comma = false
-
-[tool.ruff.lint.pydocstyle]
-convention = "google"
-ignore-decorators = ["typing.overload"]
-
-[tool.ruff.lint.flake8-annotations]
-suppress-none-returning = true
 
 [tool.ruff.lint.flake8-quotes]
 inline-quotes = "single"
 
+[tool.ruff.lint.flake8-type-checking]
+strict = true
+
 [tool.ruff.format]
 docstring-code-format = true
-quote-style = "single"
 indent-style = "space"
 line-ending = "lf"
+quote-style = "single"
 skip-magic-trailing-comma = true
 
 

tests/test_mainpy.py

@@ -34,7 +34,7 @@ def no_uvloop():
     mp._infer_uvloop = lambda: False
 
     try:
-        yield
+        yield orig
     finally:
         mp._infer_uvloop = orig
 
@@ -96,6 +96,7 @@ def test_async_implicit_uvloop(monkeypatch: pytest.MonkeyPatch):
     @mp.main
     @_patch_module(monkeypatch, '__main__')
     async def loop_module():
+        await asyncio.sleep(0)
         loop = asyncio.get_running_loop()
         return loop.__module__.split('.')[0]