admin: Remove flake8, now covered by ruff

freedomofpress · Jul 27, 2023 · 3fbd586 · 3fbd586
1 parent 539753e
commit 3fbd586
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 24 deletions.
diff --git a/admin/requirements-dev.in b/admin/requirements-dev.in
@@ -1,6 +1,5 @@
 coverage>=5.0  # #6091
 d2to1
-flake8>=5.0.4
 flaky
 mock
 pbr

diff --git a/admin/requirements-dev.txt b/admin/requirements-dev.txt
@@ -81,10 +81,6 @@ dill==0.3.5.1 \
     --hash=sha256:33501d03270bbe410c72639b350e941882a8b0fd55357580fbc873fba0c59302 \
     --hash=sha256:d75e41f3eff1eee599d738e76ba8f4ad98ea229db8b085318aa2b3333a208c86
     # via pylint
-flake8==5.0.4 \
-    --hash=sha256:6fbe320aad8d6b95cec8b8e47bc933004678dc63095be98528b7bdd2a9f510db \
-    --hash=sha256:7a1cf6b73744f5806ab95e526f6f0d8c01c66d7bbe349562d22dfca20610b248
-    # via -r requirements-dev.in
 flaky==3.4.0 \
     --hash=sha256:4ad7880aef8c35a34ddb394d4fa33047765bca1e3d67d182bf6eba9c8eabf3a2 \
     --hash=sha256:d0533f473a46b916e6db6e84e20b06d8a70656600a0c14e819b0760b63f70226
@@ -123,9 +119,7 @@ lazy-object-proxy==1.4.3 \
 mccabe==0.7.0 \
     --hash=sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325 \
     --hash=sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e
-    # via
-    #   flake8
-    #   pylint
+    # via pylint
 mock==2.0.0 \
     --hash=sha256:5ce3c71c5545b472da17b72268978914d0252980348636840bd34a00b5cc96c1 \
     --hash=sha256:b158b6df76edd239b8208d481dc46b6afd45a846b7812ff0ce58971cf5bc8bba
@@ -169,14 +163,6 @@ py==1.10.0 \
     #   pytest
     #   pytest-catchlog
     #   tox
-pycodestyle==2.9.1 \
-    --hash=sha256:2c9607871d58c76354b697b42f5d57e1ada7d261c261efac224b664affdc5785 \
-    --hash=sha256:d1735fc58b418fd7c5f658d28d943854f8a849b01a5d0a1e6f3f3fdd0166804b
-    # via flake8
-pyflakes==2.5.0 \
-    --hash=sha256:4579f67d887f804e67edb544428f264b7b24f435b263c4614f384135cea553d2 \
-    --hash=sha256:491feb020dca48ccc562a8c0cbe8df07ee13078df59813b83959cbdada312ea3
-    # via flake8
 pylint==2.15.4 \
     --hash=sha256:5441e9294335d354b7bad57c1044e5bd7cce25c433475d76b440e53452fa5cb8 \
     --hash=sha256:629cf1dbdfb6609d7e7a45815a8bb59300e34aa35783b5ac563acaca2c4022e9

diff --git a/admin/tox.ini b/admin/tox.ini
@@ -1,8 +1,5 @@
 [tox]
-envlist = pylint,flake8,py3
-
-[flake8]
-max-line-length = 100
+envlist = pylint,py3
 
 [testenv]
 usedevelop = true
@@ -16,10 +13,6 @@ commands = env \
          {envbindir}/coverage combine --append
          {envbindir}/coverage report --omit=*tox* --show-missing
 
-[testenv:flake8]
-commands =
-         flake8 bin securedrop_admin bootstrap.py tests
-
 [testenv:pylint]
 commands =
          pylint --reports=no --errors-only bootstrap.py securedrop_admin