From e323290e61f9c88cfe0946cc38e80a8aed1e9183 Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Mon, 15 Oct 2018 09:25:57 -0700 Subject: [PATCH] Switch from bash to sh for black wrapper. --- scripts/black | 14 ++++---------- tox.ini | 4 ++-- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/scripts/black b/scripts/black index 8c5efb7bd..93205015a 100755 --- a/scripts/black +++ b/scripts/black @@ -1,13 +1,7 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh -set -e - -python_version=$(python --version) - -if [[ "$python_version" =~ "Python 3.5." ]]; then - echo "Skipping black due to lack of support for $python_version." -elif [[ "$python_version" =~ "Python 3.4." ]]; then - echo "Skipping black due to lack of support for $python_version." -else +if which black; then black --skip-string-normalization --line-length 100 --check . +else + echo "Skipping black due to not being installed." fi diff --git a/tox.ini b/tox.ini index e9f83c2da..17ddb4387 100644 --- a/tox.ini +++ b/tox.ini @@ -5,11 +5,11 @@ skipsdist = True [testenv] usedevelop = True deps = -rtest_requirements.txt -whitelist_externals = bash +whitelist_externals = sh commands = py.test --cov-report term-missing:skip-covered --cov=borgmatic --ignore=tests/end-to-end \ tests [] - bash scripts/black + sh scripts/black flake8 . [testenv:black]