diff --git a/.circleci/config.yml b/.circleci/config.yml index aa1054a4b..fc28874e8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -75,10 +75,10 @@ jobs: python manage.py check python manage.py makemigrations --check - run: - name: Black + name: Ruff command: | . .venv/bin/activate - black -l 80 --check . + ruff format . - run: name: CurlyLint command: | diff --git a/pyproject.toml b/pyproject.toml index f16714a7a..086b73354 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,3 @@ -[tool.black] -line-length = 80 - [tool.ruff] line-length = 80 ignore = ["E501"] @@ -29,5 +26,5 @@ addopts =[ "--ignore=wcivf/settings/local.py", "--ignore=lib", "--ruff", - "--black", + "--ruff-format", ] diff --git a/requirements/testing.txt b/requirements/testing.txt index 493170fa1..3da883a2c 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -1,6 +1,5 @@ -r base.txt -black==23.7.0 pytest pytest-django @@ -14,6 +13,5 @@ tomlkit freezegun==1.2.2 django-debug-toolbar==4.1.0 curlylint==0.13.1 -ruff==0.0.280 -pytest-ruff -pytest-black +ruff==0.1.15 +pytest-ruff==0.2.1