more improvements on docker build process
authorMarcel van der Veldt <m.vanderveldt@outlook.com>
Thu, 9 Mar 2023 14:34:10 +0000 (15:34 +0100)
committerMarcel van der Veldt <m.vanderveldt@outlook.com>
Thu, 9 Mar 2023 14:34:10 +0000 (15:34 +0100)
.github/workflows/docker-build.yml
pyproject.toml
requirements_all.txt
script/gen_requirements_all.py

index 7a7414c72c1e47f3492c823461b26bcefc4322ac..88da7c6b4d05bad3220dba1f48bc12bc89e85219 100644 (file)
@@ -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 }}
index 55881cb1bef1b46d726ea88b731832c7de02eb72..1d7d31b03bc4aabb9ee2e2d9bfe8c598e888c156 100644 (file)
@@ -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__"}
index 2e35199b1e4bad49bd4766c110694143f56227b0..7386c25818aa244e1f2c179416266857bcb01c26 100644 (file)
@@ -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
index c696ee73e4b752c017b985cde6198e12a62d25cf..2dde54b383f9e83e4cb3a6da6d4eda49fc83e88d 100644 (file)
@@ -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