Skip to content

Commit 1f0ddb9

Browse files
authored
Merge branch 'main' into ITEP-89518-tracker_supports_NTP_time_correction
2 parents 66e24f8 + fb33388 commit 1f0ddb9

14 files changed

Lines changed: 71 additions & 71 deletions

File tree

.github/dependabot.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ updates:
9595
- "/cluster_analytics"
9696
- "/mapping"
9797
- "/mapping/tests"
98+
- "/tests/pipeline_runner"
99+
- "/tools/pipeline_runner"
98100
- "/tracker/test/service"
99101
- "/tracker/test/load"
100102
schedule:
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# SPDX-FileCopyrightText: (C) 2025 Intel Corporation
1+
# SPDX-FileCopyrightText: (C) 2025 - 2026 Intel Corporation
22
# SPDX-License-Identifier: Apache-2.0
33
# This file is licensed under Apache 2.0 License.
44

5-
coverage
6-
pytest
5+
coverage==7.13.5
6+
pytest==9.0.3

controller/src/robot_vision/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
# This file is licensed under Apache 2.0 License.
44

55
numpy==2.2.6
6-
networkx
7-
scipy
6+
networkx==3.6.1
7+
scipy==1.17.1

manager/Makefile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-FileCopyrightText: (C) 2021 - 2025 Intel Corporation
1+
# SPDX-FileCopyrightText: (C) 2021 - 2026 Intel Corporation
22
# SPDX-License-Identifier: Apache-2.0
33

44
IMAGE = scenescape-manager
@@ -218,10 +218,8 @@ test/geckodriver.tar.gz:
218218
@echo "Downloading geckodriver..."
219219
@set -e \
220220
; BASE_URL=https://github.com/mozilla/geckodriver/releases \
221-
; GVERSION=$$(curl -sL -o /dev/null -w '%{url_effective}' \
222-
"$${BASE_URL}/latest" \
223-
| sed -e 's,.*/,,') \
221+
; GVERSION=v0.36.0 \
224222
; mkdir -p test \
225-
; curl -sL \
223+
; curl -fSL \
226224
"$${BASE_URL}/download/$${GVERSION}/geckodriver-$${GVERSION}-linux64.tar.gz" \
227225
--output "test/geckodriver.tar.gz"

manager/requirements-runtime.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# SPDX-FileCopyrightText: (C) 2025 Intel Corporation
1+
# SPDX-FileCopyrightText: (C) 2025 - 2026 Intel Corporation
22
# SPDX-License-Identifier: Apache-2.0
33
# This file is licensed under Apache 2.0 License.
44

55
# Keep package list in alphabetical order
6-
aiofiles
6+
aiofiles==25.1.0
77
Django==5.2.13
88
django-axes==8.0.0
99
django-debug-toolbar==6.0.0

manager/test/requirements-test.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
# SPDX-FileCopyrightText: (C) 2025 Intel Corporation
1+
# SPDX-FileCopyrightText: (C) 2025 - 2026 Intel Corporation
22
# SPDX-License-Identifier: Apache-2.0
33
# This file is licensed under Apache 2.0 License.
44

55
# Keep package list in alphabetical order
6-
coverage
7-
django-debug-toolbar
8-
pytest
9-
pytest-django
10-
pytest-html
11-
pytest-metadata
12-
pyvirtualdisplay
13-
pupil-apriltags
14-
scikit-image
15-
selenium
6+
coverage==7.13.5
7+
django-debug-toolbar==6.3.0
8+
pupil-apriltags==1.0.4.post11
9+
pytest==9.0.3
10+
pytest-django==4.12.0
11+
pytest-html==4.2.0
12+
pytest-metadata==3.1.1
13+
pyvirtualdisplay==3.0
14+
scikit-image==0.26.0
15+
selenium==4.43.0

mapping/requirements_api.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
# Service specific dependencies only
55
# (Model dependencies are handled by individual model requirements.txt)
6-
flask>=3.1.3,<3.2.0
6+
flask==3.1.3
77
flask-cors==6.0.0
88
gradio==6.7.0
99
open3d-cpu[headless]==0.19.0
10-
opencv-python-headless>=4.8.0
10+
opencv-python-headless==4.13.0.92
1111
requests==2.33.0
1212
gunicorn==22.0.0
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
# SPDX-FileCopyrightText: (C) 2025 Intel Corporation
1+
# SPDX-FileCopyrightText: (C) 2025 - 2026 Intel Corporation
22
# SPDX-License-Identifier: Apache-2.0
33

44
# Test Dependencies for Mapping Module
55
# Install these inside the container to run tests:
66
# pip install -r requirements-test.txt
77

88
# Core testing framework
9-
pytest>=7.4.0,<10.0.0
10-
pytest-cov>=4.1.0,<5.0.0
11-
pytest-mock>=3.11.1,<4.0.0
12-
trimesh>=4.0.0
9+
pytest==9.0.3
10+
pytest-cov==4.1.0
11+
pytest-mock==3.11.1
12+
trimesh==4.11.5
1313

1414
# Additional testing utilities
15-
pytest-xdist>=3.3.1,<4.0.0 # For parallel test execution
16-
pytest-timeout>=2.1.0,<3.0.0 # For test timeouts
15+
pytest-xdist==3.3.1 # For parallel test execution
16+
pytest-timeout==2.1.0 # For test timeouts
1717

1818
# Required for mocking
19-
responses>=0.23.1,<0.24.0
19+
responses==0.23.1

tests/pipeline_runner/requirements-ppl-test.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
# Dependencies for test_people_models.py and test_vehicle_models.py – pipeline integration tests
5-
pytest>=7.4.0
6-
python-on-whales>=0.73.0
7-
jsonschema>=4.20.0
8-
fastjsonschema
5+
pytest==9.0.3
6+
python-on-whales==0.81.0
7+
jsonschema==4.25.1
8+
fastjsonschema==2.21.2
99
paho-mqtt==2.1.0
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: Apache-2.0
22
# Copyright (C) 2026 Intel Corporation
3-
python-on-whales>=0.73.0
4-
jsonschema>=4.20.0
5-
fastjsonschema
6-
paho-mqtt==2.1.0
3+
python-on-whales==0.81.0
4+
jsonschema==4.25.1
5+
fastjsonschema==2.21.2
6+
paho-mqtt==2.1.0

0 commit comments

Comments
 (0)