Skip to content

Commit

Permalink
shim nox in for the Make targets
Browse files Browse the repository at this point in the history
  • Loading branch information
ewdurbin committed Jun 11, 2023
1 parent 5c51e73 commit 0d53121
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 17 deletions.
29 changes: 12 additions & 17 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,11 @@ help:
@echo --------------------
@echo Development Targets:
@echo ----
@echo build - Builds the fidesctl Docker image.
@echo ----
@echo check-all - Run all CI checks except for externally dependent ones.
@echo build - Builds the fideslang Docker image.
@echo ----
@echo clean - Runs Docker commands to clean up the docker local environment.
@echo ----
@echo shell - Spins up the database, API, and starts a shell within the API container to run CLI commands.
@echo shell - Starts a shell within the container to run CLI commands.
@echo ----
@echo docs-serve - Spins up the docs server on localhost:8000
@echo --------------------
Expand Down Expand Up @@ -71,33 +69,30 @@ push: build
####################

black:
@$(RUN) black --check src/
@$(RUN) nox -s black

# The order of dependent targets here is intentional
check-all: teardown build-local-prod check-install black \
pylint mypy xenon pytest
check-all: teardown build-local-prod check-install check-static pytest
@echo "Running formatter, linter, typechecker and tests..."

check-static:
@$(RUN) nox -s check_static

check-install:
@echo "Checking that fidesctl is installed..."
@echo "Checking that fideslang is installed..."
@$(RUN) python -c "import fideslang"

mypy:
@$(RUN) mypy
@$(RUN) nox -x mypy

pylint:
@$(RUN) pylint src/
@$(RUN) nox -s pylint

pytest: build-local
@$(RUN) pytest -x
@$(RUN) nox -s tests

xenon:
@$(RUN) xenon src \
--max-absolute B \
--max-modules B \
--max-average A \
--ignore "data, tests, docs" \
--exclude "src/fideslang/_version.py"
@$(RUN) nox -s xenon

####################
# Utils
Expand Down
1 change: 1 addition & 0 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
black==22.3
ipython
mypy==0.910
nox
packaging==20.9
pre-commit==2.9.3
pylint==2.10.0
Expand Down

0 comments on commit 0d53121

Please sign in to comment.