Add a "valid" Make command to run isort, black, and mypy

tdruez · tdruez · commit 1581b15a0f50 · 2023-12-08T10:33:38.000+04:00
Signed-off-by: tdruez &lt;tdruez@nexb.com&gt;
diff --git a/.gitignore b/.gitignore
@@ -13,5 +13,5 @@ pip-selfcheck.json
 pyvenv.cfg
 .Python
 /.tox/
-/.pytest_cache/
+/.*_cache/
 venv
diff --git a/Makefile b/Makefile
@@ -26,7 +26,7 @@
 PYTHON_EXE?=python3
 ACTIVATE?=. bin/activate;
 VIRTUALENV_PYZ=thirdparty/virtualenv.pyz
-BLACK_ARGS=--exclude=".cache|migrations|data|lib|bin|var"
+BLACK_ARGS=--exclude=".cache|lib|bin|var" --line-length 100
 
 virtualenv:
 	@echo "-> Bootstrap the virtualenv with PYTHON_EXE=${PYTHON_EXE}"
@@ -46,9 +46,27 @@ clean:
 	find . -type f -name '*.py[co]' -delete -o -type d -name __pycache__ \
 		-delete -type d -name '*.egg-info' -delete
 
+isort:
+	@echo "-> Apply isort changes to ensure proper imports ordering"
+	@${ACTIVATE} isort --profile black src/ tests/
+
+black:
+	@echo "-> Apply black code formatter"
+	@${ACTIVATE} black ${BLACK_ARGS} .
+
+mypy:
+	@echo "-> Type check the Python code."
+	@${ACTIVATE} mypy
+
+valid:
+	@${ACTIVATE} pip install -e .[lint]
+	@$(MAKE) isort
+	@$(MAKE) black
+	@$(MAKE) mypy
+
 test:
 	@echo "-> Run the test suite"
 	${MANAGE} test --noinput
 	bin/py.test tests
 
-.PHONY: virtualenv conf dev clean test
+.PHONY: virtualenv conf dev clean isort black mypy valid test
diff --git a/tests/contrib/test_purl2url.py b/tests/contrib/test_purl2url.py
@@ -129,9 +129,7 @@ def test_purl2url_get_inferred_urls():
             "https://gitlab.com/tg1999/firebase",
             "https://gitlab.com/tg1999/firebase/-/archive/1a122122/firebase-1a122122.tar.gz",
         ],
-        "pkg:pypi/sortedcontainers@2.4.0": [
-            "https://pypi.org/project/sortedcontainers/2.4.0/"
-        ],
+        "pkg:pypi/sortedcontainers@2.4.0": ["https://pypi.org/project/sortedcontainers/2.4.0/"],
         "pkg:rubygems/package-name": ["https://rubygems.org/gems/package-name"],
         "pkg:bitbucket/birkenfeld": [],
     }
