Skip to content

Commit 80795f0

Browse files
pre-commit-ci[bot]ziima
authored andcommitted
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 19ff49d commit 80795f0

File tree

9 files changed

+33
-28
lines changed

9 files changed

+33
-28
lines changed

src/tox/config/loader/memory.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,13 @@
1414

1515

1616
class MemoryLoader(Loader[Any]):
17-
def __init__(self, raw: dict[str, Any], *, section: Section | None = None, overrides: list[Override] | None = None,
18-
) -> None:
17+
def __init__(
18+
self,
19+
raw: dict[str, Any],
20+
*,
21+
section: Section | None = None,
22+
overrides: list[Override] | None = None,
23+
) -> None:
1924
section = section or Section(prefix="<memory>", name=str(id(self)))
2025
super().__init__(section, overrides or [])
2126
self.raw = raw

src/tox/config/source/toml.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import tomllib
1313

1414
from tox.config.loader.ini.factor import find_envs
15-
from tox.config.loader.section import Section
1615
from tox.config.loader.memory import MemoryLoader
16+
from tox.config.loader.section import Section
1717

1818
from .api import Source
1919
from .ini_section import CORE, PKG_ENV_PREFIX, TEST_ENV_PREFIX, IniSection

src/tox/provision.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,14 @@ def add_tox_requires_min_version(reqs: list[Requirement]) -> list[Requirement]:
9191

9292
deps = ", ".join(f"{p}{'' if v is None else f' ({v})'}" for p, v in missing)
9393
loader = MemoryLoader( # these configuration values are loaded from in-memory always (no file conf)
94-
dict(
95-
base=[], # disable inheritance for provision environments
96-
package="skip", # no packaging for this please
94+
{
95+
"base": [], # disable inheritance for provision environments
96+
"package": "skip", # no packaging for this please
9797
# use our own dependency specification
98-
deps=PythonDeps("\n".join(str(r) for r in requires), root=state.conf.core["tox_root"]),
99-
pass_env=["*"], # do not filter environment variables, will be handled by provisioned tox
100-
recreate=state.conf.options.recreate and not state.conf.options.no_recreate_provision,
101-
)
98+
"deps": PythonDeps("\n".join(str(r) for r in requires), root=state.conf.core["tox_root"]),
99+
"pass_env": ["*"], # do not filter environment variables, will be handled by provisioned tox
100+
"recreate": state.conf.options.recreate and not state.conf.options.no_recreate_provision,
101+
}
102102
)
103103
provision_tox_env: str = state.conf.core["provision_tox_env"]
104104
state.conf.memory_seed_loaders[provision_tox_env].append(loader)

src/tox/session/cmd/devenv.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ def devenv(state: State) -> int:
3535
opt.skip_pkg_install = False # always install a package in this case
3636
opt.no_test = True # do not run the test phase
3737
loader = MemoryLoader( # these configuration values are loaded from in-memory always (no file conf)
38-
dict(
39-
usedevelop=True, # dev environments must be of type dev
40-
env_dir=opt.devenv_path, # move it in source
41-
)
38+
{
39+
"usedevelop": True, # dev environments must be of type dev
40+
"env_dir": opt.devenv_path, # move it in source
41+
}
4242
)
4343
state.conf.memory_seed_loaders[next(iter(opt.env))].append(loader)
4444

src/tox/session/cmd/exec_.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ def exec_(state: State) -> int:
3434
msg = f"exactly one target environment allowed in exec mode but found {', '.join(envs)}"
3535
raise HandledError(msg)
3636
loader = MemoryLoader( # these configuration values are loaded from in-memory always (no file conf)
37-
dict(
38-
commands_pre=[],
39-
commands=[],
40-
commands_post=[],
41-
)
37+
{
38+
"commands_pre": [],
39+
"commands": [],
40+
"commands_post": [],
41+
}
4242
)
4343
conf = state.envs[envs[0]].conf
4444
conf.loaders.insert(0, loader)

tests/config/loader/test_memory_loader.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414

