diff --git a/api_client/Makefile b/api_client/Makefile index fcb8986c6..0c475d8ad 100644 --- a/api_client/Makefile +++ b/api_client/Makefile @@ -3,9 +3,9 @@ all: lint test include ../tools/python.mk PIP_INSTALL := --editable . -PYLINT_ARG := api_clients tests -MYPY_ARG := api_clients tests -PYTEST_ARG := --cov=api_clients tests +PYLINT_ARG := libretime_api_client tests +MYPY_ARG := libretime_api_client tests +PYTEST_ARG := --cov=libretime_api_client tests format: .format lint: .format-check .pylint .mypy diff --git a/api_client/setup.py b/api_client/setup.py index d43859bc1..517411624 100644 --- a/api_client/setup.py +++ b/api_client/setup.py @@ -17,7 +17,7 @@ setup( "Source Code": "https://github.com/libretime/libretime", }, license="AGPLv3", - packages=["api_clients"], + packages=["libretime_api_client"], python_requires=">=3.6", install_requires=[ "configobj", diff --git a/api_client/tests/apcurl_test.py b/api_client/tests/apcurl_test.py index 900f1dbe8..1c9a81984 100644 --- a/api_client/tests/apcurl_test.py +++ b/api_client/tests/apcurl_test.py @@ -1,6 +1,6 @@ import pytest -from api_clients.utils import ApcUrl, IncompleteUrl, UrlBadParam +from libretime_api_client.utils import ApcUrl, IncompleteUrl, UrlBadParam @pytest.mark.parametrize( diff --git a/api_client/tests/apirequest_test.py b/api_client/tests/apirequest_test.py index 59ba8913e..a6497cc09 100644 --- a/api_client/tests/apirequest_test.py +++ b/api_client/tests/apirequest_test.py @@ -1,6 +1,6 @@ from unittest.mock import MagicMock, patch -from api_clients.utils import ApcUrl, ApiRequest +from libretime_api_client.utils import ApcUrl, ApiRequest def test_api_request_init(): diff --git a/api_client/tests/requestprovider_test.py b/api_client/tests/requestprovider_test.py index 8ed6475fa..f8afc9b47 100644 --- a/api_client/tests/requestprovider_test.py +++ b/api_client/tests/requestprovider_test.py @@ -1,7 +1,7 @@ import pytest -from api_clients.utils import RequestProvider -from api_clients.version1 import api_config +from libretime_api_client.utils import RequestProvider +from libretime_api_client.version1 import api_config @pytest.fixture() diff --git a/api_client/tests/utils_test.py b/api_client/tests/utils_test.py index 15143e26e..61d4d840e 100644 --- a/api_client/tests/utils_test.py +++ b/api_client/tests/utils_test.py @@ -3,7 +3,7 @@ from configparser import ConfigParser import pytest -from api_clients import utils +from libretime_api_client import utils def test_time_in_seconds(): diff --git a/api_client/tests/version2_test.py b/api_client/tests/version2_test.py index 4496d4e2c..81162fe48 100644 --- a/api_client/tests/version2_test.py +++ b/api_client/tests/version2_test.py @@ -1,7 +1,7 @@ import pytest -from api_clients.utils import RequestProvider -from api_clients.version2 import AirtimeApiClient, api_config +from libretime_api_client.utils import RequestProvider +from libretime_api_client.version2 import AirtimeApiClient, api_config @pytest.fixture() diff --git a/playout/liquidsoap/generate_liquidsoap_cfg.py b/playout/liquidsoap/generate_liquidsoap_cfg.py index 70426a03e..a41e24c38 100644 --- a/playout/liquidsoap/generate_liquidsoap_cfg.py +++ b/playout/liquidsoap/generate_liquidsoap_cfg.py @@ -4,7 +4,7 @@ import sys import time import traceback -from api_clients.version1 import AirtimeApiClient +from libretime_api_client.version1 import AirtimeApiClient def generate_liquidsoap_config(ss): diff --git a/playout/liquidsoap/liquidsoap_auth.py b/playout/liquidsoap/liquidsoap_auth.py index fc17a6132..45c1b2cbe 100644 --- a/playout/liquidsoap/liquidsoap_auth.py +++ b/playout/liquidsoap/liquidsoap_auth.py @@ -1,6 +1,6 @@ import sys -from api_clients import version1 as api_client +from libretime_api_client import version1 as api_client api_clients = api_client.AirtimeApiClient() diff --git a/playout/pypo/listenerstat.py b/playout/pypo/listenerstat.py index fdff90caf..bc6a0bced 100644 --- a/playout/pypo/listenerstat.py +++ b/playout/pypo/listenerstat.py @@ -9,7 +9,7 @@ from datetime import datetime from threading import Thread import defusedxml.minidom -from api_clients import version1 as api_client +from libretime_api_client import version1 as api_client class ListenerStat(Thread): diff --git a/playout/pypo/main.py b/playout/pypo/main.py index 0be930758..c75adf282 100644 --- a/playout/pypo/main.py +++ b/playout/pypo/main.py @@ -15,7 +15,7 @@ import time from datetime import datetime from optparse import OptionParser -from api_clients.version1 import AirtimeApiClient as ApiClient +from libretime_api_client.version1 import AirtimeApiClient as ApiClient from configobj import ConfigObj try: diff --git a/playout/pypo/notify/main.py b/playout/pypo/notify/main.py index a6c363c10..502d86ec0 100644 --- a/playout/pypo/notify/main.py +++ b/playout/pypo/notify/main.py @@ -22,7 +22,7 @@ from optparse import OptionParser # custom imports # from util import * -from api_clients import version1 as api_client +from libretime_api_client import version1 as api_client # additional modules (should be checked) from configobj import ConfigObj diff --git a/playout/pypo/pypofetch.py b/playout/pypo/pypofetch.py index a57722a0b..85419b4ce 100644 --- a/playout/pypo/pypofetch.py +++ b/playout/pypo/pypofetch.py @@ -13,8 +13,8 @@ from queue import Empty from subprocess import PIPE, Popen from threading import Thread, Timer -from api_clients import version1 as v1_api_client -from api_clients import version2 as api_client +from libretime_api_client import version1 as v1_api_client +from libretime_api_client import version2 as api_client from . import pure from .timeout import ls_timeout diff --git a/playout/pypo/pypofile.py b/playout/pypo/pypofile.py index 29c9912d4..2d4453381 100644 --- a/playout/pypo/pypofile.py +++ b/playout/pypo/pypofile.py @@ -13,7 +13,7 @@ from queue import Empty from threading import Thread import requests -from api_clients import version2 as api_client +from libretime_api_client import version2 as api_client from requests.exceptions import ConnectionError, HTTPError, Timeout CONFIG_PATH = "/etc/airtime/airtime.conf" diff --git a/playout/pypo/pypopush.py b/playout/pypo/pypopush.py index 582fc1ca0..d1d3523fd 100644 --- a/playout/pypo/pypopush.py +++ b/playout/pypo/pypopush.py @@ -10,7 +10,7 @@ from datetime import datetime, timedelta from queue import Empty, Queue from threading import Thread -from api_clients import version1 as api_client +from libretime_api_client import version1 as api_client from configobj import ConfigObj from .pypofetch import PypoFetch diff --git a/playout/pypo/recorder.py b/playout/pypo/recorder.py index c785fef23..36e4ba7ea 100644 --- a/playout/pypo/recorder.py +++ b/playout/pypo/recorder.py @@ -13,8 +13,8 @@ from threading import Thread import mutagen import pytz -from api_clients import version1 as v1_api_client -from api_clients import version2 as api_client +from libretime_api_client import version1 as v1_api_client +from libretime_api_client import version2 as api_client from configobj import ConfigObj diff --git a/utils/airtime-import/airtime-import b/utils/airtime-import/airtime-import index c8773c18e..4309185b4 100755 --- a/utils/airtime-import/airtime-import +++ b/utils/airtime-import/airtime-import @@ -6,7 +6,7 @@ import shutil from optparse import OptionParser, OptionValueError import commands -from api_clients import api_client as apc +from libretime_api_client import api_client as apc from configobj import ConfigObj # sys.path.append('/usr/lib/airtime/media-monitor/mm2/') diff --git a/utils/airtime-silan b/utils/airtime-silan index fcd2f4e74..65d2607f8 100755 --- a/utils/airtime-silan +++ b/utils/airtime-silan @@ -7,7 +7,7 @@ import subprocess import sys import traceback -from api_clients import api_client as apc +from libretime_api_client import api_client as apc from configobj import ConfigObj # create logger