Replace Black with Ruff

DemocracyClub · Nov 21, 2023 · a733309 · a733309
1 parent 5d800e4
commit a733309
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 82 deletions.
diff --git a/Pipfile b/Pipfile
@@ -31,14 +31,15 @@ typing-extensions = ">=3.7.4"
 pre-commit = "*"
 pytest = "*"
 pytest-django = "*"
+pytest-ruff = "*"
 pytest-env = "<=0.8.1"
 coveralls = ">=3.1.1"
 pytest-cov = "<=4.0.0"
 factory-boy = "*"
 ipython = "*"
 pytest-mock = "*"
 ipdb = "*"
-pytest-socket = "==0.5.1"
+pytest-socket = "==0.6.0"
 wheel = ">0.37.0"
 ruff = "==0.1.5"
 

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/README.md b/README.md
@@ -13,8 +13,8 @@ This section assumes a working python 3.8 environment with Pipenv installed.
 * `cp ec_api/settings/local.py.example ec_api/settings/local.py`
 * Install Python dependencies: `pipenv install --dev`
 * Run the test suite: `pytest`
-* Run lint checks: `pytest --flakes`
-* Auto-format: `black .`
+* Run lint checks: `ruff .`
+* Auto-format: `ruff format .`
 
 ## Pre-commit
 

diff --git a/ec_api/settings/base.py b/ec_api/settings/base.py
@@ -180,7 +180,7 @@ def root(*path):
 }
 
 PIPELINE["SASS_ARGUMENTS"] = (
-    " -I " + dc_design_system.DC_SYSTEM_PATH + "/system"
+        " -I " + dc_design_system.DC_SYSTEM_PATH + "/system"
 )
 
 PIPELINE["CSS_COMPRESSOR"] = "pipeline.compressors.NoopCompressor"

diff --git a/pyproject.toml b/pyproject.toml
@@ -7,9 +7,6 @@ target-version = ['py38']
 norecursedirs = ".git __pycache__ .aws-sam"
 addopts = "--ignore=*/__pycache__ --ignore=.* --disable-socket"
 python_files = "test_*.py"
-flakes-ignore = [
-    "ImportStarUsage"
-]
 env = "RUN_ENV=test"
 DJANGO_SETTINGS_MODULE = "ec_api.settings.testing"
 FAIL_INVALID_TEMPLATE_VARS = "1"