diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c01d0e2..70e2b79 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,14 +16,14 @@ repos: - id: trailing-whitespace - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.5.2 + rev: v0.6.5 hooks: - id: ruff args: [--fix, --show-fixes] - id: ruff-format - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.10.1 + rev: v1.11.2 hooks: - id: mypy additional_dependencies: ["pytest"] diff --git a/examples/jinja.py b/examples/jinja.py index 639f1d3..09ac138 100644 --- a/examples/jinja.py +++ b/examples/jinja.py @@ -11,9 +11,9 @@ from pathlib import Path from uuid import uuid1 -from asphalt.core import CLIApplicationComponent, Context, run_application from jinja2 import FileSystemLoader +from asphalt.core import CLIApplicationComponent, Context, run_application from asphalt.templating.api import TemplateRenderer diff --git a/examples/mako_.py b/examples/mako_.py index ee2d2e3..ebebed6 100644 --- a/examples/mako_.py +++ b/examples/mako_.py @@ -12,7 +12,6 @@ from pathlib import Path from asphalt.core import CLIApplicationComponent, Context, run_application - from asphalt.templating.api import TemplateRenderer diff --git a/src/asphalt/templating/component.py b/src/asphalt/templating/component.py index 2dfe55e..814c760 100644 --- a/src/asphalt/templating/component.py +++ b/src/asphalt/templating/component.py @@ -4,7 +4,6 @@ from typing import Any from asphalt.core import Component, Context, PluginContainer, qualified_name - from asphalt.templating.api import TemplateRenderer template_renderers = PluginContainer("asphalt.templating.renderers", TemplateRenderer) diff --git a/src/asphalt/templating/renderers/django.py b/src/asphalt/templating/renderers/django.py index 798c2e8..0152d07 100644 --- a/src/asphalt/templating/renderers/django.py +++ b/src/asphalt/templating/renderers/django.py @@ -3,10 +3,10 @@ from collections.abc import Iterable from typing import Any -from asphalt.core import NoCurrentContext, current_context from django.template import Engine, Template from django.template.context import Context +from asphalt.core import NoCurrentContext, current_context from asphalt.templating.api import TemplateRenderer from asphalt.templating.utils import package_to_directory diff --git a/src/asphalt/templating/renderers/jinja2.py b/src/asphalt/templating/renderers/jinja2.py index e4854ea..b13e486 100644 --- a/src/asphalt/templating/renderers/jinja2.py +++ b/src/asphalt/templating/renderers/jinja2.py @@ -2,11 +2,11 @@ from typing import Any -from asphalt.core import NoCurrentContext, current_context, resolve_reference from jinja2 import Template from jinja2.environment import Environment from jinja2.loaders import PackageLoader +from asphalt.core import NoCurrentContext, current_context, resolve_reference from asphalt.templating.api import TemplateRenderer diff --git a/src/asphalt/templating/renderers/mako.py b/src/asphalt/templating/renderers/mako.py index b9c733f..e81bd3a 100644 --- a/src/asphalt/templating/renderers/mako.py +++ b/src/asphalt/templating/renderers/mako.py @@ -3,10 +3,10 @@ from collections.abc import Iterable from typing import Any -from asphalt.core import NoCurrentContext, current_context from mako.lookup import TemplateLookup from mako.template import Template +from asphalt.core import NoCurrentContext, current_context from asphalt.templating.api import TemplateRenderer from asphalt.templating.utils import package_to_directory diff --git a/src/asphalt/templating/renderers/tornado.py b/src/asphalt/templating/renderers/tornado.py index 61e4184..740435e 100644 --- a/src/asphalt/templating/renderers/tornado.py +++ b/src/asphalt/templating/renderers/tornado.py @@ -2,9 +2,9 @@ from typing import Any -from asphalt.core import NoCurrentContext, current_context from tornado.template import Loader, Template +from asphalt.core import NoCurrentContext, current_context from asphalt.templating.api import TemplateRenderer from asphalt.templating.utils import package_to_directory diff --git a/tests/test_component.py b/tests/test_component.py index 62f3bd0..370147d 100644 --- a/tests/test_component.py +++ b/tests/test_component.py @@ -1,6 +1,6 @@ import pytest -from asphalt.core.context import Context +from asphalt.core.context import Context from asphalt.templating.api import TemplateRenderer from asphalt.templating.component import TemplatingComponent from asphalt.templating.renderers.jinja2 import Jinja2Renderer diff --git a/tests/test_renderers.py b/tests/test_renderers.py index 5da19f8..6d5ab06 100644 --- a/tests/test_renderers.py +++ b/tests/test_renderers.py @@ -2,9 +2,9 @@ from typing import cast import pytest -from asphalt.core import Context from pytest import FixtureRequest +from asphalt.core import Context from asphalt.templating.api import TemplateRenderer from asphalt.templating.renderers.django import DjangoRenderer from asphalt.templating.renderers.jinja2 import Jinja2Renderer