From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Thu, 9 Mar 2023 14:34:10 +0000 (+0100)
Subject: more improvements on docker build process
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=203a3dc58bc39dccbbe6523081cf4f7cbd8debe0;p=music-assistant-server.git

more improvements on docker build process
---

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 7a7414c7..88da7c6b 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -71,7 +71,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.API_TOKEN_GITHUB }}
 
-      - name: Build
+      - name: Build and push
         uses: docker/build-push-action@v3
         with:
           builder: ${{ steps.buildx.outputs.name }}
diff --git a/pyproject.toml b/pyproject.toml
index 55881cb1..1d7d31b0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,7 +54,7 @@ test = [
 ]
 
 [project.scripts]
-mass = "music_assistant.server.__main__:main"
+mass = "music_assistant.__main__:main"
 
 [tool.setuptools.dynamic]
 version = {attr = "music_assistant.constants.__version__"}
diff --git a/requirements_all.txt b/requirements_all.txt
index 2e35199b..7386c258 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -7,26 +7,18 @@ aioslimproto==2.2.0
 aiosqlite==0.18.0
 async-upnp-client==0.33.1
 asyncio-throttle==1.0.2
-black==23.1.0
-codespell==2.2.2
 cryptography==39.0.2
 databases==0.7.0
 getmac==0.8.2
 mashumaro==3.5
 memory-tempfile==2.2.3
 music-assistant-frontend==20230308.0
-mypy==1.0.1
 orjson==3.8.6
 pillow==9.4.0
-pre-commit==2.20.0
 PyChromecast==13.0.4
 pysmb==1.2.9.1
-pytest==7.2.1
-pytest-aiohttp==1.0.4
-pytest-cov==4.0.0
 python-slugify==7.0.0
 pytube==12.1.2
-ruff==0.0.254
 shortuuid==1.0.11
 soco==0.29.1
 unidecode==1.3.6
diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py
index c696ee73..2dde54b3 100644
--- a/script/gen_requirements_all.py
+++ b/script/gen_requirements_all.py
@@ -16,9 +16,10 @@ def gather_core_requirements() -> list[str]:
     """Gather core requirements out of pyproject.toml."""
     with open("pyproject.toml", "rb") as fp:
         data = tomllib.load(fp)
+    # server deps
     dependencies: list[str] = data["project"]["optional-dependencies"]["server"]
+    # regular/client deps
     dependencies += data["project"]["dependencies"]
-    dependencies += data["project"]["optional-dependencies"]["test"]
     return dependencies