Merge pull request #1360 from AdeelH/yapf

Update yapf to 0.23
azavea · Mar 18, 2022 · b589852 · b589852
2 parents 609b169 + 4aafa85
commit b589852
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -2,7 +2,7 @@ flake8==4.0.*
 moto==3.0.6
 coverage==5.5
 codecov==2.1.12
-yapf==0.22.*
+yapf==0.23.*
 unify==0.5
 sphinx==4.0.*
 sphinx-autobuild==2021.3.*

diff --git a/scripts/format_code b/scripts/format_code
@@ -30,5 +30,5 @@ else
     find . -name '*.py' -print0 | xargs -0 $UNIFY
 
     echo "Running yapf..."
-    yapf -ipr "$SRC_DIR" -e "**/conf.py" -e "**/setup.py" -e "**/cookiecutter_template/**" -e "*tfod_utils*"
+    yapf -ipr "$SRC_DIR" -e "*.git*" -e "*build*" -e "*cookiecutter_template*" -e "*tfod_utils*" -e "**/conf.py" -e "**/setup.py" -e "*.history*"
 fi
diff --git a/scripts/style_tests b/scripts/style_tests
@@ -29,9 +29,7 @@ else
     # Exit code of 1 if yapf has a non-empty diff
     # (ie. scripts/format_code needs to be run)
     echo "Checking that code is consistent with yapf..."
-    if !(yapf -dpr -e "*cookiecutter_template*" -e "*tfod_utils*" -e "**/conf.py" -e "**/setup.py" "$SRC_DIR" > /dev/null &&
-             yapf -dpr "$SRC_DIR/tests" > /dev/null &&
-             yapf -dpr "$SRC_DIR/integration_tests" > /dev/null); then
+    if !(yapf -dpr -e "*.git*" -e "*build*" -e "*cookiecutter_template*" -e "*tfod_utils*" -e "**/conf.py" -e "**/setup.py" -e "*.history*" "$SRC_DIR" > /dev/null); then
         echo "Code has not been formatted by yapf. Need to run ./scripts/format_code."
         exit 1
     fi