All patches and comments are welcome. Please squash your changes to logical
commits before using git-format-patch and git-send-email to
patches@git.madduck.net.
If you'd read over the Git project's submission guidelines and adhered to them,
I'd be especially grateful.
* Update pre-commit
* Fix F541 f-string is missing placeholders
* Fix E741 ambiguous variable name 'l'
* Update actions to v2
python-version: [3.7]
steps:
python-version: [3.7]
steps:
- - uses: actions/checkout@v1
+ - uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
- name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v1
+ uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
with:
python-version: ${{ matrix.python-version }}
os: [ubuntu-latest, macOS-latest, windows-latest]
steps:
os: [ubuntu-latest, macOS-latest, windows-latest]
steps:
- - uses: actions/checkout@v1
+ - uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
- name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v1
+ uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
with:
python-version: ${{ matrix.python-version }}
types: [python]
- repo: https://gitlab.com/pycqa/flake8
types: [python]
- repo: https://gitlab.com/pycqa/flake8
hooks:
- id: flake8
additional_dependencies: [flake8-bugbear]
- repo: https://github.com/pre-commit/mirrors-mypy
hooks:
- id: flake8
additional_dependencies: [flake8-bugbear]
- repo: https://github.com/pre-commit/mirrors-mypy
hooks:
- id: mypy
exclude: ^docs/conf.py
hooks:
- id: mypy
exclude: ^docs/conf.py
target_version = config.get("target_version")
if target_version is not None and not isinstance(target_version, list):
raise click.BadOptionUsage(
target_version = config.get("target_version")
if target_version is not None and not isinstance(target_version, list):
raise click.BadOptionUsage(
- "target-version", f"Config key target-version must be a list"
+ "target-version", "Config key target-version must be a list"
)
default_map: Dict[str, Any] = {}
)
default_map: Dict[str, Any] = {}
# one line in the original code.
# Grab the first and last line numbers, skipping generated leaves
# one line in the original code.
# Grab the first and last line numbers, skipping generated leaves
- first_line = next((l.lineno for l in self.leaves if l.lineno != 0), 0)
- last_line = next((l.lineno for l in reversed(self.leaves) if l.lineno != 0), 0)
+ first_line = next((leaf.lineno for leaf in self.leaves if leaf.lineno != 0), 0)
+ last_line = next(
+ (leaf.lineno for leaf in reversed(self.leaves) if leaf.lineno != 0), 0
+ )
if first_line == last_line:
# We look at the last two leaves since a comma or an
if first_line == last_line:
# We look at the last two leaves since a comma or an
# split altogether.
result: List[Line] = []
try:
# split altogether.
result: List[Line] = []
try:
- for l in transform(line, features):
- if str(l).strip("\n") == line_str:
+ for transformed_line in transform(line, features):
+ if str(transformed_line).strip("\n") == line_str:
raise CannotTransform(
"Line transformer returned an unchanged result"
)
result.extend(
transform_line(
raise CannotTransform(
"Line transformer returned an unchanged result"
)
result.extend(
transform_line(
line_length=line_length,
normalize_strings=normalize_strings,
features=features,
line_length=line_length,
normalize_strings=normalize_strings,
features=features,
no_commas = (
original.is_def
and opening_bracket.value == "("
no_commas = (
original.is_def
and opening_bracket.value == "("
- and not any(l.type == token.COMMA for l in leaves)
+ and not any(leaf.type == token.COMMA for leaf in leaves)
)
if original.is_import or no_commas:
)
if original.is_import or no_commas:
@wraps(split_func)
def split_wrapper(line: Line, features: Collection[Feature] = ()) -> Iterator[Line]:
@wraps(split_func)
def split_wrapper(line: Line, features: Collection[Feature] = ()) -> Iterator[Line]:
- for l in split_func(line, features):
- normalize_prefix(l.leaves[0], inside_brackets=True)
- yield l
+ for line in split_func(line, features):
+ normalize_prefix(line.leaves[0], inside_brackets=True)
+ yield line
work_path.mkdir()
if not which("black"):
work_path.mkdir()
if not which("black"):
- LOG.error(f"Can not find 'black' executable in PATH. No point in running")
+ LOG.error("Can not find 'black' executable in PATH. No point in running")
failed_pct = round(((results.stats["failed"] / project_count) * 100), 2)
success_pct = round(((results.stats["success"] / project_count) * 100), 2)
failed_pct = round(((results.stats["failed"] / project_count) * 100), 2)
success_pct = round(((results.stats["success"] / project_count) * 100), 2)
- click.secho(f"-- primer results 📊 --\n", bold=True)
+ click.secho("-- primer results 📊 --\n", bold=True)
click.secho(
f"{results.stats['success']} / {project_count} succeeded ({success_pct}%) ✅",
bold=True,
click.secho(
f"{results.stats['success']} / {project_count} succeeded ({success_pct}%) ✅",
bold=True,
)
if results.failed_projects:
)
if results.failed_projects:
- click.secho(f"\nFailed Projects:\n", bold=True)
+ click.secho("\nFailed Projects:\n", bold=True)
for project_name, project_cpe in results.failed_projects.items():
print(f"## {project_name}:")
for project_name, project_cpe in results.failed_projects.items():
print(f"## {project_name}:")
"""git Clone project or rebase"""
git_bin = str(which("git"))
if not git_bin:
"""git Clone project or rebase"""
git_bin = str(which("git"))
if not git_bin:
- LOG.error(f"No git binary found")
+ LOG.error("No git binary found")
return None
repo_url_parts = urlparse(project_config["git_clone_url"])
return None
repo_url_parts = urlparse(project_config["git_clone_url"])
def test_piping_diff(self) -> None:
diff_header = re.compile(
def test_piping_diff(self) -> None:
diff_header = re.compile(
- rf"(STDIN|STDOUT)\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d\.\d\d\d\d\d\d "
- rf"\+\d\d\d\d"
+ r"(STDIN|STDOUT)\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d\.\d\d\d\d\d\d "
+ r"\+\d\d\d\d"
)
source, _ = read_data("expression.py")
expected, _ = read_data("expression.diff")
)
source, _ = read_data("expression.py")
expected, _ = read_data("expression.diff")
@unittest_run_loop
async def test_blackd_diff(self) -> None:
diff_header = re.compile(
@unittest_run_loop
async def test_blackd_diff(self) -> None:
diff_header = re.compile(
- rf"(In|Out)\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d\.\d\d\d\d\d\d \+\d\d\d\d"
+ r"(In|Out)\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d\.\d\d\d\d\d\d \+\d\d\d\d"
)
source, _ = read_data("blackd_diff.py")
)
source, _ = read_data("blackd_diff.py")
projects / etc / vim.git / commitdiff