Merge branch 'dev-fix-inundate-nation' of https://github.com/NOAA-OWP…

…/cahaba into dev-fix-inundate-nation

.github/workflows/lint_and_format.yaml

@@ -0,0 +1,22 @@
+name: Lint and Format Using Pre-Commit
+
+on:
+  pull_request:
+    branches:
+      - dev
+      - main
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  lint-and-format:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version-file: pyproject.toml
+    - uses: pre-commit/action@v3.0.0

.pre-commit-config.yaml

@@ -14,11 +14,10 @@ repos:
         -   id: check-json
 
 -   repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
+    rev: 6.1.0
     hooks:
         -   id: flake8
-            entry: pflake8
-            additional_dependencies: [pyproject-flake8]
+            additional_dependencies: [flake8-pyproject]
 
 -   repo: https://github.com/psf/black
     rev: 23.7.0

CONTRIBUTING.md

@@ -65,7 +65,7 @@ If you would like to contribute, please follow these steps:
     # Check all files in the repo
     pre-commit run -a
 
-    # Run only the black formatting tool
+    # Run only the flake8 formatting tool
     pre-commit run -a flake8
     ```
 

Pipfile

@@ -32,14 +32,14 @@ ipympl = "==0.9.3"
 pytest = "==7.3.0"
 whitebox = "==2.3.1"
 shapely = "==2.0.1"
-pyarrow = "==11.0.0"
+pyarrow = "==14.0.1"
 rtree = "==1.0.1"
 py7zr = "==0.20.4"
 scipy = "==1.10.1"
 gval = "==0.2.3"
 flake8 = "==6.0.0"
 black = "==23.7.0"
-pyproject-flake8 = "==6.0.0.post1"
+flake8-pyproject = "==1.2.3"
 pre-commit = "==3.3.3"
 isort = "==5.12.0"
 urllib3 = "==1.26.18"