Skip to content

Commit 1c21dc9

Browse files
authored
Merge pull request #324 from pytest-dev/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2 parents 31e039e + fb4a7d4 commit 1c21dc9

File tree

9 files changed

+17
-18
lines changed

9 files changed

+17
-18
lines changed

.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ repos:
1313
hooks:
1414
- id: check-yaml
1515
- repo: https://github.com/astral-sh/ruff-pre-commit
16-
rev: v0.8.6
16+
rev: v0.9.1
1717
hooks:
1818
- id: ruff
1919
args: [ --fix ]

.readthedocs.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ python:
99
install:
1010
- method: pip
1111
path: .
12+
13+
sphinx:
14+
configuration: doc/conf.py

doc/example/sysinfo.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,15 @@
1919
action="store",
2020
dest="ssh_config",
2121
default=None,
22-
help="use given ssh config file,"
23-
" and add info all contained hosts for getting info",
22+
help="use given ssh config file, and add info all contained hosts for getting info",
2423
)
2524
parser.add_option(
2625
"-i",
2726
"--ignore",
2827
action="store",
2928
dest="ignores",
3029
default=None,
31-
help="ignore hosts " "(useful if the list of hostnames come from a file list)",
30+
help="ignore hosts (useful if the list of hostnames come from a file list)",
3231
)
3332

3433

src/execnet/gateway_base.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1237,7 +1237,7 @@ def _terminate_execution(self) -> None:
12371237
self._trace("shutting down execution pool")
12381238
self._execpool.trigger_shutdown()
12391239
if not self._execpool.waitall(5.0):
1240-
self._trace("execution ongoing after 5 secs," " trying interrupt_main")
1240+
self._trace("execution ongoing after 5 secs, trying interrupt_main")
12411241
# We try hard to terminate execution based on the assumption
12421242
# that there is only one gateway object running per-process.
12431243
if sys.platform != "win32":
@@ -1248,7 +1248,7 @@ def _terminate_execution(self) -> None:
12481248
interrupt_main()
12491249
if not self._execpool.waitall(10.0):
12501250
self._trace(
1251-
"execution did not finish in another 10 secs, " "calling os._exit()"
1251+
"execution did not finish in another 10 secs, calling os._exit()"
12521252
)
12531253
os._exit(1)
12541254

src/execnet/multi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def set_execmodel(
8282
"""
8383
if self._gateways:
8484
raise ValueError(
85-
"can not set execution models if " "gateways have been created already"
85+
"can not set execution models if gateways have been created already"
8686
)
8787
if remote_execmodel is None:
8888
remote_execmodel = execmodel

src/execnet/rsync.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ def send(self, raises: bool = True) -> None:
125125
if not self._channels:
126126
if raises:
127127
raise OSError(
128-
"no targets available, maybe you " "are trying call send() twice?"
128+
"no targets available, maybe you are trying call send() twice?"
129129
)
130130
return
131131
# normalize a trailing '/' away

testing/conftest.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,7 @@ def gw(
162162
proxygw = group.makegateway("popen//id=%s" % pname)
163163
# assert group['proxygw'].remote_status().receiving
164164
gw = group.makegateway(
165-
f"socket//id=socket//installvia={pname}"
166-
f"//execmodel={execmodel.backend}"
165+
f"socket//id=socket//installvia={pname}//execmodel={execmodel.backend}"
167166
)
168167
# TODO(typing): Clarify this assignment.
169168
gw.proxygw = proxygw # type: ignore[attr-defined]
@@ -176,8 +175,7 @@ def gw(
176175
elif request.param == "proxy":
177176
group.makegateway("popen//id=proxy-transport")
178177
gw = group.makegateway(
179-
"popen//via=proxy-transport//id=proxy"
180-
"//execmodel=%s" % execmodel.backend
178+
"popen//via=proxy-transport//id=proxy//execmodel=%s" % execmodel.backend
181179
)
182180
else:
183181
assert 0, f"unknown execmodel: {request.param}"

testing/test_gateway.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -509,9 +509,9 @@ def test_popen_stderr_tracing(
509509
gw.exit()
510510

511511
def test_no_tracing_by_default(self):
512-
assert (
513-
gateway_base.trace == gateway_base.notrace
514-
), "trace does not to default to empty tracing"
512+
assert gateway_base.trace == gateway_base.notrace, (
513+
"trace does not to default to empty tracing"
514+
)
515515

516516

517517
@pytest.mark.parametrize(

testing/test_xspec.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def test_norm_attributes(self) -> None:
4242
assert spec.chdir is None
4343
assert spec.nice == "3"
4444

45-
spec = XSpec("ssh=user@host" "//chdir=/hello/this//python=/usr/bin/python2.5")
45+
spec = XSpec("ssh=user@host//chdir=/hello/this//python=/usr/bin/python2.5")
4646
assert spec.ssh == "user@host"
4747
assert spec.python == "/usr/bin/python2.5"
4848
assert spec.chdir == "/hello/this"
@@ -56,8 +56,7 @@ def test_ssh_options(self) -> None:
5656
assert spec.python == "python3"
5757

5858
spec = XSpec(
59-
"ssh=-i ~/.ssh/id_rsa-passwordless_login -p 22100 user@host"
60-
"//python=python3"
59+
"ssh=-i ~/.ssh/id_rsa-passwordless_login -p 22100 user@host//python=python3"
6160
)
6261
assert spec.ssh == "-i ~/.ssh/id_rsa-passwordless_login -p 22100 user@host"
6362
assert spec.python == "python3"

0 commit comments

Comments
 (0)