Add Black

- Set up CI to run black
- Add makefile task to fix black formatting
- Ensure isort and flake8 config intergrates well

.drone.yml

@@ -60,7 +60,7 @@ steps:
         - push
     group: testing
     commands:
-      - tox -e flake8 -e isort --recreate
+      - tox -e flake8 -e isort -e black --recreate
 
   - name: python-tests
     image: registry.online.ntnu.no/dotkom/onlineweb4-testbase:3.7

Makefile

@@ -64,7 +64,7 @@ lint-only: lint-backend lint-frontend
 test-only: test-backend test-frontend
 
 lint-backend:
-	@docker-compose run --rm $(BACKEND_SERVICE_NAME) tox --recreate -e flake8 -e isort
+	@docker-compose run --rm $(BACKEND_SERVICE_NAME) tox --recreate -e flake8 -e isort -e black
 
 lint-frontend:
 	@docker-compose run --rm $(FRONTEND_SERVICE_NAME) npm run lint
@@ -75,3 +75,5 @@ test-backend:
 test-frontend:
 	@docker-compose run --rm $(FRONTEND_SERVICE_NAME) npm run test
 
+lint-backend-fix:
+	@docker-compose run --rm $(BACKEND_SERVICE_NAME) bash -c "isort -rc apps middleware scripts utils && black apps middleware scripts utils"

requirements-linting.txt

@@ -1,3 +1,4 @@
 flake8==3.7.8
 isort==4.3.21
 pycodestyle==2.5
+black==19.3b0

setup.cfg

@@ -1,13 +1,17 @@
 [flake8]
-max_line_length = 120
+max_line_length = 88
 max-complexity = 10
-exclude = apps/*/migrations/*
+ignore=E203, E501, W503, F401
 
 [isort]
-line_length=100
+line_length=88
 skip=.tox,onlineweb4/settings/__init__.py,migrations
 default_section=THIRDPARTY
 known_first_party=apps,utils
+multi_line_output=3
+include_trailing_comma=True
+force_grid_wrap=0
+use_parentheses=True
 
 [tool:pytest]
 DJANGO_SETTINGS_MODULE=onlineweb4.settings

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = tests, flake8, isort
+envlist = tests, flake8, isort, black
 skipsdist = True
 
 [testenv]
@@ -10,6 +10,7 @@ whitelist_externals = npm
 commands =
     isort: isort -rc -c apps middleware scripts utils
     flake8: flake8 apps middleware scripts utils
+    black: black --check apps middleware scripts utils
 
 [testenv:tests]
 deps =