Skip to content

Commit 601ef2f

Browse files
committed
Merge 'origin/develop' into gen2_uvc
2 parents e88af9a + 26c1b3b commit 601ef2f

File tree

150 files changed

+3605
-822
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+3605
-822
lines changed

.github/workflows/main.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ jobs:
4949
run: |
5050
python -m pip install --upgrade pip
5151
sudo apt install libusb-1.0-0-dev
52+
python -m pip install clang==14.0 --force-reinstall
5253
python -m pip install -r docs/requirements_mkdoc.txt
5354
- name: Configure project
5455
run: cmake -S . -B build -DDEPTHAI_PYTHON_FORCE_DOCSTRINGS=ON -DDEPTHAI_PYTHON_DOCSTRINGS_OUTPUT="$PWD/docstrings/depthai_python_docstring.hpp"
@@ -473,23 +474,17 @@ jobs:
473474
with:
474475
submodules: 'recursive'
475476

476-
# Get tag version
477-
# TODO(themarpe) - Node12, has to be updated
478-
- name: Get tag version
479-
id: tag
480-
uses: battila7/get-version-action@v2
481-
482477
- uses: actions/setup-python@v4
483478
with:
484479
python-version: '3.8'
485480

486481
- name: Check if version matches
487-
run: python3.8 -c 'import find_version as v; exit(0) if "${{ steps.tag.outputs.version-without-v }}" == v.get_package_version() else exit(1)'
482+
run: python3.8 -c 'import find_version as v; exit(0) if "${{ github.ref_name }}" == f"v{v.get_package_version()}" else exit(1)'
488483

489484
# Create GitHub release
490485
- uses: actions/create-release@master
491486
id: createRelease
492-
name: Create ${{ steps.tag.outputs.version-without-v }} depthai-core release
487+
name: Create ${{ github.ref_name }} depthai-python release
493488
env:
494489
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
495490
with:
@@ -504,8 +499,8 @@ jobs:
504499
505500
draft: true
506501

507-
# Deploy to PyPi. Only when a commit is tagged
508-
deploy-pypi:
502+
# Deploy to PyPi and Artifactory. Only when a commit is tagged
503+
deploy:
509504
if: startsWith(github.ref, 'refs/tags/v')
510505
needs: [release]
511506
runs-on: ubuntu-latest
@@ -525,6 +520,12 @@ jobs:
525520
PYPI_SERVER: ${{ secrets.PYPI_SERVER }}
526521
PYPI_USER: ${{ secrets.PYPI_USER }}
527522
PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
523+
- name: Run deploy to Artifactory
524+
run: bash ./ci/upload-artifactory-release.sh
525+
env:
526+
ARTIFACTORY_URL: ${{ secrets.ARTIFACTORY_URL }}
527+
ARTIFACTORY_USER: ${{ secrets.ARTIFACTORY_USER }}
528+
ARTIFACTORY_PASS: ${{ secrets.ARTIFACTORY_PASS }}
528529

