From d3b75984a6b6435b387a6b2bb67bfbd86ec216ae Mon Sep 17 00:00:00 2001
From: Anson <anson@ansonbiggs.com>
Date: Thu, 30 Nov 2023 21:49:56 -0700
Subject: [PATCH] full on ruff

---
 .gitlab-ci.yml        | 2 +-
 .vscode/settings.json | 2 +-
 dev-reqs.txt          | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 580692f..e1ab018 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ ruff:
   image: python:3.11-slim
   script:
     - pip3 install ruff
-    - ruff --output-format gitlab .
+    - ruff . --output-format gitlab; ruff format . --diff
 
 prettier:
   stage: lint
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 91f903e..eb4063a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,7 +3,7 @@
   "editor.formatOnPaste": true,
   "editor.formatOnSaveMode": "modificationsIfAvailable",
   "[python]": {
-    "editor.defaultFormatter": "ms-python.black-formatter",
+    "editor.defaultFormatter": "charliermarsh.ruff",
     "editor.formatOnSave": true,
     "editor.formatOnSaveMode": "file"
   }
diff --git a/dev-reqs.txt b/dev-reqs.txt
index 77b12b9..afba48d 100644
--- a/dev-reqs.txt
+++ b/dev-reqs.txt
@@ -1,6 +1,5 @@
 -r common/requirements.txt
 -r site/requirements.txt
-black==23.9.1
 ipython==8.16.1
 jupyter_client==8.4.0
 jupyter_core==5.4.0
@@ -8,5 +7,4 @@ pylama==8.4.1
 mypy==1.5.1
 types-cachetools==5.3.0.6
 types-pytz==2023.3.1.1
-ruff==0.0.292
-isort==5.12.0
\ No newline at end of file
+ruff==0.1.6
\ No newline at end of file