Ordered and fixed Makefile.

Author: pauloxnet

Makefile

@@ -1,47 +1,47 @@
-STATIC = djangoproject/static
-SCSS = djangoproject/scss
-JQUERY_FLOT=djangoproject/static/js/lib/jquery-flot
+.PHONY: all ci clean collectstatics compile-scss compile-scss-debug install run test watch-scss
+
 APP_LIST ?= accounts aggregator blog contact dashboard djangoproject docs foundation fundraising legacy members releases svntogit tracdb
+JQUERY_FLOT=djangoproject/static/js/lib/jquery-flot
+SCSS = djangoproject/scss
+STATIC = djangoproject/static
 
-.PHONY: all ci clean collectstatics compile-scss compile-scss-debug install run test watch-scss
+ci: test
+	@python -m coverage report
 
 collectstatics: compile-scss
 	python -m manage collectstatic --noinput
 
 compile-scss:
-	pysassc $(SCSS)/output.scss $(STATIC)/css/output.css -s compressed
+	python -m pysassc $(SCSS)/output.scss $(STATIC)/css/output.css --style=compressed
 
 compile-scss-debug:
-	pysassc $(SCSS)/output.scss $(STATIC)/css/output.css --sourcemap
-
-watch-scss:
-	watchmedo shell-command --patterns=*.scss --recursive --command="make compile-scss-debug" $(SCSS)
-
-run:
-	python -m manage runserver 0.0.0.0:8000
+	python -m pysassc $(SCSS)/output.scss $(STATIC)/css/output.css --sourcemap
 
 install:
-	python -m pip install -r requirements/dev.txt
+	python -m pip install --requirement requirements/dev.txt
 	npm install
 
-migrations-check:
-	python -m manage makemigrations --check --dry-run
-
-test: migrations-check
-	@python -m coverage run --source=. -m manage test -v2 $(APP_LIST)
-
-ci: test
-	@python -m coverage report
-
 isort:
 	python -m isort $(APP_LIST)
 
 isort-check:
-	python -m isort -c $(APP_LIST)
+	python -m isort --check $(APP_LIST)
+
+$(JQUERY_FLOT)/:
+	npm run bower install
 
 $(JQUERY_FLOT)/jquery.flot.min.js: $(JQUERY_FLOT)
 	cat $(JQUERY_FLOT)/jquery.flot.js $(JQUERY_FLOT)/jquery.flot.time.js > $(JQUERY_FLOT)/jquery.flot.concat.js
 	yuicompressor $(JQUERY_FLOT)/jquery.flot.concat.js -o $(JQUERY_FLOT)/jquery.flot.min.js
 
-$(JQUERY_FLOT)/:
-	npm run bower install
+migrations-check:
+	python -m manage makemigrations --check --dry-run
+
+run:
+	python -m manage runserver 0.0.0.0:8000
+
+test: migrations-check
+	@python -m coverage run --source=. --module manage test --verbosity 2 $(APP_LIST)
+
+watch-scss:
+	watchmedo shell-command --patterns=*.scss --recursive --command="make compile-scss-debug" $(SCSS)

requirements/dev.txt

@@ -1,4 +1,5 @@
 -r common.txt
 django-debug-toolbar==4.4.6
+isort==5.13.2
 pre-commit~=3.5.0
 watchdog==4.0.2