From 7ab54e0b9c3d96a86f9524426c43b4d357583ba9 Mon Sep 17 00:00:00 2001 From: David Bonnes Date: Tue, 10 Sep 2024 19:29:34 +0100 Subject: [PATCH] tidy up actions --- .github/workflows/check-lint.yml | 2 +- .github/workflows/check-test.yml | 3 +-- .github/workflows/check-type.yml | 3 +-- .github/workflows/publish-hatch.yml | 3 +-- requirements.txt | 6 +++--- requirements_dev.txt | 2 +- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/check-lint.yml b/.github/workflows/check-lint.yml index f39ecb8c..e022014b 100644 --- a/.github/workflows/check-lint.yml +++ b/.github/workflows/check-lint.yml @@ -41,7 +41,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install ruff + pip install ruff # pip install -r requirements_dev.txt - name: Check with ruff run: ruff check --output-format=github . diff --git a/.github/workflows/check-test.yml b/.github/workflows/check-test.yml index e4c296a2..930af1c9 100644 --- a/.github/workflows/check-test.yml +++ b/.github/workflows/check-test.yml @@ -41,8 +41,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -r requirements.txt - pip install pytest pytest-asyncio pytest-sugar pytest-xdist PyYAML + pip install -r requirements_dev.txt - name: Install the package run: pip install -e . diff --git a/.github/workflows/check-type.yml b/.github/workflows/check-type.yml index 68bc8f75..2dc32016 100644 --- a/.github/workflows/check-type.yml +++ b/.github/workflows/check-type.yml @@ -41,10 +41,9 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -r requirements.txt pip install -r requirements_dev.txt - name: Check with mypy - run: mypy + run: mypy --enable-incomplete-feature=NewGenericSyntax - run: echo "🍏 This job's status is ${{ job.status }}." diff --git a/.github/workflows/publish-hatch.yml b/.github/workflows/publish-hatch.yml index cdf4e93c..8235cd58 100644 --- a/.github/workflows/publish-hatch.yml +++ b/.github/workflows/publish-hatch.yml @@ -12,8 +12,8 @@ permissions: jobs: build-and-deploy: - runs-on: ubuntu-latest + strategy: fail-fast: false matrix: @@ -31,7 +31,6 @@ jobs: run: | python -m pip install --upgrade pip pip install -r requirements.txt - pip install -r requirements-dev.txt - name: Build package run: python -m build diff --git a/requirements.txt b/requirements.txt index b6b58eaf..8bf4b3c5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,13 +3,13 @@ # # library requirements (dependencies) are in pyproject.toml -# - check: pip list | grep -E 'ramses|colorlog|paho-mqtt|pyserial|voluptuous' +# - pip list | grep -E 'ramses|colorlog|paho-mqtt|pyserial|voluptuous' - -e . +# -e . # also required if using the the library via the CLI, client.py -# - check via: pip list | grep -E 'click|colorama|debugpy' +# - pip list | grep -E 'click|colorama|debugpy' click >= 8.1.7 # NOTE: non-async version colorama >= 0.4.6 diff --git a/requirements_dev.txt b/requirements_dev.txt index f243b241..41453650 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -11,7 +11,7 @@ # used for development (linting) pre-commit >= 3.8.0 - ruff >= 0.6.4 # also: pre-commit-config.yaml + ruff >= 0.6.4 # also: check-lint.yml, pre-commit-config.yaml # used for development (typing) mypy >= 1.11.1