Working on installer

setup.py

@@ -1,16 +1,34 @@
 #!/usr/bin/env python3
 from pathlib import Path
+from typing import List
 
 import setuptools
 from setuptools import setup
 
 this_dir = Path(__file__).parent
 
-requirements = []
-requirements_path = this_dir / "requirements.txt"
-if requirements_path.is_file():
-    with open(requirements_path, "r", encoding="utf-8") as requirements_file:
-        requirements = requirements_file.read().splitlines()
+
+def get_requirements(req_path: Path) -> List[str]:
+    if not req_path.is_file():
+        return []
+
+    requirements: List[str] = []
+    with open(req_path, "r", encoding="utf-8") as req_file:
+        for line in req_file:
+            line = line.strip()
+            if not line:
+                continue
+
+            requirements.append(line)
+
+    return requirements
+
+
+install_requires = get_requirements(this_dir / "requirements.txt")
+extras_require = {
+    "silerovad": get_requirements(this_dir / "requirements_vad.txt"),
+    "webrtc": get_requirements(this_dir / "requirements_audio_enhancement.txt"),
+}
 
 
 # -----------------------------------------------------------------------------
@@ -23,7 +41,7 @@ setup(
     author="Michael Hansen",
     author_email="mike@rhasspy.org",
     packages=setuptools.find_packages(),
-    install_requires=requirements,
+    install_requires=install_requires,
     classifiers=[
         "Development Status :: 3 - Alpha",
         "Intended Audience :: Developers",
@@ -35,10 +53,7 @@ setup(
         "Programming Language :: Python :: 3.11",
     ],
     keywords="rhasspy wyoming satellite",
-    extras_require={
-        "silerovad": ["pysilero-vad==1.0.0"],
-        "webrtc": ["webrtc-noise-gain==1.2.3"],
-    },
+    extras_require=extras_require,
     entry_points={
         "console_scripts": ["wyoming-satellite = wyoming_satellite:__main__.run"]
     },