Skip to content

Commit

Permalink
Merge branch 'master' into agoose77/feat-support-shape-touched
Browse files Browse the repository at this point in the history
  • Loading branch information
lgray authored Oct 7, 2023
2 parents 3fe957b + 3274006 commit d3fb1c9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ repos:
- id: trailing-whitespace

- repo: https://github.com/asottile/pyupgrade
rev: v3.11.0
rev: v3.14.0
hooks:
- id: pyupgrade
args: ["--py38-plus"]

- repo: https://github.com/asottile/setup-cfg-fmt
rev: v2.4.0
rev: v2.5.0
hooks:
- id: setup-cfg-fmt

Expand All @@ -54,7 +54,7 @@ repos:
exclude: coffea/processor/templates

- repo: https://github.com/codespell-project/codespell
rev: v2.2.5
rev: v2.2.6
hooks:
- id: codespell
args: ["--skip=*.ipynb","-L hist,Hist,nd,SubJet,subjet,Subjet,PTD,ptd,fPt,fpt,Ser,ser"]
2 changes: 1 addition & 1 deletion src/coffea/processor/executor.py
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@ class FuturesExecutor(ExecutorBase):
An accumulator to collect the output of the function
pool : concurrent.futures.Executor class or instance, optional
The type of futures executor to use, defaults to ProcessPoolExecutor.
You can pass an instance instead of a class to re-use an executor
You can pass an instance instead of a class to reuse an executor
workers : int, optional
Number of parallel processes for futures (default 1)
status : bool, optional
Expand Down

0 comments on commit d3fb1c9

Please sign in to comment.