From d7ac975454d66ab1003d8522dbeb2054c3d86f31 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 27 Dec 2021 20:06:12 +0000 Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pre-commit/pre-commit-hooks: v4.0.1 → v4.1.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.0.1...v4.1.0) - [github.com/pre-commit/mirrors-mypy: v0.920 → v0.930](https://github.com/pre-commit/mirrors-mypy/compare/v0.920...v0.930) --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4f024b41..e9b75d21 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.0.1 + rev: v4.1.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer @@ -44,7 +44,7 @@ repos: hooks: - id: setup-cfg-fmt - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.920 + rev: v0.930 hooks: - id: mypy additional_dependencies: [types-all] From 83675fe7687def4b5a673fd794c9472c31fe69e4 Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Mon, 27 Dec 2021 18:32:56 -0500 Subject: [PATCH 2/2] work around python/mypy#11852 --- pre_commit/xargs.py | 3 ++- tests/xargs_test.py | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pre_commit/xargs.py b/pre_commit/xargs.py index 6b0fa208..9a397234 100644 --- a/pre_commit/xargs.py +++ b/pre_commit/xargs.py @@ -159,7 +159,8 @@ def xargs( ) threads = min(len(partitions), target_concurrency) - with _thread_mapper(threads) as thread_map: + # https://github.com/python/mypy/issues/11852 + with _thread_mapper(threads) as thread_map: # type: ignore results = thread_map(run_cmd_partition, partitions) for proc_retcode, proc_out, _ in results: diff --git a/tests/xargs_test.py b/tests/xargs_test.py index 7e83ef59..80bcd268 100644 --- a/tests/xargs_test.py +++ b/tests/xargs_test.py @@ -166,13 +166,15 @@ def test_xargs_concurrency(): def test_thread_mapper_concurrency_uses_threadpoolexecutor_map(): - with xargs._thread_mapper(10) as thread_map: + # https://github.com/python/mypy/issues/11852 + with xargs._thread_mapper(10) as thread_map: # type: ignore _self = thread_map.__self__ # type: ignore assert isinstance(_self, concurrent.futures.ThreadPoolExecutor) def test_thread_mapper_concurrency_uses_regular_map(): - with xargs._thread_mapper(1) as thread_map: + # https://github.com/python/mypy/issues/11852 + with xargs._thread_mapper(1) as thread_map: # type: ignore assert thread_map is map