529530
notify_robothub:
530531
if: startsWith(github.ref, 'refs/tags/v')
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
name: OS Support
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
paths:
7+
- 'docs/source/_static/install_dependencies.sh'
8+
- 'examples/install_requirements.py'
9+
pull_request:
10+
paths:
11+
- 'docs/source/_static/install_dependencies.sh'
12+
- 'examples/install_requirements.py'
13+
14+
jobs:
15+
test_linux:
16+
runs-on: ubuntu-latest
17+
strategy:
18+
matrix:
19+
container_image: ["fedora:34", "fedora:35", "fedora:36", "ubuntu:18.04", "ubuntu:20.04", "ubuntu:22.04", "ubuntu:22.10"]
20+
container:
21+
image: ${{ matrix.container_image }}
22+
steps:
23+
- uses: actions/checkout@v3
24+
- name: Install sudo
25+
if: startsWith(matrix.container_image, 'fedora') == true
26+
run: yum update -y && yum install -y sudo
27+
- name: Install sudo
28+
if: startsWith(matrix.container_image, 'ubuntu') == true
29+
run: apt-get update -qq && apt-get -qq install sudo
30+
- name: Install dependencies
31+
run: |
32+
ln -snf /usr/share/zoneinfo/UTC /etc/localtime && echo UTC > /etc/timezone # Otherwise tzdata installer prompts for user input
33+
sed '/udevadm control --reload-rules && sudo udevadm trigger/d' docs/source/_static/install_dependencies.sh > tmp_script.sh # Doesn't work on docker
34+
bash tmp_script.sh
35+
- name: Install example requirements
36+
run: |
37+
python3 examples/install_requirements.py
38+
test_macos:
39+
strategy:
40+
matrix:
41+
os: ["macos-11", "macos-12"]
42+
runs-on: ${{ matrix.os }}
43+
steps:
44+
- uses: actions/checkout@v3
45+
- name: Install dependencies
46+
run: |
47+
sed '/udevadm control --reload-rules && sudo udevadm trigger/d' docs/source/_static/install_dependencies.sh > tmp_script.sh
48+
bash tmp_script.sh
49+
- name: Install example requirements
50+
run: |
51+
python3 examples/install_requirements.py
52+
test_windows:
53+
runs-on: windows-latest
54+
steps:
55+
- uses: actions/checkout@v3
56+
- name: Download chocolatey
57+
shell: pwsh
58+
run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
59+
- name: Install dependencies
60+
shell: pwsh
61+
run: choco install cmake git python --version 3.10 -y
62+
- name: Install example requrirements
63+
run: |
64+
python examples/install_requirements.py

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ wheelhouse/
3838
.venv
3939
env/
4040
venv/
41+
venv_*/
4142
ENV/
4243
env.bak/
4344
venv.bak/

.readthedocs.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ sphinx:
2525
# configuration: mkdocs.yml
2626

2727
# Optionally build your docs in additional formats such as PDF
28-
formats:
29-
- pdf
28+
formats: []
3029

3130
# Optionally set the version of Python and requirements required to build your docs
3231
python:

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ pybind11_add_module(${TARGET_NAME}
107107
src/pipeline/node/XLinkInBindings.cpp
108108
src/pipeline/node/XLinkOutBindings.cpp
109109
src/pipeline/node/ColorCameraBindings.cpp
110+
src/pipeline/node/CameraBindings.cpp
110111
src/pipeline/node/MonoCameraBindings.cpp
111112
src/pipeline/node/StereoDepthBindings.cpp
112113
src/pipeline/node/NeuralNetworkBindings.cpp

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
include README.md LICENSE CMakeLists.txt pyproject.toml
22
include find_version.py
3+
include generate_stubs.py
34
graft cmake
45
graft generated
56
graft ci

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ If `TEST_TIMEOUT=0`, the test will run until stopped or it ends.
9696

9797
## Tested platforms
9898

99-
- Windows 10
100-
- Ubuntu 16.04, 18.04;
99+
- Windows 10, Windows 11
100+
- Ubuntu 18.04, 20.04, 22.04;
101101
- Raspbian 10;
102102
- macOS 10.14.6, 10.15.4;
103103

ci/upload-artifactory-release.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
3+
curl -fL https://getcli.jfrog.io | sh
4+
5+
cd wheelhouse/audited/ || exit 1
6+
export PATH_PREFIX=luxonis-python-release-local/depthai
7+
8+
../../jfrog config add --artifactory-url=$ARTIFACTORY_URL --user=$ARTIFACTORY_USER --password=$ARTIFACTORY_PASS
9+
../../jfrog rt u "*" "$PATH_PREFIX/"

depthai-core

Submodule depthai-core updated 138 files

docs/conf.py.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ sys.path.insert(0, os.path.abspath(source_directory / ".." / "_extensions"))
2626
# -- Project information -----------------------------------------------------
2727

2828
project = "DepthAI API Docs"
29-
copyright = u"@build_year@, Luxonis"
29+
html_show_copyright=False
3030
author = "Luxonis"
3131
version = u"@DEPTHAI_PYTHON_VERSION@"
3232
release = version

0 commit comments

Comments
 (0)