From e4442d212824a4c2a0cead63954fac59dea9a93b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Oct 2023 14:23:13 +0200 Subject: [PATCH] Bump pytest from 7.4.0 to 7.4.3 (#895) * Bump pytest from 7.4.0 to 7.4.3 Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.4.0 to 7.4.3. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/7.4.0...7.4.3) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * lint fixes --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marcel van der Veldt --- music_assistant/server/controllers/metadata.py | 2 +- music_assistant/server/helpers/database.py | 4 ++-- music_assistant/server/helpers/tags.py | 2 +- music_assistant/server/providers/filesystem_local/base.py | 2 +- pyproject.toml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/music_assistant/server/controllers/metadata.py b/music_assistant/server/controllers/metadata.py index 338abbff..33828769 100755 --- a/music_assistant/server/controllers/metadata.py +++ b/music_assistant/server/controllers/metadata.py @@ -208,7 +208,7 @@ class MetaDataController(CoreController): # if playlist has no default image (e.g. a local playlist) if images and (not playlist.image or playlist.image.provider != "url"): if playlist.image and self.mass.storage_path in playlist.image.path: - # re-use previous created path + # reuse previous created path img_path = playlist.image.path else: img_path = os.path.join(self.mass.storage_path, f"{uuid4().hex}.png") diff --git a/music_assistant/server/helpers/database.py b/music_assistant/server/helpers/database.py index f5072675..89e92721 100755 --- a/music_assistant/server/helpers/database.py +++ b/music_assistant/server/helpers/database.py @@ -101,7 +101,7 @@ class DatabaseConnection: sql_query = f'INSERT OR REPLACE INTO {table}({",".join(keys)})' else: sql_query = f'INSERT INTO {table}({",".join(keys)})' - sql_query += f' VALUES ({",".join((f":{x}" for x in keys))})' + sql_query += f' VALUES ({",".join(f":{x}" for x in keys)})' await self.execute(sql_query, values) await self._db.commit() # return inserted/replaced item @@ -120,7 +120,7 @@ class DatabaseConnection: ) -> Mapping: """Update record.""" keys = tuple(values.keys()) - sql_query = f'UPDATE {table} SET {",".join((f"{x}=:{x}" for x in keys))} WHERE ' + sql_query = f'UPDATE {table} SET {",".join(f"{x}=:{x}" for x in keys)} WHERE ' sql_query += " AND ".join(f"{x} = :{x}" for x in match) await self.execute(sql_query, {**match, **values}) await self._db.commit() diff --git a/music_assistant/server/helpers/tags.py b/music_assistant/server/helpers/tags.py index d309173d..b6496e35 100644 --- a/music_assistant/server/helpers/tags.py +++ b/music_assistant/server/helpers/tags.py @@ -20,7 +20,7 @@ LOGGER = logging.getLogger(ROOT_LOGGER_NAME).getChild("tags") # the only multi-item splitter we accept is the semicolon, # which is also the default in Musicbrainz Picard. -# the slash is also a common splitter but causes colissions with +# the slash is also a common splitter but causes collisions with # artists actually containing a slash in the name, such as ACDC TAG_SPLITTER = ";" diff --git a/music_assistant/server/providers/filesystem_local/base.py b/music_assistant/server/providers/filesystem_local/base.py index d8962f74..d7805e74 100644 --- a/music_assistant/server/providers/filesystem_local/base.py +++ b/music_assistant/server/providers/filesystem_local/base.py @@ -703,7 +703,7 @@ class FileSystemProviderBase(MusicProvider): # track artist(s) for index, track_artist_str in enumerate(tags.artists): - # re-use album artist details if possible + # reuse album artist details if possible if track.album and ( album_artist := next( (x for x in track.album.artists if x.name == track_artist_str), None diff --git a/pyproject.toml b/pyproject.toml index 64835075..2ff69f50 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -53,7 +53,7 @@ test = [ "codespell==2.2.5", "mypy==1.5.1", "ruff==0.1.1", - "pytest==7.4.0", + "pytest==7.4.3", "pytest-asyncio==0.21.1", "pytest-aiohttp==1.0.4", "pytest-cov==4.1.0", -- 2.34.1