From 52830fa02c1d5a26990939ddc6fb5d78f192fe0a Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@edx.org>
Date: Wed, 2 Sep 2020 11:23:40 -0400
Subject: [PATCH] No need for three-line shell scripts; use make
---
Makefile | 21 +++++++++++++++------
scripts/quality.sh | 5 -----
scripts/sass.sh | 5 -----
scripts/test.sh | 6 ------
4 files changed, 15 insertions(+), 22 deletions(-)
delete mode 100755 scripts/quality.sh
delete mode 100755 scripts/sass.sh
delete mode 100755 scripts/test.sh
diff --git a/Makefile b/Makefile
index de9cd7e..49326f4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,9 @@
+.PHONY: help all install-test install compile-sass quality test upgrade
+
+help: ## display this help message
+ @echo "Please use \`make <target>' where <target> is one of"
+ @grep '^[a-zA-Z]' $(MAKEFILE_LIST) | sort | awk -F ':.*?## ' 'NF==2 {printf "\033[36m %-25s\033[0m %s\n", $$1, $$2}'
+
all: install compile-sass quality test
install-test:
@@ -5,14 +11,17 @@ install-test:
install: install-test
-compile-sass:
- ./scripts/sass.sh
+compile-sass: ## Compile the Sass assets
+ sass --no-cache --style compressed ./lti_consumer/static/sass/student.scss ./lti_consumer/static/css/student.css
-quality:
- ./scripts/quality.sh
+quality: ## Run the quality checks
+ pep8 --config=.pep8 lti_consumer
+ pylint --rcfile=pylintrc lti_consumer
-test:
- ./scripts/test.sh
+test: ## Run the tests
+ mkdir -p var
+ rm -rf .coverage
+ python -m coverage run --rcfile=.coveragerc ./test.py --noinput
upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
diff --git a/scripts/quality.sh b/scripts/quality.sh
deleted file mode 100755
index a027884..0000000
--- a/scripts/quality.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-pep8 --config=.pep8 lti_consumer
-pylint --rcfile=pylintrc lti_consumer
diff --git a/scripts/sass.sh b/scripts/sass.sh
deleted file mode 100755
index 35496b5..0000000
--- a/scripts/sass.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-# Student view sass
-sass --no-cache --style compressed ./lti_consumer/static/sass/student.scss ./lti_consumer/static/css/student.css
diff --git a/scripts/test.sh b/scripts/test.sh
deleted file mode 100755
index f5f08fe..0000000
--- a/scripts/test.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-mkdir -p var
-rm -rf .coverage
-python -m coverage run --rcfile=.coveragerc ./test.py $1 --noinput
--
GitLab