From 77f5c9951e2a573b6977d5892ca25b1b4e85dd71 Mon Sep 17 00:00:00 2001 From: Jonas L Date: Mon, 25 Jul 2022 21:19:41 +0200 Subject: [PATCH] chore: improve setuptools find_packages (#1985) --- analyzer/setup.py | 7 ++----- api-client/setup.py | 2 +- api/setup.py | 2 +- playout/setup.py | 2 +- shared/setup.py | 4 ++-- worker/setup.py | 4 ++-- 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/analyzer/setup.py b/analyzer/setup.py index c7ae46349..c4deba957 100644 --- a/analyzer/setup.py +++ b/analyzer/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,10 +19,7 @@ setup( "Source Code": "https://github.com/libretime/libretime", }, license="AGPLv3", - packages=[ - "libretime_analyzer", - "libretime_analyzer.pipeline", - ], + packages=find_packages(exclude=["*tests*", "*fixtures*"]), entry_points={ "console_scripts": [ "libretime-analyzer=libretime_analyzer.main:cli", diff --git a/api-client/setup.py b/api-client/setup.py index 161f75f15..4133f3646 100644 --- a/api-client/setup.py +++ b/api-client/setup.py @@ -19,7 +19,7 @@ setup( "Source Code": "https://github.com/libretime/libretime", }, license="AGPLv3", - packages=find_packages(), + packages=find_packages(exclude=["*tests*", "*fixtures*"]), python_requires=">=3.6", install_requires=[ "python-dateutil>=2.8.1,<2.9", diff --git a/api/setup.py b/api/setup.py index 1913fb706..70f54b841 100644 --- a/api/setup.py +++ b/api/setup.py @@ -20,7 +20,7 @@ setup( "Source Code": "https://github.com/libretime/libretime", }, license="AGPLv3", - packages=find_packages(), + packages=find_packages(exclude=["*tests*", "*fixtures*"]), package_data={ "libretime_api": ["legacy/migrations/sql/*.sql"], }, diff --git a/playout/setup.py b/playout/setup.py index 7b6efeb03..d27aac764 100644 --- a/playout/setup.py +++ b/playout/setup.py @@ -19,7 +19,7 @@ setup( "Source Code": "https://github.com/libretime/libretime", }, license="AGPLv3", - packages=find_packages(), + packages=find_packages(exclude=["*tests*", "*fixtures*"]), package_data={"": ["**/*.liq", "*.types"]}, entry_points={ "console_scripts": [ diff --git a/shared/setup.py b/shared/setup.py index 00bb8b45a..d6dc1051d 100644 --- a/shared/setup.py +++ b/shared/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() @@ -14,7 +14,7 @@ setup( url="http://github.com/libretime/libretime", author="LibreTime Contributors", license="AGPLv3", - packages=["libretime_shared"], + packages=find_packages(exclude=["*tests*", "*fixtures*"]), package_data={"": ["py.typed"]}, install_requires=[ "click~=8.0.4", diff --git a/worker/setup.py b/worker/setup.py index fafec6fb1..0852b1be4 100644 --- a/worker/setup.py +++ b/worker/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,7 +19,7 @@ setup( "Source Code": "https://github.com/libretime/libretime", }, license="MIT", - packages=["libretime_worker"], + packages=find_packages(exclude=["*tests*", "*fixtures*"]), python_requires=">=3.6", install_requires=[ "celery==4.4.7",