From e835fff96a3b0f3c7cb5ab0088ae36e94c1f30fc Mon Sep 17 00:00:00 2001
From: Maxime Desroches <desroches.maxime@gmail.com>
Date: Thu, 11 Jul 2024 16:53:57 -0700
Subject: [PATCH] packages

---
 Dockerfile | 5 ++---
 setup.py   | 6 +++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 77ef04c29..c93156d6b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,8 +35,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     zlib1g-dev \
   && rm -rf /var/lib/apt/lists/*
 
-RUN pip3 install --break-system-packages --no-cache-dir pyyaml Cython scons pycapnp pre-commit ruff parameterized coverage numpy pytest
-
 WORKDIR /project/msgq/
 RUN cd /tmp/ && \
     git clone -b v2.x --depth 1 https://github.com/catchorg/Catch2.git && \
@@ -51,4 +49,5 @@ ENV PYTHONPATH=/project
 
 COPY . .
 RUN ls && rm -rf .git && \
-    scons -c && scons -j$(nproc)
+    SCONS_EXTRAS=1 pip3 install --break-system-packages --no-cache-dir .[dev]
+
diff --git a/setup.py b/setup.py
index 9d3d88488..4dfcee787 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,7 @@
 from setuptools import Command, setup
 from setuptools.command.build import build
 import subprocess
+import os
 
 class SconsBuild(Command):
   def initialize_options(self) -> None:
@@ -10,12 +11,15 @@ def finalize_options(self) -> None:
     pass
 
   def run(self) -> None:
-    subprocess.run(["scons --minimal -j$(nproc)"], shell=True)
+    scons_flags = '--minimal' if 'SCONS_EXTRAS' not in  os.environ else ''
+    subprocess.run([f"scons {scons_flags} -j$(nproc)"], shell=True).check_returncode()
 
 class CustomBuild(build):
   sub_commands = [('scons_build', None)] + build.sub_commands
 
 setup(
+    packages = ["msgq", "msgq.visionipc"],
     package_data={'msgq': ['**/*.cc', '**/*.h', '**/*.pxd', '**/*.pyx', '**/*.so']},
+    include_package_data=True,
     cmdclass={'build': CustomBuild, 'scons_build': SconsBuild}
     )