From 86a9af1bc14bc75fdf0bc1dd8c8fb118bf243da2 Mon Sep 17 00:00:00 2001 From: jo Date: Sat, 16 Jul 2022 15:20:50 +0200 Subject: [PATCH] chore(playout): move liquidsoap package in a module --- playout/Makefile | 8 ++++---- .../liquidsoap}/1.1/fdkaac.liq | 0 .../liquidsoap}/1.1/ls_lib.liq | 0 .../liquidsoap}/1.1/ls_script.liq | 0 .../liquidsoap}/1.1/mp3.liq | 0 .../liquidsoap}/1.1/ogg.liq | 0 .../liquidsoap}/1.1/opus.liq | 0 .../liquidsoap}/1.3/fdkaac.liq | 0 .../liquidsoap}/1.3/ls_lib.liq | 0 .../liquidsoap}/1.3/ls_script.liq | 0 .../liquidsoap}/1.3/mp3.liq | 0 .../liquidsoap}/1.3/ogg.liq | 0 .../liquidsoap}/1.3/opus.liq | 0 .../liquidsoap}/1.4/fdkaac.liq | 0 .../liquidsoap}/1.4/ls_lib.liq | 0 .../liquidsoap}/1.4/ls_script.liq | 0 .../liquidsoap}/1.4/mp3.liq | 0 .../liquidsoap}/1.4/ogg.liq | 0 .../liquidsoap}/1.4/opus.liq | 0 .../liquidsoap}/__init__.py | 0 .../liquidsoap}/generate_liquidsoap_cfg.py | 0 .../liquidsoap}/liquidsoap.cfg | 0 .../liquidsoap}/liquidsoap_auth.py | 0 .../liquidsoap}/main.py | 0 playout/setup.py | 10 +++------- 25 files changed, 7 insertions(+), 11 deletions(-) rename playout/{libretime_liquidsoap => libretime_playout/liquidsoap}/1.1/fdkaac.liq (100%) rename playout/{libretime_liquidsoap => libretime_playout/liquidsoap}/1.1/ls_lib.liq (100%) rename playout/{libretime_liquidsoap => libretime_playout/liquidsoap}/1.1/ls_script.liq (100%) rename playout/{libretime_liquidsoap => libretime_playout/liquidsoap}/1.1/mp3.liq (100%) rename playout/{libretime_liquidsoap => libretime_playout/liquidsoap}/1.1/ogg.liq (100%) rename playout/{libretime_liquidsoap => libretime_playout/liquidsoap}/1.1/opus.liq (100%) rename playout/{libretime_liquidsoap => libretime_playout/liquidsoap}/1.3/fdkaac.liq (100%) rename playout/{libretime_liquidsoap => libretime_playout/liquidsoap}/1.3/ls_lib.liq (100%) rename playout/{libretime_liquidsoap => libretime_playout/liquidsoap}/1.3/ls_script.liq (100%) rename playout/{libretime_liquidsoap => libretime_playout/liquidsoap}/1.3/mp3.liq (100%) rename playout/{libretime_liquidsoap => libretime_playout/liquidsoap}/1.3/ogg.liq (100%) rename playout/{libretime_liquidsoap => libretime_playout/liquidsoap}/1.3/opus.liq (100%) rename playout/{libretime_liquidsoap => libretime_playout/liquidsoap}/1.4/fdkaac.liq (100%) rename playout/{libretime_liquidsoap => libretime_playout/liquidsoap}/1.4/ls_lib.liq (100%) rename playout/{libretime_liquidsoap => libretime_playout/liquidsoap}/1.4/ls_script.liq (100%) rename playout/{libretime_liquidsoap => libretime_playout/liquidsoap}/1.4/mp3.liq (100%) rename playout/{libretime_liquidsoap => libretime_playout/liquidsoap}/1.4/ogg.liq (100%) rename playout/{libretime_liquidsoap => libretime_playout/liquidsoap}/1.4/opus.liq (100%) rename playout/{libretime_liquidsoap => libretime_playout/liquidsoap}/__init__.py (100%) rename playout/{libretime_liquidsoap => libretime_playout/liquidsoap}/generate_liquidsoap_cfg.py (100%) rename playout/{libretime_liquidsoap => libretime_playout/liquidsoap}/liquidsoap.cfg (100%) rename playout/{libretime_liquidsoap => libretime_playout/liquidsoap}/liquidsoap_auth.py (100%) rename playout/{libretime_liquidsoap => libretime_playout/liquidsoap}/main.py (100%) diff --git a/playout/Makefile b/playout/Makefile index 5e430ae56..c5c530cd6 100644 --- a/playout/Makefile +++ b/playout/Makefile @@ -3,10 +3,10 @@ all: lint include ../tools/python.mk PIP_INSTALL := --editable .[dev] -PYLINT_ARG := libretime_liquidsoap libretime_playout tests || true -MYPY_ARG := libretime_liquidsoap libretime_playout tests || true -BANDIT_ARG := libretime_liquidsoap libretime_playout || true -PYTEST_ARG := --cov=libretime_liquidsoap --cov=libretime_playout tests +PYLINT_ARG := libretime_playout tests || true +MYPY_ARG := libretime_playout tests || true +BANDIT_ARG := libretime_playout || true +PYTEST_ARG := --cov=libretime_playout tests format: .format lint: .format-check .pylint .mypy .bandit diff --git a/playout/libretime_liquidsoap/1.1/fdkaac.liq b/playout/libretime_playout/liquidsoap/1.1/fdkaac.liq similarity index 100% rename from playout/libretime_liquidsoap/1.1/fdkaac.liq rename to playout/libretime_playout/liquidsoap/1.1/fdkaac.liq diff --git a/playout/libretime_liquidsoap/1.1/ls_lib.liq b/playout/libretime_playout/liquidsoap/1.1/ls_lib.liq similarity index 100% rename from playout/libretime_liquidsoap/1.1/ls_lib.liq rename to playout/libretime_playout/liquidsoap/1.1/ls_lib.liq diff --git a/playout/libretime_liquidsoap/1.1/ls_script.liq b/playout/libretime_playout/liquidsoap/1.1/ls_script.liq similarity index 100% rename from playout/libretime_liquidsoap/1.1/ls_script.liq rename to playout/libretime_playout/liquidsoap/1.1/ls_script.liq diff --git a/playout/libretime_liquidsoap/1.1/mp3.liq b/playout/libretime_playout/liquidsoap/1.1/mp3.liq similarity index 100% rename from playout/libretime_liquidsoap/1.1/mp3.liq rename to playout/libretime_playout/liquidsoap/1.1/mp3.liq diff --git a/playout/libretime_liquidsoap/1.1/ogg.liq b/playout/libretime_playout/liquidsoap/1.1/ogg.liq similarity index 100% rename from playout/libretime_liquidsoap/1.1/ogg.liq rename to playout/libretime_playout/liquidsoap/1.1/ogg.liq diff --git a/playout/libretime_liquidsoap/1.1/opus.liq b/playout/libretime_playout/liquidsoap/1.1/opus.liq similarity index 100% rename from playout/libretime_liquidsoap/1.1/opus.liq rename to playout/libretime_playout/liquidsoap/1.1/opus.liq diff --git a/playout/libretime_liquidsoap/1.3/fdkaac.liq b/playout/libretime_playout/liquidsoap/1.3/fdkaac.liq similarity index 100% rename from playout/libretime_liquidsoap/1.3/fdkaac.liq rename to playout/libretime_playout/liquidsoap/1.3/fdkaac.liq diff --git a/playout/libretime_liquidsoap/1.3/ls_lib.liq b/playout/libretime_playout/liquidsoap/1.3/ls_lib.liq similarity index 100% rename from playout/libretime_liquidsoap/1.3/ls_lib.liq rename to playout/libretime_playout/liquidsoap/1.3/ls_lib.liq diff --git a/playout/libretime_liquidsoap/1.3/ls_script.liq b/playout/libretime_playout/liquidsoap/1.3/ls_script.liq similarity index 100% rename from playout/libretime_liquidsoap/1.3/ls_script.liq rename to playout/libretime_playout/liquidsoap/1.3/ls_script.liq diff --git a/playout/libretime_liquidsoap/1.3/mp3.liq b/playout/libretime_playout/liquidsoap/1.3/mp3.liq similarity index 100% rename from playout/libretime_liquidsoap/1.3/mp3.liq rename to playout/libretime_playout/liquidsoap/1.3/mp3.liq diff --git a/playout/libretime_liquidsoap/1.3/ogg.liq b/playout/libretime_playout/liquidsoap/1.3/ogg.liq similarity index 100% rename from playout/libretime_liquidsoap/1.3/ogg.liq rename to playout/libretime_playout/liquidsoap/1.3/ogg.liq diff --git a/playout/libretime_liquidsoap/1.3/opus.liq b/playout/libretime_playout/liquidsoap/1.3/opus.liq similarity index 100% rename from playout/libretime_liquidsoap/1.3/opus.liq rename to playout/libretime_playout/liquidsoap/1.3/opus.liq diff --git a/playout/libretime_liquidsoap/1.4/fdkaac.liq b/playout/libretime_playout/liquidsoap/1.4/fdkaac.liq similarity index 100% rename from playout/libretime_liquidsoap/1.4/fdkaac.liq rename to playout/libretime_playout/liquidsoap/1.4/fdkaac.liq diff --git a/playout/libretime_liquidsoap/1.4/ls_lib.liq b/playout/libretime_playout/liquidsoap/1.4/ls_lib.liq similarity index 100% rename from playout/libretime_liquidsoap/1.4/ls_lib.liq rename to playout/libretime_playout/liquidsoap/1.4/ls_lib.liq diff --git a/playout/libretime_liquidsoap/1.4/ls_script.liq b/playout/libretime_playout/liquidsoap/1.4/ls_script.liq similarity index 100% rename from playout/libretime_liquidsoap/1.4/ls_script.liq rename to playout/libretime_playout/liquidsoap/1.4/ls_script.liq diff --git a/playout/libretime_liquidsoap/1.4/mp3.liq b/playout/libretime_playout/liquidsoap/1.4/mp3.liq similarity index 100% rename from playout/libretime_liquidsoap/1.4/mp3.liq rename to playout/libretime_playout/liquidsoap/1.4/mp3.liq diff --git a/playout/libretime_liquidsoap/1.4/ogg.liq b/playout/libretime_playout/liquidsoap/1.4/ogg.liq similarity index 100% rename from playout/libretime_liquidsoap/1.4/ogg.liq rename to playout/libretime_playout/liquidsoap/1.4/ogg.liq diff --git a/playout/libretime_liquidsoap/1.4/opus.liq b/playout/libretime_playout/liquidsoap/1.4/opus.liq similarity index 100% rename from playout/libretime_liquidsoap/1.4/opus.liq rename to playout/libretime_playout/liquidsoap/1.4/opus.liq diff --git a/playout/libretime_liquidsoap/__init__.py b/playout/libretime_playout/liquidsoap/__init__.py similarity index 100% rename from playout/libretime_liquidsoap/__init__.py rename to playout/libretime_playout/liquidsoap/__init__.py diff --git a/playout/libretime_liquidsoap/generate_liquidsoap_cfg.py b/playout/libretime_playout/liquidsoap/generate_liquidsoap_cfg.py similarity index 100% rename from playout/libretime_liquidsoap/generate_liquidsoap_cfg.py rename to playout/libretime_playout/liquidsoap/generate_liquidsoap_cfg.py diff --git a/playout/libretime_liquidsoap/liquidsoap.cfg b/playout/libretime_playout/liquidsoap/liquidsoap.cfg similarity index 100% rename from playout/libretime_liquidsoap/liquidsoap.cfg rename to playout/libretime_playout/liquidsoap/liquidsoap.cfg diff --git a/playout/libretime_liquidsoap/liquidsoap_auth.py b/playout/libretime_playout/liquidsoap/liquidsoap_auth.py similarity index 100% rename from playout/libretime_liquidsoap/liquidsoap_auth.py rename to playout/libretime_playout/liquidsoap/liquidsoap_auth.py diff --git a/playout/libretime_liquidsoap/main.py b/playout/libretime_playout/liquidsoap/main.py similarity index 100% rename from playout/libretime_liquidsoap/main.py rename to playout/libretime_playout/liquidsoap/main.py diff --git a/playout/setup.py b/playout/setup.py index d1ba588cc..ca3541fb8 100644 --- a/playout/setup.py +++ b/playout/setup.py @@ -1,7 +1,7 @@ from os import chdir from pathlib import Path -from setuptools import setup +from setuptools import find_packages, setup # Change directory since setuptools uses relative paths here = Path(__file__).parent.resolve() @@ -19,16 +19,12 @@ setup( "Source Code": "https://github.com/libretime/libretime", }, license="AGPLv3", - packages=[ - "libretime_playout", - "libretime_playout.notify", - "libretime_liquidsoap", - ], + packages=find_packages(), package_data={"": ["**/*.liq", "*.cfg", "*.types"]}, entry_points={ "console_scripts": [ "libretime-playout=libretime_playout.main:cli", - "libretime-liquidsoap=libretime_liquidsoap.main:cli", + "libretime-liquidsoap=libretime_playout.liquidsoap.main:cli", "libretime-playout-notify=libretime_playout.notify.main:cli", ] },