Fix docker build and runtime error (#71)

Scantools / Docker version works again. Verified through local ci. --------- Co-authored-by: Lukas Gruber <[email protected]> Co-authored-by: Pablo Speciale <[email protected]>
microsoft · Jun 21, 2024 · 4a3b2d8 · 4a3b2d8
1 parent f4d83cb
commit 4a3b2d8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -80,7 +80,10 @@ RUN python3 -m pip install --no-deps \
         pytijo==0.0.2 \
         pyzbar-upright==0.1.8 \
         rawpy==0.19.1 \
-        scipy==1.11.4
+        scipy==1.11.4 \
+        numpy==1.26.4 \
+        pillow==10.3.0 
+
 RUN cd lamar && python3 -m pip install -e .[scantools] --no-deps
 WORKDIR /lamar
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -34,6 +34,8 @@ scantools = [
     "pyzbar-upright==0.1.8",
     "rawpy==0.19.1",
     "scipy==1.11.4",
+    "numpy==1.26.4",
+    "pillow==10.3.0",
 ]
 dev = [
     "pytest",

diff --git a/scantools/scanners/navvis/iwconfig_parser.py b/scantools/scanners/navvis/iwconfig_parser.py
@@ -1,7 +1,6 @@
 import collections
 
 from pytijo import parser
-import re
 
 IWConfigData = collections.namedtuple('IWConfigData',
                                       ['mac_address',
@@ -80,7 +79,8 @@ def parse_iwconfig(data):
         assert -127 <= float(wifi_sample['signal_level']) <= 127
         assert wifi_sample['frequency'] is not None
         assert wifi_sample['time_offset'] is not None
-        assert wifi_sample['ssid'] is not None
+        if wifi_sample['ssid'] is None:
+            continue
 
         wifi_sample = IWConfigData(
             wifi_sample['mac_address'],

diff --git a/scantools/scanners/navvis/navvis.py b/scantools/scanners/navvis/navvis.py
@@ -678,7 +678,8 @@ def read_wifi(self):
                                                        sample.mac_address,
                                                        sample.signal_strength_dbm,
                                                        sample.frequency_khz,
-                                                       sample.time_offset_ms)
+                                                       sample.time_offset_ms,
+                                                       sample.ssid)
 
                     wifi_measurements.append(wifi_measurement)