From 07c8812937cf75ac5bc7ceac07ef5ea383f10f2f Mon Sep 17 00:00:00 2001 From: Cooper Lees Date: Wed, 5 May 2021 08:33:23 -0700 Subject: [PATCH 1/1] Enable ` --experimental-string-processing` on most primer projects (#2184) * Enable ` --experimental-string-processing` on all primer projects - We want to make this default so need to test it more - Fixed splat/star bug in extending black args for each project * Disable sqlalchemy due to crash --- src/black_primer/lib.py | 2 +- src/black_primer/primer.json | 47 ++++++++++++++++++------------------ 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/black_primer/lib.py b/src/black_primer/lib.py index aba694b..3ce383f 100644 --- a/src/black_primer/lib.py +++ b/src/black_primer/lib.py @@ -120,7 +120,7 @@ async def black_run( """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"]) + cmd.extend(project_config["cli_arguments"]) cmd.append("--check") if no_diff: cmd.append(".") diff --git a/src/black_primer/primer.json b/src/black_primer/primer.json index 78c1e2a..76ed482 100644 --- a/src/black_primer/primer.json +++ b/src/black_primer/primer.json @@ -2,28 +2,28 @@ "configuration_format_version": 20200509, "projects": { "aioexabgp": { - "cli_arguments": [], + "cli_arguments": ["--experimental-string-processing"], "expect_formatting_changes": false, "git_clone_url": "https://github.com/cooperlees/aioexabgp.git", "long_checkout": false, "py_versions": ["all"] }, "attrs": { - "cli_arguments": [], + "cli_arguments": ["--experimental-string-processing"], "expect_formatting_changes": true, "git_clone_url": "https://github.com/python-attrs/attrs.git", "long_checkout": false, "py_versions": ["all"] }, "bandersnatch": { - "cli_arguments": [], - "expect_formatting_changes": false, + "cli_arguments": ["--experimental-string-processing"], + "expect_formatting_changes": true, "git_clone_url": "https://github.com/pypa/bandersnatch.git", "long_checkout": false, "py_versions": ["all"] }, "channels": { - "cli_arguments": [], + "cli_arguments": ["--experimental-string-processing"], "expect_formatting_changes": true, "git_clone_url": "https://github.com/django/channels.git", "long_checkout": false, @@ -32,22 +32,22 @@ "django": { "disabled_reason": "black --check --diff returned 123 on tests_syntax_error.py", "disabled": true, - "cli_arguments": [], + "cli_arguments": ["--experimental-string-processing"], "expect_formatting_changes": true, "git_clone_url": "https://github.com/django/django.git", "long_checkout": false, "py_versions": ["all"] }, "flake8-bugbear": { - "cli_arguments": [], + "cli_arguments": ["--experimental-string-processing"], "expect_formatting_changes": false, "git_clone_url": "https://github.com/PyCQA/flake8-bugbear.git", "long_checkout": false, "py_versions": ["all"] }, "hypothesis": { - "cli_arguments": [], - "expect_formatting_changes": false, + "cli_arguments": ["--experimental-string-processing"], + "expect_formatting_changes": true, "git_clone_url": "https://github.com/HypothesisWorks/hypothesis.git", "long_checkout": false, "py_versions": ["all"] @@ -55,55 +55,56 @@ "pandas": { "disabled_reason": "black-primer runs failing on Pandas - #2193", "disabled": true, - "cli_arguments": [], + "cli_arguments": ["--experimental-string-processing"], "expect_formatting_changes": true, "git_clone_url": "https://github.com/pandas-dev/pandas.git", "long_checkout": false, "py_versions": ["all"] }, "pillow": { - "cli_arguments": [], + "cli_arguments": ["--experimental-string-processing"], "expect_formatting_changes": true, "git_clone_url": "https://github.com/python-pillow/Pillow.git", "long_checkout": false, "py_versions": ["all"] }, "poetry": { - "cli_arguments": [], + "cli_arguments": ["--experimental-string-processing"], "expect_formatting_changes": true, "git_clone_url": "https://github.com/python-poetry/poetry.git", "long_checkout": false, "py_versions": ["all"] }, "pyanalyze": { - "cli_arguments": [], + "cli_arguments": ["--experimental-string-processing"], "expect_formatting_changes": false, "git_clone_url": "https://github.com/quora/pyanalyze.git", "long_checkout": false, "py_versions": ["all"] }, "pyramid": { - "cli_arguments": [], + "cli_arguments": ["--experimental-string-processing"], "expect_formatting_changes": true, "git_clone_url": "https://github.com/Pylons/pyramid.git", "long_checkout": false, "py_versions": ["all"] }, "ptr": { - "cli_arguments": [], + "cli_arguments": ["--experimental-string-processing"], "expect_formatting_changes": true, "git_clone_url": "https://github.com/facebookincubator/ptr.git", "long_checkout": false, "py_versions": ["all"] }, "pytest": { - "cli_arguments": [], - "expect_formatting_changes": false, + "cli_arguments": ["--experimental-string-processing"], + "expect_formatting_changes": true, "git_clone_url": "https://github.com/pytest-dev/pytest.git", "long_checkout": false, "py_versions": ["all"] }, "sqlalchemy": { + "no_cli_args_reason": "breaks black with new string parsing - #2188", "cli_arguments": [], "expect_formatting_changes": true, "git_clone_url": "https://github.com/sqlalchemy/sqlalchemy.git", @@ -111,28 +112,28 @@ "py_versions": ["all"] }, "tox": { - "cli_arguments": [], - "expect_formatting_changes": false, + "cli_arguments": ["--experimental-string-processing"], + "expect_formatting_changes": true, "git_clone_url": "https://github.com/tox-dev/tox.git", "long_checkout": false, "py_versions": ["all"] }, "typeshed": { - "cli_arguments": [], + "cli_arguments": ["--experimental-string-processing"], "expect_formatting_changes": true, "git_clone_url": "https://github.com/python/typeshed.git", "long_checkout": false, "py_versions": ["all"] }, "virtualenv": { - "cli_arguments": [], - "expect_formatting_changes": false, + "cli_arguments": ["--experimental-string-processing"], + "expect_formatting_changes": true, "git_clone_url": "https://github.com/pypa/virtualenv.git", "long_checkout": false, "py_versions": ["all"] }, "warehouse": { - "cli_arguments": [], + "cli_arguments": ["--experimental-string-processing"], "expect_formatting_changes": true, "git_clone_url": "https://github.com/pypa/warehouse.git", "long_checkout": false, -- 2.39.5