diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index ae3450e..c1ec1fc 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -32,7 +32,7 @@ jobs: ./install.sh --develop --with-qt ./jmvenv/bin/python -m pip install --upgrade pip - name: Lint with flake8 - run: ./jmvenv/bin/flake8 -v src + run: source ./jmvenv/bin/activate && ./test/lint/lint-python.sh - name: Cache bitcoind uses: actions/cache@v3 env: diff --git a/test/lint/lint-python.sh b/test/lint/lint-python.sh index 8d203dd..70dd6ba 100755 --- a/test/lint/lint-python.sh +++ b/test/lint/lint-python.sh @@ -2,14 +2,11 @@ # Based on Bitcoin Core's test/lint/lint-python.sh # The python files in jmqtui/jmqtui are auto generated. -EXCLUDE_PATTERNS="jmqtui/jmqtui/*.py" +EXCLUDE_PATTERNS="src/jmqtui/*.py" if ! command -v flake8 > /dev/null; then echo "Skipping Python linting since flake8 is not installed." exit 0 -elif flake8 --version | grep -q "Python 2"; then - echo "Skipping Python linting since flake8 is running under Python 2. Install the Python 3 version of flake8." - exit 0 fi if [[ $# == 0 ]]; then