Skip to content

Commit 9054385

Browse files
author
Matevz Morato
committed
Merge remote-tracking branch 'origin/develop' into v3_basalt_fix
2 parents 52ddb14 + b35fb88 commit 9054385

File tree

9 files changed

+26
-88
lines changed

9 files changed

+26
-88
lines changed

.github/workflows/bom.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: BOM Testing
33
on:
44
push:
55
branches:
6-
- v3_develop
6+
- develop
77
tags:
88
- 'v*'
99
workflow_dispatch:
@@ -30,7 +30,7 @@ on:
3030
depthai:
3131
required: false
3232
type: string
33-
default: "v3_develop"
33+
default: "develop"
3434
description: "Version for depthai"
3535

3636
jobs:

.github/workflows/main.workflow.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@ on:
66
branches:
77
- main
88
- develop
9-
- v3_develop
109
tags:
1110
- 'v*'
1211
pull_request:
1312
branches:
1413
- main
1514
- develop
16-
- v3_develop
1715

1816
jobs:
1917

.github/workflows/python-docker-hub.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
name: Publish Docker image
22
on:
33
workflow_dispatch:
4-
push:
5-
branches:
6-
- main
7-
- develop
8-
tags:
9-
- 'v2*'
4+
# TODO(Morato) - re-enable docker upload
5+
# push:
6+
# branches:
7+
# - main
8+
# - develop
9+
# tags:
10+
# - 'v2*'
1011
jobs:
1112

1213
build:

.github/workflows/python-main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ on:
66
workflow_dispatch:
77
pull_request:
88
branches:
9-
- v3_develop
9+
- develop
1010
push:
1111
branches:
12-
- v3_develop*
12+
- develop*
1313
tags:
14-
- 'v3*'
14+
- 'v*'
1515

1616
###################################
1717
###################################

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

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

.github/workflows/test.workflow.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ on:
44
workflow_dispatch:
55
push:
66
branches:
7-
- v3_develop
7+
- develop
8+
- main
89
tags:
910
- 'v*'
1011
pull_request:
1112
branches:
12-
- v3_develop
13+
- develop
1314

1415
# Only allow latest run on same branch to be tested
1516
concurrency:

README.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
1-
# DepthAI C++ Library
1+
# DepthAI Library
22

33
[![Forum](https://img.shields.io/badge/Forum-discuss-orange)](https://discuss.luxonis.com/)
44
[![Docs](https://img.shields.io/badge/Docs-DepthAI_API-yellow)](https://stg.docs.luxonis.com/software/v3/)
55
[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://opensource.org/licenses/MIT)
66

7-
DepthAI library for interfacing with Luxonis DepthAI hardware.
7+
DepthAI library for interfacing with Luxonis DepthAI hardware. It's written in C++ and offers Python bindings out of the box.
88

9-
> ℹ️ This is a `v3.x.y` version of the library which is in release candidate stage.
10-
11-
> ℹ️ For porting code from `v2` version of the library, we recommend using the [porting guide](./V2V3PortinGuide.md)
9+
> **Important — You’re viewing the `v3.x.y` _release-candidate_ branch.**
10+
>
11+
> * For production projects that still rely on **v2**, check out the
12+
> [`v2_stable` branch](https://github.com/luxonis/depthai-core/tree/v2_stable).
13+
> * Need to migrate? Follow the step-by-step [v2 → v3 Porting Guide](./V2V3PortinGuide.md).
1214
1315
## Documentation
14-
Documentation is available over at [Luxonis DepthAI API](https://stg.docs.luxonis.com/software/v3/)
16+
Documentation is available over at [Luxonis DepthAI API](https://docs.luxonis.com/software-v3/depthai/)
1517

1618
## Disclaimer
1719
DepthAI library doesn't yet provide API stability guarantees. While we take care to properly deprecate old functions, some changes might still be breaking.
1820

1921
## Examples
20-
Examples for both C++ and Python are available in the `examples` folder. To see hwo to build and run them see [README.md](./examples/README.md) for more information.
22+
Examples for both C++ and Python are available in the `examples` folder. To see how to build and run them see [README.md](./examples/README.md) for more information.
2123
To build the examples in C++ configure with the following option added:
2224
```
2325
cmake -S. -Bbuild -D'DEPTHAI_BUILD_EXAMPLES=ON'

cmake/Depthai/DepthaiDeviceSideConfig.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set(DEPTHAI_DEVICE_SIDE_MATURITY "snapshot")
33

44
# "full commit hash of device side binary"
5-
set(DEPTHAI_DEVICE_SIDE_COMMIT "c590903b66f16cb9b6e14cb045323525399c2136")
5+
set(DEPTHAI_DEVICE_SIDE_COMMIT "147d0fe4e861c7b71a77a8d39e3c8e7ddcaca9ea")
66

77
# "version if applicable"
88
set(DEPTHAI_DEVICE_SIDE_VERSION "")

examples/python/install_requirements.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ def hasWhitespace(string):
123123
# Install depthai depending on context
124124
if not git_context or git_branch == 'main':
125125
# Install latest pypi depthai release
126-
depthai_install_cmd = [*pip_package_install, '-U', '--force-reinstall', 'depthai']
126+
depthai_install_cmd = [*pip_package_install, '-U', '--force-reinstall', '--pre', 'depthai']
127127
if args.dry_run:
128128
prettyPrint(depthai_install_cmd)
129129
else:

0 commit comments

Comments
 (0)