[go: up one dir, main page]

Skip to content

Commit

Permalink
Restyled by black
Browse files Browse the repository at this point in the history
  • Loading branch information
restyled-commits committed Mar 16, 2022
1 parent 3705bae commit 1ab8f30
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 58 deletions.
60 changes: 17 additions & 43 deletions minos/cli/templating/processors.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
from __future__ import (
annotations,
)
from __future__ import annotations

import logging
from collections.abc import (
Callable,
)
from pathlib import (
Path,
)
from collections.abc import Callable
from pathlib import Path
from typing import (
Any,
Optional,
Expand All @@ -17,42 +11,22 @@

import copier
import yaml
from cached_property import (
cached_property,
)
# noinspection PyProtectedMember
from copier.config.factory import (
filter_config,
)
from copier.config.objects import (
EnvOps,
)
from copier.config.user_data import (
load_config_data,
)
from cached_property import cached_property

# noinspection PyProtectedMember
from copier.tools import (
get_jinja_env,
)
from jinja2 import (
Environment,
)
from copier.config.factory import filter_config
from copier.config.objects import EnvOps
from copier.config.user_data import load_config_data

from ..consoles import (
console,
)
from ..importlib import (
FunctionLoader,
)
from ..pathlib import (
get_project_target_directory,
)
from ..wizards import (
Form,
)
from .fetchers import (
TemplateFetcher,
)
# noinspection PyProtectedMember
from copier.tools import get_jinja_env
from jinja2 import Environment

from ..consoles import console
from ..importlib import FunctionLoader
from ..pathlib import get_project_target_directory
from ..wizards import Form
from .fetchers import TemplateFetcher

logger = logging.getLogger(__name__)

Expand Down
20 changes: 5 additions & 15 deletions tests/test_cli/test_templating/test_processors.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
import unittest
from pathlib import (
Path,
)
from tempfile import (
TemporaryDirectory,
)
from pathlib import Path
from tempfile import TemporaryDirectory
from unittest.mock import (
PropertyMock,
call,
patch,
)

import yaml
from jinja2 import (
Environment,
)
from jinja2 import Environment

from minos.cli import (
Form,
Expand Down Expand Up @@ -137,17 +131,13 @@ def test_answers_do_not_override_template_registry_and_version(self):
"template_version": "wrong_version",
}
yaml.dump(
answers_with_wrong_version,
file,
answers_with_wrong_version, file,
)

microservice_destination = project_destination / "microservices" / "foo"
microservice_destination.mkdir(parents=True)

processor = TemplateProcessor.from_fetcher(
self.fetcher,
microservice_destination,
)
processor = TemplateProcessor.from_fetcher(self.fetcher, microservice_destination,)

with patch("minos.cli.Form.ask", return_value=expected_answers) as mock:
self.assertEqual(expected_answers, processor.answers)
Expand Down

0 comments on commit 1ab8f30

Please sign in to comment.