Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
gieljnssns committed Jun 2, 2023
2 parents f6ceac3 + 7e9cc0e commit 6fe6ec7
Show file tree
Hide file tree
Showing 79 changed files with 3,751 additions and 783 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pre-commit-updater.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v4.3.0
uses: actions/setup-python@v4.6.1
with:
python-version: '3.10'
- name: Install pre-commit
run: pip install pre-commit
- name: Run pre-commit autoupdate
run: pre-commit autoupdate
- name: Create Pull Request
uses: peter-evans/[email protected].0
uses: peter-evans/[email protected].1
with:
token: ${{ secrets.GITHUB_TOKEN }}
branch: update/pre-commit-autoupdate
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- uses: actions/[email protected]
- name: Set up Python 3.10
uses: actions/setup-python@v4.5.0
uses: actions/setup-python@v4.6.1
with:
python-version: "3.10"
- name: Install build
Expand All @@ -21,7 +21,7 @@ jobs:
run: >-
python3 -m build
- name: Publish release to PyPI
uses: pypa/[email protected].5
uses: pypa/[email protected].6
with:
user: __token__
password: ${{ secrets.PYPI_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Release Drafter
on:
push:
branches:
- master
- main

jobs:
update_release_draft:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Check out code from GitHub
uses: actions/[email protected]
- name: Set up Python
uses: actions/setup-python@v4.5.0
uses: actions/setup-python@v4.6.1
with:
python-version: "3.11"
- name: Install dependencies
Expand All @@ -41,7 +41,7 @@ jobs:
- name: Check out code from GitHub
uses: actions/[email protected]
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4.5.0
uses: actions/setup-python@v4.6.1
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand Down
30 changes: 15 additions & 15 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repos:
- --branch=main
- id: debug-statements
- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: 'v0.0.262'
rev: 'v0.0.270'
hooks:
- id: ruff
- repo: https://github.com/psf/black
Expand All @@ -30,21 +30,21 @@ repos:
additional_dependencies:
- tomli

- repo: local
hooks:
- id: pylint
name: pylint
entry: script/run-in-env.sh pylint -j 0
language: script
types: [python]
files: ^hass_client/.+\.py$
# - repo: local
# hooks:
# - id: pylint
# name: pylint
# entry: script/run-in-env.sh pylint -j 0
# language: script
# types: [python]
# files: ^music_assistant/.+\.py$

- id: mypy
name: mypy
entry: script/run-in-env.sh mypy
language: script
types: [python]
files: ^hass_client/.+\.py$
# - id: mypy
# name: mypy
# entry: script/run-in-env.sh mypy
# language: script
# types: [python]
# files: ^music_assistant/.+\.py$

- repo: local
hooks:
Expand Down
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ RUN set -x \
libsox3 \
sox \
cifs-utils \
libnfs-utils \
# cleanup
&& rm -rf /tmp/* \
&& rm -rf /var/lib/apt/lists/*
Expand Down
3 changes: 2 additions & 1 deletion music_assistant/client/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
"""Music Assistant: The music library manager in python."""
"""Music Assistant Client: Manage a Music Assistant server remotely."""
from .client import MusicAssistantClient # noqa: F401
Loading

0 comments on commit 6fe6ec7

Please sign in to comment.