From 400d94876cd6288e04d14ce92d680820d353d16d Mon Sep 17 00:00:00 2001 From: Marcel van der Veldt Date: Thu, 16 Apr 2020 10:40:34 +0200 Subject: [PATCH] more code cleanup --- music_assistant/musicproviders/file.py | 8 +------- music_assistant/musicproviders/qobuz.py | 4 +--- music_assistant/musicproviders/spotify.py | 4 +--- music_assistant/musicproviders/tunein.py | 4 +--- setup.py | 11 +++++++++-- 5 files changed, 13 insertions(+), 18 deletions(-) diff --git a/music_assistant/musicproviders/file.py b/music_assistant/musicproviders/file.py index a72c4e64..9d23d1b3 100644 --- a/music_assistant/musicproviders/file.py +++ b/music_assistant/musicproviders/file.py @@ -1,17 +1,11 @@ -#!/usr/bin/env python3 -# -*- coding:utf-8 -*- - -import asyncio +"""Filesystem musicprovider support for MusicAssistant.""" import base64 import os -import sys -import time from typing import List from music_assistant.constants import CONF_ENABLED from music_assistant.models.media_types import ( Album, - AlbumType, Artist, MediaType, Playlist, diff --git a/music_assistant/musicproviders/qobuz.py b/music_assistant/musicproviders/qobuz.py index 6393ab9c..588545f0 100644 --- a/music_assistant/musicproviders/qobuz.py +++ b/music_assistant/musicproviders/qobuz.py @@ -1,6 +1,4 @@ -#!/usr/bin/env python3 -# -*- coding:utf-8 -*- - +"""Qobuz musicprovider support for MusicAssistant.""" import datetime import hashlib import time diff --git a/music_assistant/musicproviders/spotify.py b/music_assistant/musicproviders/spotify.py index e56b3f01..d447d47a 100644 --- a/music_assistant/musicproviders/spotify.py +++ b/music_assistant/musicproviders/spotify.py @@ -1,6 +1,4 @@ -#!/usr/bin/env python3 -# -*- coding:utf-8 -*- - +"""Spotify musicprovider support for MusicAssistant.""" import asyncio import os import platform diff --git a/music_assistant/musicproviders/tunein.py b/music_assistant/musicproviders/tunein.py index ef07ba5a..1d6efaac 100644 --- a/music_assistant/musicproviders/tunein.py +++ b/music_assistant/musicproviders/tunein.py @@ -1,6 +1,4 @@ -#!/usr/bin/env python3 -# -*- coding:utf-8 -*- - +"""Tunein musicprovider support for MusicAssistant.""" from typing import List import aiohttp diff --git a/setup.py b/setup.py index d8a91f60..86ffd280 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,7 @@ from pathlib import Path +import os -from setuptools import find_packages, setup +from setuptools import setup, glob PROJECT_DIR = Path(__file__).parent.resolve() README_FILE = PROJECT_DIR / "README.md" @@ -11,6 +12,11 @@ with open("requirements.txt") as f: if os.name != "nt": INSTALL_REQUIRES.append("uvloop") +DATA_FILES = [] +for directory in glob.glob('music_assistant/'): + files = glob.glob(directory+'*') + DATA_FILES.append((directory, files)) + setup( name="music_assistant", version=VERSION, @@ -21,11 +27,12 @@ setup( description="Music library manager and player based on sox.", long_description=README_FILE.read_text(encoding="utf-8"), long_description_content_type="text/markdown", - packages=find_packages(exclude=["test.*", "test"]), + packages=["music_assistant"], python_requires=">=3.7", include_package_data=True, install_requires=INSTALL_REQUIRES, zip_safe=False, + data_files=DATA_FILES, classifiers=[ "Development Status :: 4 - Beta", "Intended Audience :: Developers", -- 2.34.1