From 3dba5d83afaad967d4b1e2bccc61e7b356294870 Mon Sep 17 00:00:00 2001
From: Antoine Lambert <anlambert@softwareheritage.org>
Date: Fri, 8 Apr 2022 15:13:50 +0200
Subject: [PATCH] pre-commit, tox: Bump black from 19.10b0 to 22.3.0
black is considered stable since release 22.1.0 and the version
we are currently using is quite outdated and not compatible with
click 8.1.0, so it is time to bump it to its latest stable release.
Please note that E501 pycodestyle warning related to line length
is replaced by B950 one from flake8-bugbear as recommended by black.
https://black.readthedocs.io/en/stable/the_black_code_style/current_style.html#line-length
Related to T3922
---
.pre-commit-config.yaml | 2 +-
setup.cfg | 4 +++-
tox.ini | 5 +++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ace1fe2..2cb9644 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -43,6 +43,6 @@ repos:
- id: isort
- repo: https://github.com/python/black
- rev: 19.10b0
+ rev: 22.3.0
hooks:
- id: black
diff --git a/setup.cfg b/setup.cfg
index 8d79b7e..2c446b4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,8 @@
[flake8]
# E203: whitespaces before ':' <https://github.com/psf/black/issues/315>
# E231: missing whitespace after ','
+# E501: line too long, use B950 warning from flake8-bugbear instead
# W503: line break before binary operator <https://github.com/psf/black/issues/52>
-ignore = E203,E231,W503
+select = C,E,F,W,B950
+ignore = E203,E231,E501,W503
max-line-length = 88
diff --git a/tox.ini b/tox.ini
index 5913c01..60398be 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,14 +15,15 @@ commands =
[testenv:black]
skip_install = true
deps =
- black==19.10b0
+ black==22.3.0
commands =
{envpython} -m black --check swh
[testenv:flake8]
skip_install = true
deps =
- flake8
+ flake8==4.0.1
+ flake8-bugbear==22.3.23
commands =
{envpython} -m flake8
--
GitLab