From 0d88d17f7cbc42c2908a03c495f0371999f12954 Mon Sep 17 00:00:00 2001 From: jo Date: Fri, 10 Sep 2021 13:45:27 +0200 Subject: [PATCH] Use setup extra_requires for dev/prod dependencies Also add pylint by default. --- api/setup.py | 12 ++++++++++-- python_apps/airtime-celery/setup.py | 6 ++++++ python_apps/airtime_analyzer/requirements-dev.txt | 5 ----- python_apps/airtime_analyzer/setup.py | 10 ++++++++++ python_apps/api_clients/requirements-dev.txt | 4 ---- python_apps/api_clients/setup.py | 9 +++++++++ python_apps/pypo/setup.py | 6 ++++++ 7 files changed, 41 insertions(+), 11 deletions(-) delete mode 100644 python_apps/airtime_analyzer/requirements-dev.txt delete mode 100644 python_apps/api_clients/requirements-dev.txt diff --git a/api/setup.py b/api/setup.py index 724901cbe..f255a60e7 100644 --- a/api/setup.py +++ b/api/setup.py @@ -22,11 +22,19 @@ setup( scripts=["bin/libretime-api"], install_requires=[ "coreapi", - "Django~=3.0", + "django~=3.0", "djangorestframework", "django-url-filter", "markdown", "model_bakery", - "psycopg2", ], + extras_require={ + "prod": [ + "psycopg2", + ], + "dev": [ + "psycopg2-binary", + "pylint", + ], + }, ) diff --git a/python_apps/airtime-celery/setup.py b/python_apps/airtime-celery/setup.py index ac0e3ced4..c51705e96 100644 --- a/python_apps/airtime-celery/setup.py +++ b/python_apps/airtime-celery/setup.py @@ -23,5 +23,11 @@ setup( "kombu==4.6.10", "configobj", ], + extras_require={ + "prod": [], + "dev": [ + "pylint", + ], + }, zip_safe=False, ) diff --git a/python_apps/airtime_analyzer/requirements-dev.txt b/python_apps/airtime_analyzer/requirements-dev.txt deleted file mode 100644 index e8b5dfdfc..000000000 --- a/python_apps/airtime_analyzer/requirements-dev.txt +++ /dev/null @@ -1,5 +0,0 @@ -distro -pylint -pytest -pytest-cov -pytest-xdist diff --git a/python_apps/airtime_analyzer/setup.py b/python_apps/airtime_analyzer/setup.py index 01d899f7c..87bbe673a 100644 --- a/python_apps/airtime_analyzer/setup.py +++ b/python_apps/airtime_analyzer/setup.py @@ -33,5 +33,15 @@ setup( # If this version is changed, it needs changing in the install script too "pycairo==1.19.1", ], + extras_require={ + "prod": [], + "dev": [ + "distro", + "pylint", + "pytest", + "pytest-cov", + "pytest-xdist", + ], + }, zip_safe=False, ) diff --git a/python_apps/api_clients/requirements-dev.txt b/python_apps/api_clients/requirements-dev.txt deleted file mode 100644 index 2b9579643..000000000 --- a/python_apps/api_clients/requirements-dev.txt +++ /dev/null @@ -1,4 +0,0 @@ -pylint -pytest -pytest-cov -pytest-xdist diff --git a/python_apps/api_clients/setup.py b/python_apps/api_clients/setup.py index af6f5354f..480811043 100644 --- a/python_apps/api_clients/setup.py +++ b/python_apps/api_clients/setup.py @@ -23,5 +23,14 @@ setup( "python-dateutil>=2.7.0", "requests", ], + extras_require={ + "prod": [], + "dev": [ + "pylint", + "pytest", + "pytest-cov", + "pytest-xdist", + ], + }, zip_safe=False, ) diff --git a/python_apps/pypo/setup.py b/python_apps/pypo/setup.py index ddb3b1037..d34252dc5 100644 --- a/python_apps/pypo/setup.py +++ b/python_apps/pypo/setup.py @@ -37,5 +37,11 @@ setup( "pytz", "requests", ], + extras_require={ + "prod": [], + "dev": [ + "pylint", + ], + }, zip_safe=False, )