From 6a34c0b8d5976bb35aecf3c794166e711b338f18 Mon Sep 17 00:00:00 2001
From: Bryan Newbold <bnewbold@archive.org>
Date: Wed, 27 Oct 2021 15:19:23 -0700
Subject: update lint/fmt/test tools and configuration

yapf => black
isort config
mypy configuration
flake8 configuration
---
 Makefile | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index d766b30..190f8c7 100644
--- a/Makefile
+++ b/Makefile
@@ -9,21 +9,20 @@ help: ## Print info about all commands
 	@echo
 	@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "    \033[01;32m%-20s\033[0m %s\n", $$1, $$2}'
 
-.PHONY: dep
-dep: ## Install dependencies using pipenv
+.PHONY: deps
+deps: ## Install dependencies using pipenv
 	pipenv install --dev
 
 .PHONY: lint
 lint: ## Run lints (eg, flake8, mypy)
-	@pipenv run flake8 grobid_tei_xml/ --exit-zero --max-line-length 96 --ignore ANN101 --per-file-ignores="grobid_tei_xml/__init__.py:F401"
-	@pipenv run flake8 tests/ --ignore F405,F403,E501 --exit-zero --max-line-length 96
-	@pipenv run isort -q -c .
+	@pipenv run flake8 grobid_tei_xml/ tests/
+	@pipenv run isort -q -c grobid_tei_xml/ tests/ || true
 	@pipenv run mypy grobid_tei_xml/ tests/
 
 .PHONY: fmt
 fmt: ## Run code formating on all source code
-	pipenv run isort --atomic grobid_tei_xml/*.py tests/*.py
-	pipenv run yapf -p -i -r grobid_tei_xml tests
+	pipenv run isort --atomic grobid_tei_xml/ tests/
+	pipenv run black --line-length 96 grobid_tei_xml/ tests/
 
 .PHONY: test
 test: ## Run all tests and lints
-- 
cgit v1.2.3