From 912a44687595fb129c1d98426f9d08c849714a0c Mon Sep 17 00:00:00 2001 From: Clemens Brunner Date: Sun, 11 Feb 2024 14:17:40 +0100 Subject: [PATCH] Clean up Makefile --- .github/CONTRIBUTING.md | 2 +- .github/workflows/python_tests.yml | 2 +- Makefile | 10 ++-------- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 1a9d57d..40624ab 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -39,7 +39,7 @@ you can run tests by making use of the `Makefile` and From the project root, call: - `make test` to run tests and coverage -- `make pep` to run style checks +- `pre-commit run` to run style checks (Ruff and some additional hooks) ## Building the documentation diff --git a/.github/workflows/python_tests.yml b/.github/workflows/python_tests.yml index 87f9b0f..400b777 100644 --- a/.github/workflows/python_tests.yml +++ b/.github/workflows/python_tests.yml @@ -60,7 +60,7 @@ jobs: - name: Check formatting if: ${{ matrix.platform == 'ubuntu-22.04' && matrix.python-version == '3.11' }} run: | - make pep + make check-manifest pre-commit run --all-files || ( git status --short ; git diff ; exit 1 ) - name: Test with pytest diff --git a/Makefile b/Makefile index 9d0d36f..d1e13a0 100755 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ -.PHONY: all inplace test check-manifest pep build-doc dist-build +.PHONY: all inplace test check-manifest build-doc dist-build -all: inplace pep test build-doc dist-build +all: inplace check-manifest test build-doc dist-build inplace: @echo "Installing pybv" @@ -16,12 +16,6 @@ check-manifest: @echo "Running check-manifest" @check-manifest -ruff: - @echo "Running ruff" - @ruff . - -pep: ruff check-manifest - build-doc: @echo "Building documentation" make -C docs/ clean