Skip to content

Fix ament_black for new get_sources API #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nachovizzo merged 7 commits into from
Jul 29, 2024
Merged

Fix ament_black for new get_sources API #13

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aaead0e
Fix ament_black for new get_sources API
bjsowa Apr 29, 2024
582d671
Fix import order
bjsowa Apr 29, 2024
de4a9c1
Add backward compatibility with older black versions
bjsowa Jul 27, 2024
4df9c37
style
nachovizzo Jul 29, 2024
c6d2c94
Move global variables inside method to fix flake8
nachovizzo Jul 29, 2024
d764759
Import only for newer versions
nachovizzo Jul 29, 2024
58b7d81
Last tweak
nachovizzo Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 33 additions & 13 deletions ament_black/ament_black/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import argparse
import contextlib
from importlib import metadata
import os
import sys
import tempfile
Expand All @@ -32,6 +33,7 @@
from black.const import DEFAULT_INCLUDES
from black.report import Report
import click
from packaging.version import Version
from unidiff import PatchSet


Expand Down Expand Up @@ -78,18 +80,37 @@ def main(argv=sys.argv[1:]):
return 1

# TODO(Nacho): Inject the config file results into the ctx (use read_pyproject_toml)
sources = get_sources(
ctx=click.Context(black),
src=tuple(args.paths),
quiet=True,
verbose=False,
include=re_compile_maybe_verbose(DEFAULT_INCLUDES),
exclude=re_compile_maybe_verbose(DEFAULT_EXCLUDES),
extend_exclude=None,
force_exclude=None,
report=Report(),
stdin_filename='',
)
BLACK_VERSION = Version(metadata.version('black'))
if BLACK_VERSION < Version('23.9.0'):
sources = get_sources(
ctx=click.Context(black),
src=tuple(args.paths),
quiet=True,
verbose=False,
include=re_compile_maybe_verbose(DEFAULT_INCLUDES),
exclude=re_compile_maybe_verbose(DEFAULT_EXCLUDES),
extend_exclude=None,
force_exclude=None,
report=Report(),
stdin_filename='',
)
else:
# Hack to support newer versions of black in ROS Jazzy
# https://github.com/botsandus/ament_black/issues/12
from black import find_project_root

sources = get_sources(
root=find_project_root(tuple(args.paths))[0],
src=tuple(args.paths),
quiet=True,
verbose=False,
include=re_compile_maybe_verbose(DEFAULT_INCLUDES),
exclude=re_compile_maybe_verbose(DEFAULT_EXCLUDES),
extend_exclude=None,
force_exclude=None,
report=Report(),
stdin_filename='',
)
checked_files = [str(path) for path in sources]

if args.xunit_file:
Expand Down Expand Up @@ -238,7 +259,6 @@ def get_xunit_content(report, testname, elapsed, checked_files):
"""
% data
)

xml += '</testsuite>\n'
return xml

Expand Down