Merge pull request #1342 from jooola/feat/ci_start_linting_again

Follow up #1339

api/Makefile

@@ -6,5 +6,6 @@ PIP_INSTALL := --editable .[dev]
 PYLINT_ARG := libretimeapi
 MYPY_ARG := libretimeapi
 
+format: .format
 lint: .pylint .mypy
 clean: .clean

api/setup.py

@@ -35,8 +35,6 @@ setup(
         ],
         "dev": [
             "psycopg2-binary",
-            "mypy",
-            "pylint",
         ],
     },
 )

install

@@ -1023,11 +1023,11 @@ if [ ! -d /var/log/airtime ]; then
 fi
 
 verbose "\n * Installing API client..."
-loudCmd "$python_bin ${AIRTIMEROOT}/python_apps/api_clients/setup.py install --install-scripts=/usr/bin"
+loudCmd "$python_bin" -m pip install "${AIRTIMEROOT}/python_apps/api_clients"
 verbose "...Done"
 
 verbose "\n * Installing pypo and liquidsoap..."
-loudCmd "$python_bin ${AIRTIMEROOT}/python_apps/pypo/setup.py install --install-scripts=/usr/bin"
+loudCmd "$python_bin" -m pip install "${AIRTIMEROOT}/python_apps/pypo" --install-option="--install-scripts=/usr/bin"
 loudCmd "mkdir -p /var/log/airtime/{pypo,pypo-liquidsoap} /var/tmp/airtime/pypo/{cache,files,tmp} /var/tmp/airtime/show-recorder/"
 loudCmd "chown -R ${web_user}:${web_user} /var/log/airtime/{pypo,pypo-liquidsoap} /var/tmp/airtime/pypo/{cache,files,tmp} /var/tmp/airtime/show-recorder/"
 systemInitInstall libretime-liquidsoap "$web_user"
@@ -1035,7 +1035,7 @@ systemInitInstall libretime-playout "$web_user"
 verbose "...Done"
 
 verbose "\n * Installing airtime-celery..."
-loudCmd "$python_bin ${AIRTIMEROOT}/python_apps/airtime-celery/setup.py install"
+loudCmd "$python_bin" -m pip install "${AIRTIMEROOT}/python_apps/airtime-celery"
 # Create the Celery user
 if $is_centos_dist; then
   loudCmd "id celery 2>/dev/null || adduser --no-create-home -c 'LibreTime Celery' -r celery || true"
@@ -1051,12 +1051,12 @@ systemInitInstall libretime-celery
 verbose "...Done"
 
 verbose "\n * Installing libretime-analyzer..."
-loudCmd "$python_bin ${AIRTIMEROOT}/python_apps/airtime_analyzer/setup.py install --install-scripts=/usr/bin"
+loudCmd "$python_bin" -m pip install "${AIRTIMEROOT}/python_apps/airtime_analyzer" --install-option="--install-scripts=/usr/bin"
 systemInitInstall libretime-analyzer "$web_user"
 verbose "...Done"
 
 verbose "\n * Installing API..."
-loudCmd "python3 ${AIRTIMEROOT}/api/setup.py install --install-scripts=/usr/bin"
+loudCmd "$python_bin" -m pip install "${AIRTIMEROOT}/api[prod]"
 systemInitInstall libretime-api "$web_user"
 mkdir -p /etc/airtime
 sed -e "s@WEB_USER@${web_user}@g" \

python_apps/airtime-celery/Makefile

@@ -2,9 +2,10 @@ all: lint
 
 include ../../tools/python.mk
 
-PIP_INSTALL := --editable .[dev]
+PIP_INSTALL := --editable .
 PYLINT_ARG := airtime-celery
 MYPY_ARG := airtime-celery
 
+format: .format
 lint: .pylint .mypy
 clean: .clean

python_apps/airtime-celery/setup.py

@@ -24,12 +24,5 @@ setup(
         "kombu==4.6.10",
         "configobj",
     ],
-    extras_require={
-        "prod": [],
-        "dev": [
-            "mypy",
-            "pylint",
-        ],
-    },
     zip_safe=False,
 )