1515
def test_memory_loader_repr() -> None:
1616
core = Section(None, "tox")
17-
loader = MemoryLoader({'a': 1}, section=core)
17+
loader = MemoryLoader({"a": 1}, section=core)
1818
assert repr(loader) == "MemoryLoader(section=tox, overrides={})"
1919

2020

2121
def test_memory_loader_override() -> None:
22-
loader = MemoryLoader({'a': 1})
22+
loader = MemoryLoader({"a": 1})
2323
loader.overrides["a"] = [Override("a=2")]
2424
args = ConfigLoadArgs([], "name", None)
2525
loaded = loader.load("a", of_type=int, conf=None, factory=None, args=args)
@@ -55,7 +55,7 @@ def test_memory_loader_override() -> None:
5555
],
5656
)
5757
def test_memory_loader(value: Any, of_type: type[Any], outcome: Any) -> None:
58-
loader = MemoryLoader({'a': value, 'kwargs': {}})
58+
loader = MemoryLoader({"a": value, "kwargs": {}})
5959
args = ConfigLoadArgs([], "name", None)
6060
loaded = loader.load("a", of_type=of_type, conf=None, factory=None, args=args)
6161
assert loaded == outcome
@@ -75,18 +75,18 @@ def test_memory_loader(value: Any, of_type: type[Any], outcome: Any) -> None:
7575
],
7676
)
7777
def test_memory_loader_fails_invalid(value: Any, of_type: type[Any], exception: Exception, msg: str) -> None:
78-
loader = MemoryLoader({'a': value, 'kwargs': {}})
78+
loader = MemoryLoader({"a": value, "kwargs": {}})
7979
args = ConfigLoadArgs([], "name", None)
8080
with pytest.raises(exception, match=msg): # type: ignore[call-overload]
8181
loader.load("a", of_type=of_type, conf=None, factory=None, args=args)
8282

8383

8484
def test_memory_found_keys() -> None:
85-
loader = MemoryLoader({'a': 1, 'c': 2})
85+
loader = MemoryLoader({"a": 1, "c": 2})
8686
assert loader.found_keys() == {"a", "c"}
8787

8888

8989
def test_memory_loader_contains() -> None:
90-
loader = MemoryLoader({'a': 1})
90+
loader = MemoryLoader({"a": 1})
9191
assert "a" in loader
9292
assert "b" not in loader

tests/config/test_main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ def test_config_overrides(tox_ini_conf: ToxIniCreator) -> None:
102102

103103
def test_config_override_wins_memory_loader(tox_ini_conf: ToxIniCreator) -> None:
104104
main_conf = tox_ini_conf("[testenv]", override=[Override("testenv.c=ok")])
105-
conf = main_conf.get_env("py", loaders=[MemoryLoader({'c': "something_else"})])
105+
conf = main_conf.get_env("py", loaders=[MemoryLoader({"c": "something_else"})])
106106
conf.add_config("c", of_type=str, default="d", desc="desc")
107107
assert conf["c"] == "ok"
108108

tests/config/test_sets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ def test_do_not_allow_create_config_set(mocker: MockerFixture) -> None:
181181

182182
def test_set_env_raises_on_non_str(mocker: MockerFixture) -> None:
183183
env_set = EnvConfigSet(mocker.create_autospec(Config), Section("a", "b"), "b")
184-
env_set.loaders.insert(0, MemoryLoader({'set_env': 1}))
184+
env_set.loaders.insert(0, MemoryLoader({"set_env": 1}))
185185
with pytest.raises(TypeError, match="1"):
186186
assert env_set["set_env"]
187187

tests/plugin/test_plugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ def tox_add_core_config(core_conf: CoreConfigSet, state: State) -> None: # noqa
186186
def test_plugin_injects_invalid_python_run(tox_project: ToxProjectCreator, mocker: MockerFixture) -> None:
187187
@impl
188188
def tox_add_env_config(env_conf: EnvConfigSet, state: State) -> None: # noqa: ARG001
189-
env_conf.loaders.insert(0, MemoryLoader({'deps': [1]}))
189+
env_conf.loaders.insert(0, MemoryLoader({"deps": [1]}))
190190
with pytest.raises(TypeError, match="1"):
191191
assert env_conf["deps"]
192192

0 commit comments

Comments
 (0)