X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/bb767863b0cc51897f9cd94da84b8b01f3936607..a2408b3cb23fe252b3674cee484d742496bb3411:/src/black_primer/lib.py?ds=sidebyside diff --git a/src/black_primer/lib.py b/src/black_primer/lib.py index 4480f27..a3e6ec1 100644 --- a/src/black_primer/lib.py +++ b/src/black_primer/lib.py @@ -22,9 +22,9 @@ LOG = logging.getLogger(__name__) # Windows needs a ProactorEventLoop if you want to exec subprocesses -# Startng 3.8 this is the default - Can remove when black >= 3.8 +# Starting with 3.8 this is the default - can remove when Black >= 3.8 # mypy only respects sys.platform if directly in the evaluation -# # https://mypy.readthedocs.io/en/latest/common_issues.html#python-version-and-system-platform-checks # noqa: B950 +# https://mypy.readthedocs.io/en/latest/common_issues.html#python-version-and-system-platform-checks # noqa: B950 if sys.platform == "win32": asyncio.set_event_loop(asyncio.ProactorEventLoop()) @@ -78,16 +78,18 @@ def analyze_results(project_count: int, results: Results) -> int: bold=bool(results.stats["failed"]), fg="red", ) - click.echo(f" - {results.stats['disabled']} projects Disabled by config") + s = "" if results.stats["disabled"] == 1 else "s" + click.echo(f" - {results.stats['disabled']} project{s} disabled by config") + s = "" if results.stats["wrong_py_ver"] == 1 else "s" click.echo( - f" - {results.stats['wrong_py_ver']} projects skipped due to Python Version" + f" - {results.stats['wrong_py_ver']} project{s} skipped due to Python version" ) click.echo( f" - {results.stats['skipped_long_checkout']} skipped due to long checkout" ) if results.failed_projects: - click.secho("\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}:") @@ -104,7 +106,7 @@ def analyze_results(project_count: int, results: Results) -> int: async def black_run( repo_path: Path, project_config: Dict[str, Any], results: Results ) -> None: - """Run black and record failures""" + """Run Black and record failures""" cmd = [str(which(BLACK_BINARY))] if "cli_arguments" in project_config and project_config["cli_arguments"]: cmd.extend(*project_config["cli_arguments"]) @@ -201,7 +203,7 @@ async def project_runner( rebase: bool = False, keep: bool = False, ) -> None: - """Checkout project and run black on it + record result""" + """Check out project and run Black on it + record result""" loop = asyncio.get_event_loop() py_version = f"{version_info[0]}.{version_info[1]}" while True: @@ -267,11 +269,13 @@ async def process_queue( config, queue = await load_projects_queue(Path(config_file)) project_count = queue.qsize() - LOG.info(f"{project_count} projects to run black over") + s = "" if project_count == 1 else "s" + LOG.info(f"{project_count} project{s} to run Black over") if project_count < 1: return -1 - LOG.debug(f"Using {workers} parallel workers to run black") + s = "" if workers == 1 else "s" + LOG.debug(f"Using {workers} parallel worker{s} to run Black") # Wait until we finish running all the projects before analyzing await asyncio.gather( *[