From 7d879dd890e494fd2a75acc51fc6feea2174e864 Mon Sep 17 00:00:00 2001 From: Andrey Khrolenok Date: Sat, 23 Sep 2023 17:16:40 +0300 Subject: [PATCH] Fix code after blueprint merge, pt.3 --- .github/workflows/py-dead-code.yml | 6 +++--- .github/workflows/py-test.yml | 16 ++++++++-------- .github/workflows/release.yml | 2 +- CONTRIBUTING.md | 2 +- tests/README.md | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/py-dead-code.yml b/.github/workflows/py-dead-code.yml index 087dd1c..b5fd4dc 100644 --- a/.github/workflows/py-dead-code.yml +++ b/.github/workflows/py-dead-code.yml @@ -34,11 +34,11 @@ jobs: run: | python -m pip install --upgrade pip if [ -f requirements-test.txt ]; then - bin/install_requirements requirements-test.txt "${{ secrets.ADMIN_GITHUB_TOKEN }}" + script/install_requirements requirements-test.txt "${{ secrets.ADMIN_GITHUB_TOKEN }}" elif [ -f requirements-dev.txt ]; then - bin/install_requirements requirements-dev.txt "${{ secrets.ADMIN_GITHUB_TOKEN }}" + script/install_requirements requirements-dev.txt "${{ secrets.ADMIN_GITHUB_TOKEN }}" elif [ -f requirements.txt ]; then - bin/install_requirements requirements.txt "${{ secrets.ADMIN_GITHUB_TOKEN }}" + script/install_requirements requirements.txt "${{ secrets.ADMIN_GITHUB_TOKEN }}" fi pip install flake8-eradicate diff --git a/.github/workflows/py-test.yml b/.github/workflows/py-test.yml index 1f0bf89..1bfa257 100644 --- a/.github/workflows/py-test.yml +++ b/.github/workflows/py-test.yml @@ -43,11 +43,11 @@ jobs: python -m pip install --upgrade pip # Prefer requirements-dev.txt if [ -f requirements-dev.txt ]; then - bin/install_requirements requirements-dev.txt "${{ secrets.ADMIN_GITHUB_TOKEN }}" + script/install_requirements requirements-dev.txt "${{ secrets.ADMIN_GITHUB_TOKEN }}" elif [ -f requirements-test.txt ]; then - bin/install_requirements requirements-test.txt "${{ secrets.ADMIN_GITHUB_TOKEN }}" + script/install_requirements requirements-test.txt "${{ secrets.ADMIN_GITHUB_TOKEN }}" elif [ -f requirements.txt ]; then - bin/install_requirements requirements.txt "${{ secrets.ADMIN_GITHUB_TOKEN }}" + script/install_requirements requirements.txt "${{ secrets.ADMIN_GITHUB_TOKEN }}" fi if [ -d custom_components ]; then @@ -92,11 +92,11 @@ jobs: python -m pip install --upgrade pip # Prefer requirements-test.txt if [ -f requirements-test.txt ]; then - bin/install_requirements requirements-test.txt "${{ secrets.ADMIN_GITHUB_TOKEN }}" + script/install_requirements requirements-test.txt "${{ secrets.ADMIN_GITHUB_TOKEN }}" elif [ -f requirements-dev.txt ]; then - bin/install_requirements requirements-dev.txt "${{ secrets.ADMIN_GITHUB_TOKEN }}" + script/install_requirements requirements-dev.txt "${{ secrets.ADMIN_GITHUB_TOKEN }}" elif [ -f requirements.txt ]; then - bin/install_requirements requirements.txt "${{ secrets.ADMIN_GITHUB_TOKEN }}" + script/install_requirements requirements.txt "${{ secrets.ADMIN_GITHUB_TOKEN }}" fi pip install pytest-xdist @@ -108,7 +108,7 @@ jobs: if: matrix.python-version != '3.9' run: | pytest --basetemp=$RUNNER_TEMP --durations=10 -n auto --dist=loadfile -qq -o console_output_style=count -p no:sugar - ./bin/check_dirty + ./script/check_dirty - name: "Install Coveralls" if: matrix.python-version == '3.9' @@ -119,7 +119,7 @@ jobs: if: matrix.python-version == '3.9' run: | pytest --basetemp=$RUNNER_TEMP --durations=10 -n auto --dist=loadfile -qq -o console_output_style=count -p no:sugar --cov --cov-report= - ./bin/check_dirty + ./script/check_dirty - name: "Send coverage to Coveralls" if: matrix.python-version == '3.9' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7663115..1b4d72e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -78,4 +78,4 @@ jobs: - name: "Update release notes" if: env.release_version != '' && success() - run: python3 ./bin/gen_releasenotes --token ${{ secrets.GITHUB_TOKEN }} --repo ${{ github.repository }} --release ${{ env.release_version }} + run: python3 ./script/gen_releasenotes --token ${{ secrets.GITHUB_TOKEN }} --repo ${{ github.repository }} --release ${{ env.release_version }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2fd9ce9..a59bffb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,7 +9,7 @@ Contributing to this project should be as easy and transparent as possible, whet ## IMPORTANT! Install development environment first -When making changes in code, please use the existing development environment — this will save you from many errors and help create more convenient code to support. To install the environment, run the `./bin/setup` script. +When making changes in code, please use the existing development environment — this will save you from many errors and help create more convenient code to support. To install the environment, run the `./script/setup` script. ## Github is used for everything diff --git a/tests/README.md b/tests/README.md index 9fc6752..b6364eb 100644 --- a/tests/README.md +++ b/tests/README.md @@ -6,7 +6,7 @@ While tests aren't required to publish a custom component for Home Assistant, th To begin, it is recommended to create a virtual environment and install all necessary dependencies: ```bash -./bin/setup +./script/setup ``` # Useful commands