Skip to content

Commit 8e1c96f

Browse files
authored
Merge pull request #1045 from luxonis/release_2.27.0.0
Release 2.27.0.0
2 parents 6f4c5f4 + ed399c3 commit 8e1c96f

File tree

12 files changed

+53
-276
lines changed

12 files changed

+53
-276
lines changed

.github/workflows/main.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ jobs:
154154
if: startsWith(github.ref, 'refs/tags/v') != true
155155
run: echo "BUILD_COMMIT_HASH=${{github.sha}}" >> $GITHUB_ENV
156156
- name: Building wheel
157-
run: python3 -m pip wheel . -w ./wheelhouse/ --verbose
157+
run: CMAKE_ARGS='-DDEPTHAI_ENABLE_CURL=OFF' python3 -m pip wheel . -w ./wheelhouse/ --verbose
158158
- name: Auditing wheels and adding armv6l tag (Running on RPi, binaries compiled as armv6l)
159159
run: |
160160
# python3 -m pip install -U wheel auditwheel # Called once when setting up the runner
@@ -182,7 +182,7 @@ jobs:
182182
runs-on: windows-latest
183183
strategy:
184184
matrix:
185-
python-version: [3.6, 3.7, 3.8, 3.9, '3.10', '3.11', '3.12']
185+
python-version: [3.7, 3.8, 3.9, '3.10', '3.11', '3.12']
186186
python-architecture: [x64, x86]
187187
fail-fast: false
188188
steps:
@@ -205,6 +205,8 @@ jobs:
205205
- name: Select Windows SDK
206206
run: echo "CMAKE_ARGS=-DCMAKE_SYSTEM_VERSION=${{ env.CMAKE_WINDOWS_SDK_VERSION }}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
207207

208+
- name: Install dependencies
209+
run: choco install strawberryperl
208210
- name: Set up Python ${{ matrix.python-version }}
209211
uses: actions/setup-python@v4
210212
with:
@@ -234,11 +236,11 @@ jobs:
234236
# This job builds wheels for macOS x86_64 arch
235237
build-macos:
236238
needs: build-docstrings
237-
runs-on: macos-latest
238239
strategy:
239240
matrix:
240241
python-version: [3.8, 3.9, '3.10', '3.11', '3.12']
241242
os: [macos-13, macos-14] # macos-13 is x64, macos-14 is arm64
243+
runs-on: ${{ matrix.os }}
242244
steps:
243245
- name: Cache .hunter folder
244246
uses: actions/cache@v3
@@ -310,7 +312,7 @@ jobs:
310312
with:
311313
submodules: 'recursive'
312314
- name: Installing libusb1-devel dependency
313-
run: yum install -y --disableplugin=fastestmirror libusb1-devel
315+
run: yum install -y --disableplugin=fastestmirror libusb1-devel perl-core
314316
- name: Installing cmake dependency
315317
run: |
316318
/opt/python/cp38-cp38/bin/python3.8 -m pip install cmake
@@ -340,7 +342,7 @@ jobs:
340342
/opt/python/cp38-cp38/bin/python3.8 setup.py sdist --formats=gztar
341343
mv dist/* wheelhouse/audited/
342344
- name: Build wheels
343-
run: for PYBIN in /opt/python/cp3{6..12}*/bin; do "${PYBIN}/pip" wheel . -w ./wheelhouse/ --verbose; done
345+
run: for PYBIN in /opt/python/cp3{7..12}*/bin; do "${PYBIN}/pip" wheel . -w ./wheelhouse/ --verbose; done
344346
- name: Audit wheels
345347
run: for whl in wheelhouse/*.whl; do auditwheel repair "$whl" --plat $PLAT -w wheelhouse/audited/; done
346348
- name: Archive wheel artifacts
@@ -372,7 +374,7 @@ jobs:
372374
with:
373375
submodules: 'recursive'
374376
- name: Installing libusb1-devel dependency
375-
run: yum install -y --disableplugin=fastestmirror libusb1-devel
377+
run: yum install -y --disableplugin=fastestmirror libusb1-devel perl-core
376378
- name: Installing cmake dependency
377379
run: |
378380
/opt/python/cp38-cp38/bin/python3.8 -m pip install cmake
@@ -397,7 +399,7 @@ jobs:
397399
if: startsWith(github.ref, 'refs/tags/v') != true
398400
run: echo "BUILD_COMMIT_HASH=${{github.sha}}" >> $GITHUB_ENV
399401
- name: Building wheels
400-
run: for PYBIN in /opt/python/cp3{6..12}*/bin; do "${PYBIN}/pip" wheel . -w ./wheelhouse/ --verbose; done
402+
run: for PYBIN in /opt/python/cp3{7..12}*/bin; do "${PYBIN}/pip" wheel . -w ./wheelhouse/ --verbose; done
401403
- name: Auditing wheels
402404
run: for whl in wheelhouse/*.whl; do auditwheel repair "$whl" --plat $PLAT -w wheelhouse/audited/; done
403405
- name: Archive wheel artifacts

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.23.322.tar.gz"
27-
SHA1 "cb0ea1f74f4a2c49a807de34885743495fccccbe"
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

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/install_requirements.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def hasWhitespace(string):
5555
requireOpenCv = True
5656

5757
if requireOpenCv:
58-
DEPENDENCIES.append('numpy<2.0')
58+
DEPENDENCIES.append('numpy<3.0')
5959
# 4.5.4.58 package is broken for python 3.9
6060
if sys.version_info[0] == 3 and sys.version_info[1] == 9:
6161
DEPENDENCIES.append('opencv-python!=4.5.4.58')

examples/mixed/frame_sync.py

Lines changed: 0 additions & 113 deletions
This file was deleted.

setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ def build_extension(self, ext):
238238
"Operating System :: Unix",
239239
"Programming Language :: Python",
240240
"Programming Language :: Python :: 3",
241-
"Programming Language :: Python :: 3.6",
242241
"Programming Language :: Python :: 3.7",
243242
"Programming Language :: Python :: 3.8",
244243
"Programming Language :: Python :: 3.9",
@@ -250,7 +249,7 @@ def build_extension(self, ext):
250249
"Topic :: Scientific/Engineering",
251250
"Topic :: Software Development",
252251
],
253-
python_requires='>=3.6',
252+
python_requires='>=3.7',
254253
entry_points={
255254
"console_scripts": [
256255
f'depthai={DEPTHAI_CLI_MODULE_NAME}.depthai_cli:cli'

0 commit comments

Comments
 (0)