Skip to content

Commit

Permalink
Merge branch 'develop' into fix-mpv-version-parsing
Browse files Browse the repository at this point in the history
  • Loading branch information
Neraste authored Mar 16, 2024
2 parents 2b7d7de + 1f5d54d commit 5c662dd
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 7 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,3 +122,6 @@ jobs:

- name: Run style checks
run: python -m black . --check

- name: Run ruff linter
run: python -m ruff check .
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ repos:
entry: black . --check
language: system
pass_filenames: false
- id: flake8-check
name: Check PEP8
entry: flake8
- id: ruff-check
name: Run ruff linter
entry: ruff check .
language: system
pass_filenames: false
8 changes: 8 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ dev = [
"pre-commit>=2.20.0,<2.21.0",
"pytest-cov>=4.0.0,<4.1.0",
"pytest>=7.2.0,<7.3.0",
"ruff>=0.3.0,<0.4.0",
]

[project.urls]
Expand All @@ -71,3 +72,10 @@ addopts = "--cov=dakara_player"

[tool.isort]
profile = "black"

[tool.ruff]
line-length = 88

[tool.ruff.lint]
select = ["E", "F", "W", "B"]
ignore = []
3 changes: 0 additions & 3 deletions setup.cfg

This file was deleted.

2 changes: 1 addition & 1 deletion tests/unit/test_media_player_mpv.py
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ def test_init(self):
mpv_player, (mocked_player, _, _), _ = self.get_instance(
{"mpv": {"key1": "value1"}}
)
self.assertEqual(getattr(mocked_player, "key1"), "value1")
self.assertEqual(mocked_player.key1, "value1")

def test_play_invalid(self):
"""Test to play invalid action."""
Expand Down

0 comments on commit 5c662dd

Please sign in to comment.