Skip to content

Commit c9a23c4

Browse files
author
SzabolcsGergely
committed
Merge remote-tracking branch 'origin/develop' into HEAD
2 parents 31b0fab + 572492e commit c9a23c4

25 files changed

+162
-184
lines changed

.github/workflows/main.yml

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ jobs:
7575
- name: Setup cmake
7676
if: matrix.os == 'macos-latest'
7777
uses: jwlawson/[email protected]
78+
with:
79+
cmake-version: '3.29.x'
7880
- name: Cache .hunter folder
7981
if: matrix.os != 'windows-latest'
8082
uses: actions/cache@v3
@@ -136,6 +138,10 @@ jobs:
136138
matrix:
137139
rpi-os: [rpi-buster, rpi-bullseye, rpi-bookworm]
138140
runs-on: ${{ matrix.rpi-os }}
141+
env:
142+
# workaround required for cache@v3, https://github.com/actions/cache/issues/1428
143+
# to be removed when upgrading the manylinux image
144+
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
139145
steps:
140146
- name: Print home directory
141147
run: echo Home directory inside container $HOME
@@ -182,7 +188,7 @@ jobs:
182188
runs-on: windows-latest
183189
strategy:
184190
matrix:
185-
python-version: [3.6, 3.7, 3.8, 3.9, '3.10', '3.11', '3.12']
191+
python-version: [3.7, 3.8, 3.9, '3.10', '3.11', '3.12']
186192
python-architecture: [x64, x86]
187193
fail-fast: false
188194
steps:
@@ -298,8 +304,12 @@ jobs:
298304
build-linux-x86_64:
299305
needs: build-docstrings
300306
runs-on: ubuntu-latest
307+
env:
308+
# workaround required for cache@v3, https://github.com/actions/cache/issues/1428
309+
# to be removed when upgrading the manylinux image
310+
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
301311
container:
302-
image: quay.io/pypa/manylinux2014_x86_64:2024-01-08-eb135ed
312+
image: quay.io/pypa/manylinux2014_x86_64:latest
303313
env:
304314
PLAT: manylinux2014_x86_64
305315
steps:
@@ -342,7 +352,7 @@ jobs:
342352
/opt/python/cp38-cp38/bin/python3.8 setup.py sdist --formats=gztar
343353
mv dist/* wheelhouse/audited/
344354
- name: Build wheels
345-
run: for PYBIN in /opt/python/cp3{6..12}*/bin; do "${PYBIN}/pip" wheel . -w ./wheelhouse/ --verbose; done
355+
run: for PYBIN in /opt/python/cp3{7..12}*/bin; do "${PYBIN}/pip" wheel . -w ./wheelhouse/ --verbose; done
346356
- name: Audit wheels
347357
run: for whl in wheelhouse/*.whl; do auditwheel repair "$whl" --plat $PLAT -w wheelhouse/audited/; done
348358
- name: Archive wheel artifacts
@@ -362,8 +372,12 @@ jobs:
362372
build-linux-arm64:
363373
needs: build-docstrings
364374
runs-on: [self-hosted, linux, ARM64]
375+
env:
376+
# workaround required for cache@v3, https://github.com/actions/cache/issues/1428
377+
# to be removed when upgrading the manylinux image
378+
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
365379
container:
366-
image: quay.io/pypa/manylinux2014_aarch64:2024-01-08-eb135ed
380+
image: quay.io/pypa/manylinux2014_aarch64:latest
367381
env:
368382
PLAT: manylinux2014_aarch64
369383
# Mount local hunter cache directory, instead of transfering to Github and back
@@ -399,7 +413,7 @@ jobs:
399413
if: startsWith(github.ref, 'refs/tags/v') != true
400414
run: echo "BUILD_COMMIT_HASH=${{github.sha}}" >> $GITHUB_ENV
401415
- name: Building wheels
402-
run: for PYBIN in /opt/python/cp3{6..12}*/bin; do "${PYBIN}/pip" wheel . -w ./wheelhouse/ --verbose; done
416+
run: for PYBIN in /opt/python/cp3{7..12}*/bin; do "${PYBIN}/pip" wheel . -w ./wheelhouse/ --verbose; done
403417
- name: Auditing wheels
404418
run: for whl in wheelhouse/*.whl; do auditwheel repair "$whl" --plat $PLAT -w wheelhouse/audited/; done
405419
- name: Archive wheel artifacts

.github/workflows/test-install-dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
test_macos:
4949
strategy:
5050
matrix:
51-
os: ["macos-11", "macos-12", "macos-13", "macos-14"]
51+
os: ["macos-12", "macos-13", "macos-14"]
5252
runs-on: ${{ matrix.os }}
5353
steps:
5454
- uses: actions/checkout@v3

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generated/Hunter/config.cmake ${final_hun
2323

2424
include("cmake/HunterGate.cmake")
2525
HunterGate(
26-
URL "https://github.com/cpp-pm/hunter/archive/v0.25.5.tar.gz"
27-
SHA1 "a20151e4c0740ee7d0f9994476856d813cdead29"
26+
URL "https://github.com/cpp-pm/hunter/archive/9d9242b60d5236269f894efd3ddd60a9ca83dd7f.tar.gz"
27+
SHA1 "16cc954aa723bccd16ea45fc91a858d0c5246376"
2828
FILEPATH ${CMAKE_CURRENT_BINARY_DIR}/generated/Hunter/config.cmake # Combined config
2929
)
3030

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://opensource.org/licenses/MIT)
44
[![](https://img.shields.io/pypi/v/depthai.svg)](https://pypi.org/project/depthai/)
5-
[![Python Wheel CI](https://github.com/luxonis/depthai-python/actions/workflows/main.yml/badge.svg?branch=gen2_develop)](https://github.com/luxonis/depthai-python/actions/workflows/main.yml)
5+
[![Python Wheel CI](https://github.com/luxonis/depthai-python/actions/workflows/main.yml/badge.svg?branch=main)](https://github.com/luxonis/depthai-python/actions/workflows/main.yml)
66

77
Python bindings for C++ depthai-core library
88

cmake/Hunter/config.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Pybind11 2.9.2
1+
# Pybind11 2.12.0
22
hunter_config(
33
pybind11
4-
VERSION "2.9.2"
5-
URL "https://github.com/pybind/pybind11/archive/refs/tags/v2.9.2.tar.gz"
6-
SHA1 "5e05583a210282c3251281b6ee5677915f0cbf95"
4+
VERSION "2.12.0"
5+
URL "https://github.com/pybind/pybind11/archive/refs/tags/v2.12.0.tar.gz"
6+
SHA1 "e70610cba7b6b7d7a57827d5357c016ad2155c0f"
77
)

examples/ImageAlign/depth_align.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def getFps(self):
6868

6969
out.setStreamName("out")
7070

71-
sync.setSyncThreshold(timedelta(seconds=(1 / FPS) * 0.5))
71+
sync.setSyncThreshold(timedelta(seconds=0.5 / FPS))
7272

7373
# Linking
7474
camRgb.isp.link(sync.inputs["rgb"])

0 commit comments

Comments
 (0)