From 336e2aa0ba69009a1d6a3cd958d647902055691a Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sat, 8 Dec 2018 16:06:54 +0000 Subject: [PATCH] Move linting to generic script --- .circleci/config.yml | 2 +- scripts/black.sh | 9 --------- scripts/lint.sh | 12 ++++++++++++ scripts/test.sh | 4 ---- 4 files changed, 13 insertions(+), 14 deletions(-) delete mode 100755 scripts/black.sh create mode 100755 scripts/lint.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index ffb24f1..7e6622b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,4 +11,4 @@ jobs: - run: env/bin/pip install -e . - run: env/bin/pip install -r dev-requirements.txt - run: ./scripts/test.sh - - run: ./scripts/black.sh + - run: ./scripts/lint.sh diff --git a/scripts/black.sh b/scripts/black.sh deleted file mode 100755 index 49222a9..0000000 --- a/scripts/black.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -e - -export PATH=env/bin:${PATH} - -pip install black==18.9b0 - -black tests ipc_unix setup.py --check diff --git a/scripts/lint.sh b/scripts/lint.sh new file mode 100755 index 0000000..77846b1 --- /dev/null +++ b/scripts/lint.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +set -e + +export PATH=env/bin:${PATH} + +pip install black==18.9b0 + +black tests ipc_unix setup.py --check +flake8 ipc_unix tests setup.py --ignore=E128,E501 +isort -rc -c ipc_unix tests setup.py +mypy --strict-optional ipc_unix tests diff --git a/scripts/test.sh b/scripts/test.sh index 114a937..7940758 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -5,7 +5,3 @@ set -e export PATH=env/bin:${PATH} nose2 $@ -C --coverage ipc_unix --verbose - -flake8 ipc_unix tests setup.py --ignore=E128,E501 -isort -rc -c ipc_unix tests setup.py -mypy --strict-optional ipc_unix tests