Skip to content

Commit

Permalink
lint/pre-commit/ci: replace shfmt => beautysh
Browse files Browse the repository at this point in the history
  • Loading branch information
casperdcl committed Jan 31, 2020
1 parent 4e87bf9 commit b0b69ce
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 24 deletions.
7 changes: 4 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ repos:
hooks:
- id: flake8
language_version: python3
- repo: https://github.com/casperdcl/sh
- repo: https://github.com/lovesegfault/beautysh
rev: master
hooks:
- id: shfmt
language: golang
- id: beautysh
language_version: python3
args: [-i, '2'] # 2-space indentaion
9 changes: 1 addition & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,14 @@ stages:
jobs:
include:
# patch formatting checks
- name: "Python formatting"
- name: "Check patch formatting"
stage: check
os: linux
language: python
python: 3.7
before_install:
install:
script: ./scripts/ci/check_patch.sh
- name: "Script formatting"
os: linux
language: go
go: 1.13
before_install:
install:
script: ./scripts/ci/check_scripts.sh
# test jobs
- name: "3.7 on Windows"
stage: test
Expand Down
5 changes: 1 addition & 4 deletions scripts/ci/check_patch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,4 @@ pip install Pygments collective.checkdocs pre-commit
python setup.py checkdocs

# stop the build if there are any formatting errors
err=0
pre-commit run --all-files black || err=1
pre-commit run --all-files flake8 || err=1
exit $err
pre-commit run --all-files
9 changes: 0 additions & 9 deletions scripts/ci/check_scripts.sh

This file was deleted.

0 comments on commit b0b69ce

Please sign in to comment.