feat: improve format command

cmu-delphi · Oct 25, 2023 · 1d5b4fe · 1d5b4fe
1 parent f5d5496
commit 1d5b4fe
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 12 deletions.
diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
@@ -44,4 +44,4 @@ jobs:
       uses: akaihola/darker/.github/actions/[email protected]
     - name: Format (darker)
       run: |
-        DIFF="--diff" REVISION="--revision=${{ steps.commit-range.outputs.commit-range }}" make format
+        DIFF="--diff" CHECK="--check" REVISION="--revision=${{ steps.commit-range.outputs.commit-range }}" make format
diff --git a/changehc/Makefile b/changehc/Makefile
@@ -3,6 +3,7 @@
 dir = $(shell find ./delphi_* -name __init__.py | grep -o 'delphi_[_[:alnum:]]*' | head -1)
 REVISION ?= ""
 DIFF ?= ""
+CHECK ?= ""
 venv:
 	python3.8 -m venv env
 
@@ -23,7 +24,7 @@ lint:
 	. env/bin/activate; pydocstyle $(dir)
 
 format:
-	. env/bin/activate; darker $(DIFF) $(REVISION) $(dir)
+	. env/bin/activate; darker $(DIFF) $(REVISION) $(CHECK) $(dir)
 
 test:
 	. env/bin/activate ;\

diff --git a/claims_hosp/Makefile b/claims_hosp/Makefile
@@ -21,7 +21,7 @@ lint:
 	. env/bin/activate; pydocstyle $(dir)
 
 format:
-	. env/bin/activate; darker $(DIFF) $(REVISION) $(dir)
+	. env/bin/activate; darker $(DIFF) $(REVISION) $(CHECK) $(dir)
 
 test:
 	. env/bin/activate ;\

diff --git a/doctor_visits/Makefile b/doctor_visits/Makefile
@@ -21,7 +21,7 @@ lint:
 	. env/bin/activate; pydocstyle $(dir)
 
 format:
-	. env/bin/activate; darker $(DIFF) $(REVISION) $(dir)
+	. env/bin/activate; darker $(DIFF) $(REVISION) $(CHECK) $(dir)
 
 test:
 	. env/bin/activate ;\

diff --git a/google_symptoms/Makefile b/google_symptoms/Makefile
@@ -21,7 +21,7 @@ lint:
 	. env/bin/activate; pydocstyle $(dir)
 
 format:
-	. env/bin/activate; darker $(DIFF) $(REVISION) $(dir)
+	. env/bin/activate; darker $(DIFF) $(REVISION) $(CHECK) $(dir)
 
 test:
 	. env/bin/activate ;

diff --git a/hhs_hosp/Makefile b/hhs_hosp/Makefile
@@ -21,7 +21,7 @@ lint:
 	. env/bin/activate; pydocstyle $(dir)
 
 format:
-	. env/bin/activate; darker $(DIFF) $(REVISION) $(dir)
+	. env/bin/activate; darker $(DIFF) $(REVISION) $(CHECK) $(dir)
 
 test:
 	. env/bin/activate ;\

diff --git a/nchs_mortality/Makefile b/nchs_mortality/Makefile
@@ -21,7 +21,7 @@ lint:
 	. env/bin/activate; pydocstyle $(dir)
 
 format:
-	. env/bin/activate; darker $(DIFF) $(REVISION) $(dir)
+	. env/bin/activate; darker $(DIFF) $(REVISION) $(CHECK) $(dir)
 
 test:
 	. env/bin/activate ;\

diff --git a/nowcast/Makefile b/nowcast/Makefile
@@ -21,7 +21,7 @@ lint:
 	. env/bin/activate; pydocstyle $(dir) --match-dir '(?!nowcast_fusion)'
 
 format:
-	. env/bin/activate; darker $(DIFF) $(REVISION) $(dir)
+	. env/bin/activate; darker $(DIFF) $(REVISION) $(CHECK) $(dir)
 
 test:
 	. env/bin/activate ;\

diff --git a/pyproject.toml b/pyproject.toml
@@ -6,8 +6,6 @@ target-version = ['py38']
 revision = 'origin/main...'
 color = true
 isort = true
-flynt = true
-check = true
 
 [tool.isort]
 profile = "black"

diff --git a/quidel_covidtest/Makefile b/quidel_covidtest/Makefile
@@ -21,7 +21,7 @@ lint:
 	. env/bin/activate; pydocstyle $(dir)
 
 format:
-	. env/bin/activate; darker $(DIFF) $(REVISION) $(dir)
+	. env/bin/activate; darker $(DIFF) $(REVISION) $(CHECK) $(dir)
 
 test:
 	. env/bin/activate ;\

diff --git a/sir_complainsalot/Makefile b/sir_complainsalot/Makefile
@@ -21,7 +21,7 @@ lint:
 	. env/bin/activate; pydocstyle $(dir)
 
 format:
-	. env/bin/activate; darker $(DIFF) $(REVISION) $(dir)
+	. env/bin/activate; darker $(DIFF) $(REVISION) $(CHECK) $(dir)
 
 test:
 	. env/bin/activate ;\