diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml deleted file mode 100644 index 392e281..0000000 --- a/.github/workflows/linting.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: pre-commit - -on: - pull_request: - push: - branches: [main] - -jobs: - pre-commit: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 - - uses: pre-commit/action@v2.0.3 \ No newline at end of file diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 5b95152..470a0e7 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -33,6 +33,13 @@ jobs: set -vxeuo pipefail python -m pip install -r requirements-dev.txt python -m pip list + + - name: Lint with flake8 + shell: bash -l {0} + run: | + set -vxeuo pipefail + python -m flake8 + - name: Test with pytest shell: bash -l {0} run: | diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml deleted file mode 100644 index 0baa145..0000000 --- a/.pre-commit-config.yaml +++ /dev/null @@ -1,15 +0,0 @@ -default_language_version: - python: python3 -repos: - - repo: https://github.com/ambv/black - rev: 21.12b0 - hooks: - - id: black - - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v2.0.0 - hooks: - - id: flake8 - - repo: https://github.com/kynan/nbstripout - rev: 0.5.0 - hooks: - - id: nbstripout diff --git a/requirements-dev.txt b/requirements-dev.txt index 2759b55..42d5247 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -6,7 +6,6 @@ flake8 pytest sphinx twine -pre-commit black nbstripout requests_mock