Merge pull request #5159 from wiredfool/makefile_updates

Makefile updates

Makefile

@@ -1,4 +1,4 @@
-.DEFAULT_GOAL := release-test
+.DEFAULT_GOAL := help
 
 .PHONY: clean
 clean:
@@ -7,13 +7,6 @@ clean:
 	rm -r build || true
 	find . -name __pycache__ | xargs rm -r || true
 
-BRANCHES=`git branch -a | grep -v HEAD | grep -v master | grep remote`
-.PHONY: co
-co:
-	-for i in $(BRANCHES) ; do \
-        git checkout -t $$i ; \
-    done
-
 .PHONY: coverage
 coverage:
 	pytest -qq
@@ -47,7 +40,9 @@ help:
 	@echo "  install            make and install"
 	@echo "  install-coverage   make and install with C coverage"
 	@echo "  install-req        install documentation and test dependencies"
-	@echo "  install-venv       install in virtualenv"
+	@echo "  install-venv       (deprecated) install in virtualenv"
+	@echo "  lint               run the lint checks"
+	@echo "  lint-fix           run black and isort to (mostly) fix lint issues."
 	@echo "  release-test       run code and package tests before release"
 	@echo "  test               run tests on installed pillow"
 	@echo "  upload             build and upload sdists to PyPI"
@@ -109,3 +104,14 @@ test:
 .PHONY: readme
 readme:
 	python3 setup.py --long-description | markdown2 > .long-description.html && open .long-description.html
+
+
+.PHONY: lint
+lint:
+	tox --help > /dev/null || python3 -m pip install tox
+	tox -e lint
+
+.PHONY: lint-fix
+lint-fix:
+	black --target-version py36 .
+	isort .