python_apps/airtime_analyzer/Makefile

@@ -7,6 +7,7 @@ PYLINT_ARG := airtime_analyzer tests
 MYPY_ARG := airtime_analyzer tests
 PYTEST_ARG := --cov=airtime_analyzer tests
 
+format: .format
 lint: .pylint .mypy
 
 fixtures:

python_apps/airtime_analyzer/setup.py

@@ -35,14 +35,8 @@ setup(
         "pycairo==1.19.1",
     ],
     extras_require={
-        "prod": [],
         "dev": [
             "distro",
-            "mypy",
-            "pylint",
-            "pytest",
-            "pytest-cov",
-            "pytest-xdist",
         ],
     },
     zip_safe=False,

python_apps/api_clients/Makefile

@@ -2,11 +2,12 @@ all: lint test
 
 include ../../tools/python.mk
 
-PIP_INSTALL := --editable .[dev]
+PIP_INSTALL := --editable .
 PYLINT_ARG := api_clients tests
 MYPY_ARG := api_clients tests
 PYTEST_ARG := --cov=api_clients tests
 
+format: .format
 lint: .pylint .mypy
 test: .pytest
 clean: .clean

python_apps/api_clients/setup.py

@@ -24,15 +24,5 @@ setup(
         "python-dateutil>=2.7.0",
         "requests",
     ],
-    extras_require={
-        "prod": [],
-        "dev": [
-            "mypy",
-            "pylint",
-            "pytest",
-            "pytest-cov",
-            "pytest-xdist",
-        ],
-    },
     zip_safe=False,
 )

python_apps/pypo/Makefile

@@ -2,9 +2,10 @@ all: lint
 
 include ../../tools/python.mk
 
-PIP_INSTALL := --editable .[dev]
+PIP_INSTALL := --editable .
 PYLINT_ARG := liquidsoap pypo
 MYPY_ARG := liquidsoap pypo
 
+format: .format
 lint: .pylint .mypy
 clean: .clean

python_apps/pypo/setup.py

@@ -38,12 +38,5 @@ setup(
         "pytz",
         "requests",
     ],
-    extras_require={
-        "prod": [],
-        "dev": [
-            "mypy",
-            "pylint",
-        ],
-    },
     zip_safe=False,
 )

tools/Makefile

@@ -2,11 +2,12 @@ all: lint test
 
 include python.mk
 
-PIP_INSTALL := -r requirements-dev.txt
+PIP_INSTALL =
-PYLINT_ARG := tools
+PYLINT_ARG = tools
-MYPY_ARG := .
+MYPY_ARG = .
-PYTEST_ARG := .
+PYTEST_ARG = .
 
+format: .format
 lint: .pylint .mypy
 test: .pytest
 clean: .clean

tools/python.mk

@@ -1,19 +1,34 @@
 .ONESHELL:
 
-SHELL := bash
+SHELL = bash
-CPU_CORES := $(shell nproc)
+CPU_CORES = $(shell nproc)
 
-# PIP_INSTALL := --editable .[dev]
+# PIP_INSTALL = --editable .
-# PYLINT_ARG :=
+# PYLINT_ARG =
-# MYPY_ARG :=
+# MYPY_ARG =
-# PYTEST_ARG :=
+# PYTEST_ARG =
 
-VENV := venv
+SHARED_DEV_REQUIREMENTS = \
+	black \
+	isort \
+	mypy \
+	pylint \
+	pytest \
+	pytest-cov \
+	pytest-xdist
+
+VENV = venv
 $(VENV):
 	python3 -m venv $(VENV)
 	source $(VENV)/bin/activate
 	pip install --upgrade pip setuptools wheel
-	pip install $(PIP_INSTALL)
+	pip install $(SHARED_DEV_REQUIREMENTS) $(PIP_INSTALL)
+
+.PHONY: .format
+.format: $(VENV)
+	source $(VENV)/bin/activate
+	black .
+	isort --profile black .
 
 .PHONY: .pylint
 .pylint: $(VENV)

tools/requirements-dev.txt

@@ -1,4 +0,0 @@
-mypy
-pylint
-pytest
-pytest-xdist