From 78b9aa39209cb3e6f0e6f1992fc7188d416f641d Mon Sep 17 00:00:00 2001
From: Derek Graeber <dgraeber@amazon.com>
Date: Mon, 20 May 2024 20:34:48 -0400
Subject: [PATCH] removing flake8 and isort, adding ruff to scripts

---
 scripts/fix.sh                    |  6 +++---
 scripts/validate.sh               | 10 +++++-----
 seedfarmer/mgmt/bundle_support.py |  1 -
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/scripts/fix.sh b/scripts/fix.sh
index 221d0f98..59f9c811 100755
--- a/scripts/fix.sh
+++ b/scripts/fix.sh
@@ -45,9 +45,9 @@ cd ${DIR}/..
 echo "Fixing: $(cd "$(dirname "$FIX_PATH")"; pwd)/$(basename "$FIX_PATH"), Language: ${LANGUAGE}"
 
 if [[ $LANGUAGE == "python" ]]; then
-    echo "Running isort, black"
-    isort ${FIX_PATH}
-    black ${FIX_PATH}
+    echo "Running ruff"
+    ruff format ${FIX_PATH}
+    ruff check --fix ${FIX_PATH}
 elif [[ $LANGUAGE == "typescript" ]]; then
     echo "Running prettier"
     npx prettier --write ${FIX_PATH}
diff --git a/scripts/validate.sh b/scripts/validate.sh
index d5724fe1..5d642f4f 100755
--- a/scripts/validate.sh
+++ b/scripts/validate.sh
@@ -51,9 +51,9 @@ echo "Validating: $(cd "$(dirname "$VALIDATE_PATH")"; pwd)/$(basename "$VALIDATE
 
 echo "Validating Formatting"
 if [[ $LANGUAGE == "python" ]]; then
-    echo "Checking isort, black"
-    isort --check ${VALIDATE_PATH}
-    black --check ${VALIDATE_PATH}
+    echo "Running ruff"
+    ruff format ${FIX_PATH}
+    ruff check --fix ${FIX_PATH}
 elif [[ $LANGUAGE == "typescript" ]]; then
     echo "Checking prettier"
     npx prettier -c ${VALIDATE_PATH}
@@ -65,8 +65,8 @@ fi
 if [[ $SKIP_STATIC_CHECKS == "false" ]]; then
     echo "Validating Static Checks"
     if [[ $LANGUAGE == "python" ]]; then
-        echo "Checking flake8, mypy"
-        flake8 ${VALIDATE_PATH}
+        echo "Checking mypy"
+        #flake8 ${VALIDATE_PATH}
         mypy --ignore-missing-imports ${VALIDATE_PATH}
     else
         echo "ERROR Language: ${LANGUAGE}"
diff --git a/seedfarmer/mgmt/bundle_support.py b/seedfarmer/mgmt/bundle_support.py
index 26ee1736..9e46488e 100644
--- a/seedfarmer/mgmt/bundle_support.py
+++ b/seedfarmer/mgmt/bundle_support.py
@@ -28,7 +28,6 @@
 
 
 class BundleS3Support:
-
     codeseeder_bucket: Optional[str] = None
     codeseeder_key: Optional[str] = None
     seedfarmer_bucket: Optional[str] = None