diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml index 56ff5325b..e51844ac3 100644 --- a/.github/workflows/python-ci.yml +++ b/.github/workflows/python-ci.yml @@ -44,4 +44,4 @@ jobs: uses: akaihola/darker/.github/actions/commit-range@1.7.1 - name: Format (darker) run: | - DIFF="--diff" REVISION="--revision=${{ steps.commit-range.outputs.commit-range }}" make format \ No newline at end of file + DIFF="--diff" CHECK="--check" REVISION="--revision=${{ steps.commit-range.outputs.commit-range }}" make format \ No newline at end of file diff --git a/changehc/Makefile b/changehc/Makefile index a432192fe..c4b3d296b 100644 --- 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 index 3a2c513e6..adbc25e87 100644 --- 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 index 3a2c513e6..adbc25e87 100644 --- 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 index f4f13f5d2..97de0f099 100644 --- 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 index 40a0a7a58..800514564 100644 --- 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 index 3a2c513e6..adbc25e87 100644 --- 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 index 07ac51045..41afd90be 100644 --- 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 index 1c7f90e22..34b9133e3 100644 --- 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 index 3a2c513e6..adbc25e87 100644 --- 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 index 3a2c513e6..adbc25e87 100644 --- 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 ;\