muffin 0.97.2__tar.gz → 0.98.1__tar.gz

{muffin-0.97.2 → muffin-0.98.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: muffin
-Version: 0.97.2
+Version: 0.98.1
 Summary: Muffin is a fast, simple and asyncronous web-framework for Python 3 (asyncio, trio, curio)
 Home-page: https://github.com/klen/muffin
 License: MIT
@@ -19,18 +19,13 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Internet :: WWW/HTTP
 Provides-Extra: standard
-Requires-Dist: asgi-tools (>=0.73.2,<0.74.0)
+Requires-Dist: asgi-tools (>=0,<1)
 Requires-Dist: gunicorn (>=20.1.0,<21.0.0) ; extra == "standard"
-Requires-Dist: modconfig (>=1.2.1,<2.0.0)
-Requires-Dist: ujson (>=5.7.0,<6.0.0)
+Requires-Dist: modconfig (>=1,<2)
+Requires-Dist: ujson
 Requires-Dist: uvicorn[standard] (>=0.21.1,<0.22.0) ; extra == "standard"
 Project-URL: Documentation, https://klen.github.io/muffin
 Project-URL: Repository, https://github.com/klen/muffin

{muffin-0.97.2 → muffin-0.98.1}/muffin/app.py

@@ -12,7 +12,7 @@ from asgi_tools._compat import aio_wait
 from modconfig import Config
 
 from muffin.constants import CONFIG_ENV_VARIABLE
-from muffin.utils import import_submodules
+from muffin.utils import import_submodules, logger
 
 if TYPE_CHECKING:
     from collections.abc import Awaitable
@@ -75,7 +75,7 @@ class Application(BaseApp):
         self.manage = Manager(self)
 
         # Setup logging
-        self.logger = logging.getLogger("muffin")
+        self.logger = logger
         self.logger.setLevel(self.cfg.LOG_LEVEL)
         self.logger.propagate = False
         if not self.logger.handlers:
@@ -114,7 +114,7 @@ class Application(BaseApp):
             await aio_wait(*bgtasks)
             BACKGROUND_TASK.set(None)
 
-    def import_submodules(self, *submodules: str):
+    def import_submodules(self, *submodules: str, silent: bool = False):
         """Automatically import submodules.
 
         .. code-block:: python
@@ -127,10 +127,13 @@ class Application(BaseApp):
             # import only specific submodules (in specified order)
             app.import_submodules('submodule1', 'submodule2')
 
+            # ignore import errors
+            app.import_submodules(silent=True)
+
         """
         parent_frame = stack()[1][0]
         package_name = parent_frame.f_locals["__name__"]
-        return import_submodules(package_name, *submodules)
+        return import_submodules(package_name, *submodules, silent=silent)
 
     def run_after_response(self, *tasks: Awaitable):
         """Await the given awaitable after the response is completed.

{muffin-0.97.2 → muffin-0.98.1}/muffin/utils.py

@@ -13,6 +13,7 @@ from contextlib import suppress
 from typing import TYPE_CHECKING, Callable, Coroutine, Dict, TypeVar
 
 from asgi_tools.utils import is_awaitable, to_awaitable
+from curio.task import logging
 from sniffio import current_async_library
 
 from muffin.errors import InvalidAppError
@@ -49,6 +50,8 @@ AIOLIBS["asyncio"] = asyncio
 
 TV = TypeVar("TV")
 
+logger = logging.getLogger("muffin")
+
 
 def aio_lib() -> str:
     """Return first available async library."""
@@ -72,15 +75,24 @@ def aio_run(corofn: Callable[..., Coroutine[None, None, TV]], *args, **kwargs) -
     return AIOLIBS[aiolib].run(lambda: corofn(*args, **kwargs))
 
 
-def import_submodules(package_name: str, *module_names: str) -> Dict[str, ModuleType]:
-    """Import all submodules by package name."""
+def import_submodules(
+    package_name: str, *module_names: str, silent: bool = False
+) -> Dict[str, ModuleType]:
+    """Import all submodules by the given package name."""
     package = sys.modules[package_name]
-    return {
-        module_name: importlib.import_module(f"{package_name}.{module_name}")
-        for module_name in (
-            module_names or (name for _, name, _ in pkgutil.walk_packages(package.__path__))
-        )
-    }
+    res = {}
+    for module_name in module_names or (
+        name for _, name, _ in pkgutil.walk_packages(package.__path__)
+    ):
+        try:
+            res[module_name] = importlib.import_module(f"{package_name}.{module_name}")
+        except ImportError:
+            if not silent:
+                raise
+
+            logger.debug("Failed to import module: %s", f"{package_name}.{module_name}")
+
+    return res
 
 
 def import_app(app_uri: str, *, reload: bool = False) -> Application:

{muffin-0.97.2 → muffin-0.98.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "muffin"
-version = "0.97.2"
+version = "0.98.1"
 description = "Muffin is a fast, simple and asyncronous web-framework for Python 3 (asyncio, trio, curio)"
 readme = "README.rst"
 license = "MIT"
@@ -24,20 +24,20 @@ classifiers = [
 homepage = "https://github.com/klen/muffin"
 repository = "https://github.com/klen/muffin"
 documentation = "https://klen.github.io/muffin"
-packages = [{include = "muffin"}]
+packages = [{ include = "muffin" }]
 
 [tool.poetry.urls]
 changelog = "https://raw.githubusercontent.com/klen/muffin/master/CHANGELOG.md"
 
 [tool.poetry.dependencies]
 python = "^3.8"
-asgi-tools = "^0.73.2"
-modconfig = "^1.2.1"
-ujson = "^5.7.0"
+asgi-tools = "^0"
+modconfig = "^1"
+ujson = "*"
 
 # Optional
-gunicorn = {version = "^20.1.0", optional = true}
-uvicorn = {version = "^0.21.1", optional = true, extras = ["standard"]}
+gunicorn = { version = "^20.1.0", optional = true }
+uvicorn = { version = "^0.21.1", optional = true, extras = ["standard"] }
 
 [tool.poetry.scripts]
 muffin = "muffin.manage:cli"
@@ -52,20 +52,20 @@ standard = ["gunicorn", "uvicorn"]
 optional = true
 
 [tool.poetry.group.dev.dependencies]
-aiofile = "^3.8.5"
-pytest = "^7.2.2"
-pytest-mypy = "^0.10.3"
-ruff = "^0.0.258"
-pytest-aio = {extras = ["curio", "trio"], version = "^1.5.0"}
-pre-commit = "^3.2.0"
+aiofile = "*"
+pytest = "*"
+pytest-mypy = "*"
+ruff = "*"
+pytest-aio = { extras = ["curio", "trio"], version = "*" }
+pre-commit = "*"
 
 [tool.poetry.group.docs]
 optional = true
 
 [tool.poetry.group.docs.dependencies]
-sphinx = "^6.1.3"
-pydata-sphinx-theme = "^0.13.1"
-sphinx-copybutton = "^0.5.1"
+sphinx = "*"
+pydata-sphinx-theme = "*"
+sphinx-copybutton = "*"
 
 [tool.pytest.ini_options]
 addopts = "-xsvl"
@@ -80,7 +80,7 @@ line-length = 100
 target-version = "py38"
 exclude = [".venv", "docs", "example"]
 select = ["ALL"]
-ignore = ["D", "UP", "ANN", "DJ", "EM", "RSE", "SLF", "RET", "S101", "PLR2004", "N804"]
+ignore = ["D", "UP", "ANN", "DJ", "EM", "RSE", "SLF", "RET", "S101", "PLR2004", "N804", "COM"]
 
 [tool.ruff.per-file-ignores]
 "tests/*" = ["ARG", "TRY", "F", "PGH", "PLR", "PLW", "PTH", "SIM", "RET504", "T20"]