diff --git a/.github/workflows/check-fmt.yaml b/.github/workflows/check-fmt.yaml deleted file mode 100644 index e020df4..0000000 --- a/.github/workflows/check-fmt.yaml +++ /dev/null @@ -1,13 +0,0 @@ -name: Format check -on: - push: - branches: ['main'] - pull_request: -jobs: - black: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: psf/black@stable - with: - version: '~= 24.4.0' \ No newline at end of file diff --git a/.github/workflows/check-lint.yaml b/.github/workflows/check-lint.yaml deleted file mode 100644 index 1526d7c..0000000 --- a/.github/workflows/check-lint.yaml +++ /dev/null @@ -1,11 +0,0 @@ -name: Lint check -on: - push: - branches: ['main'] - pull_request: -jobs: - ruff: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: chartboost/ruff-action@v1 \ No newline at end of file diff --git a/.github/workflows/check-mypy.yaml b/.github/workflows/check-quality.yaml similarity index 61% rename from .github/workflows/check-mypy.yaml rename to .github/workflows/check-quality.yaml index be0d132..e7647a3 100644 --- a/.github/workflows/check-mypy.yaml +++ b/.github/workflows/check-quality.yaml @@ -1,11 +1,11 @@ -name: Type check +name: Code quality check on: push: branches: ['main'] pull_request: jobs: - mypy-check: + quality: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -17,6 +17,9 @@ jobs: python -m pip install --upgrade pip pip install poetry poetry install - - name: Run mypy - run: | - poetry run mypy rezervo + - name: Check formatting + run: poetry run poe fmtcheck + - name: Check linting + run: poetry run poe lint + - name: Check types + run: poetry run poe typecheck diff --git a/pyproject.toml b/pyproject.toml index c1a0e71..80a482e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -87,6 +87,10 @@ ignore_fail = "return_non_zero" cmd = "black rezervo" help = "Format code using black" +[tool.poe.tasks.fmtcheck] +cmd = "black --check rezervo" +help = "Check formatting using black" + [tool.poe.tasks.lintfix] cmd = "ruff check rezervo --fix" help = "Lint and fix code using ruff"