Skip to content

Commit

Permalink
Merge pull request #96 from hartwork/precommit-autoupdate
Browse files Browse the repository at this point in the history
pre-commit: Autoupdate
  • Loading branch information
hartwork authored Jan 11, 2025
2 parents fd99bf9 + 3d0d444 commit fb99a38
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ repos:
- id: trailing-whitespace

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.8.5
rev: v0.9.0
hooks:
- id: ruff
args:
Expand Down
10 changes: 4 additions & 6 deletions sandwine/_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def parse_command_line(args: list[str], with_wine: bool):
dest="x11",
action="store_const",
const=X11Mode.XPRA,
help="enable nested X11 using Xpra (EXPERIMENTAL, CAREFUL!)" " (default: X11 disabled)",
help="enable nested X11 using Xpra (EXPERIMENTAL, CAREFUL!) (default: X11 disabled)",
)
x11_args.add_argument(
"--xvfb",
Expand Down Expand Up @@ -181,8 +181,7 @@ def parse_command_line(args: list[str], with_wine: bool):
general.add_argument(
"--configure",
action="store_true",
help="enforce running winecfg before start of PROGRAM"
" (default: run winecfg as needed)",
help="enforce running winecfg before start of PROGRAM (default: run winecfg as needed)",
)
else:
mount.set_defaults(configure=None)
Expand All @@ -201,8 +200,7 @@ def parse_command_line(args: list[str], with_wine: bool):
dest="with_wine",
default=True,
action="store_false",
help="run PROGRAM without use of Wine"
' (default: run command "wine PROGRAM [ARG ..]")',
help='run PROGRAM without use of Wine (default: run command "wine PROGRAM [ARG ..]")',
)
else:
mount.set_defaults(with_wine=False)
Expand Down Expand Up @@ -525,7 +523,7 @@ def create_bwrap_argv(config):
def require_recent_bubblewrap():
argv = ["bwrap", "--disable-userns", "--help"]
if subprocess.call(argv, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) != 0:
_logger.error("sandwine requires bubblewrap >=0.8.0" ", aborting.")
_logger.error("sandwine requires bubblewrap >=0.8.0, aborting.")
sys.exit(1)


Expand Down
2 changes: 1 addition & 1 deletion sandwine/_x11.py
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ def detect_and_require_nested_x11() -> X11Mode:
return mode

commands = [clazz._command for clazz, _ in tests]
_logger.error(f'Neither {" nor ".join(commands)} is available, please install, aborting.')
_logger.error(f"Neither {' nor '.join(commands)} is available, please install, aborting.")
sys.exit(127)


Expand Down

0 comments on commit fb99a38

Please sign in to comment.