From 8fe0156d4f4e78fa9f41386568f62924299e632f Mon Sep 17 00:00:00 2001 From: jo Date: Sun, 17 Oct 2021 02:49:52 +0200 Subject: [PATCH] Update paths after api_client move --- .github/dependabot.yml | 2 +- .github/workflows/test.yml | 4 ++-- api_client/Makefile | 2 +- install | 2 +- python_apps/pypo/setup.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 95dbd76b9..1cb48fe37 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -46,7 +46,7 @@ updates: - dependencies - package-ecosystem: "pip" - directory: "/python_apps/api_clients" + directory: "/api_client" schedule: interval: "daily" labels: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 716e451d5..bd5d37a5f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -128,7 +128,7 @@ jobs: make -C api lint make -C analyzer lint make -C worker lint - make -C python_apps/api_clients lint + make -C api_client lint make -C python_apps/pypo lint test: @@ -136,7 +136,7 @@ jobs: strategy: fail-fast: false matrix: - context: [analyzer, python_apps/api_clients] + context: [analyzer, api_client] release: [bionic, buster] container: ghcr.io/libretime/libretime-dev:${{ matrix.release }} diff --git a/api_client/Makefile b/api_client/Makefile index 88108b8e1..9970aa22b 100644 --- a/api_client/Makefile +++ b/api_client/Makefile @@ -1,6 +1,6 @@ all: lint test -include ../../tools/python.mk +include ../tools/python.mk PIP_INSTALL := --editable . PYLINT_ARG := api_clients tests diff --git a/install b/install index 6fc0e2448..8fc4078e3 100755 --- a/install +++ b/install @@ -1019,7 +1019,7 @@ if [ ! -d /var/log/airtime ]; then fi verbose "\n * Installing API client..." -loudCmd "$pip_cmd install ${AIRTIMEROOT}/python_apps/api_clients" +loudCmd "$pip_cmd install ${AIRTIMEROOT}/api_client" verbose "...Done" verbose "\n * Installing pypo and liquidsoap..." diff --git a/python_apps/pypo/setup.py b/python_apps/pypo/setup.py index 6c4e0eced..aebc6de83 100644 --- a/python_apps/pypo/setup.py +++ b/python_apps/pypo/setup.py @@ -31,7 +31,7 @@ setup( ], python_requires=">=3.6", install_requires=[ - f"libretime-api-client @ file://localhost/{here.parent}/api_clients#egg=libretime-api-client", + f"libretime-api-client @ file://localhost/{here.parent}/api_client#egg=libretime-api-client", "amqplib", "configobj", "defusedxml",