Merge branch 'master' into sh_merge_master

This commit is contained in:
Ralf W. Grosse-Kunstleve
2021-09-08 18:56:35 -07:00
43 changed files with 295 additions and 148 deletions

View File

@@ -32,7 +32,7 @@ repos:
exclude: ^noxfile.py$
- repo: https://github.com/asottile/pyupgrade
rev: v2.24.0
rev: v2.25.0
hooks:
- id: pyupgrade
@@ -43,7 +43,7 @@ repos:
# Black, the code formatter, natively supports pre-commit
- repo: https://github.com/psf/black
rev: 21.7b0
rev: 21.8b0
hooks:
- id: black
# By default, this ignores pyi files, though black supports them