Skip to content

Rebuild for libopencv 4.10.0 and add missing host dependency on numpy #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
traversaro merged 6 commits into from
Jul 2, 2024
Merged

Rebuild for libopencv 4.10.0 and add missing host dependency on numpy #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
91431c0
dummy commit for rerendering
conda-forge-webservices[bot] Jul 2, 2024
6e74ec0
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
Jul 2, 2024
b72465f
Update meta.yaml
traversaro Jul 2, 2024
a9213e9
Add numpy host dependency
traversaro Jul 2, 2024
0226c7a
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
Jul 2, 2024
2df138b
Bump build number
traversaro Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ c_compiler_version:
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -27,11 +27,17 @@ libboost_devel:
libmatio_cpp:
- 0.2.5
libopencv:
- 4.9.0
- 4.10.0
libosqp:
- 0.6.3
libyarp:
- 3.9.0
numpy:
- '1.22'
- '1.23'
- '1.26'
- '1.22'
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -46,6 +52,8 @@ python:
- 3.12.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
qhull:
- '2020.2'
spdlog:
- '1.13'
target_platform:
Expand All @@ -55,3 +63,5 @@ zip_keys:
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
- - python
- numpy
12 changes: 11 additions & 1 deletion .ci_support/linux_aarch64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,17 @@ libboost_devel:
libmatio_cpp:
- 0.2.5
libopencv:
- 4.9.0
- 4.10.0
libosqp:
- 0.6.3
libyarp:
- 3.9.0
numpy:
- '1.22'
- '1.23'
- '1.26'
- '1.22'
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -50,6 +56,8 @@ python:
- 3.12.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
qhull:
- '2020.2'
spdlog:
- '1.13'
target_platform:
Expand All @@ -59,3 +67,5 @@ zip_keys:
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
- - python
- numpy
10 changes: 0 additions & 10 deletions .ci_support/migrations/boost1840.yaml
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions .ci_support/migrations/libmatio_cpp025.yaml
View file
Open in desktop

This file was deleted.

12 changes: 11 additions & 1 deletion .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,19 @@ libboost_devel:
libmatio_cpp:
- 0.2.5
libopencv:
- 4.9.0
- 4.10.0
libosqp:
- 0.6.3
libyarp:
- 3.9.0
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '1.22'
- '1.23'
- '1.26'
- '1.22'
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -48,10 +54,14 @@ python:
- 3.12.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
qhull:
- '2020.2'
spdlog:
- '1.13'
target_platform:
- osx-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- numpy
12 changes: 11 additions & 1 deletion .ci_support/osx_arm64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,19 @@ libboost_devel:
libmatio_cpp:
- 0.2.5
libopencv:
- 4.9.0
- 4.10.0
libosqp:
- 0.6.3
libyarp:
- 3.9.0
macos_machine:
- arm64-apple-darwin20.0.0
numpy:
- '1.22'
- '1.23'
- '1.26'
- '1.22'
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -48,10 +54,14 @@ python:
- 3.12.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
qhull:
- '2020.2'
spdlog:
- '1.13'
target_platform:
- osx-arm64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- numpy
13 changes: 12 additions & 1 deletion .ci_support/win_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,17 @@ libboost_devel:
libmatio_cpp:
- 0.2.5
libopencv:
- 4.9.0
- 4.10.0
libosqp:
- 0.6.3
libyarp:
- 3.9.0
numpy:
- '1.22'
- '1.23'
- '1.26'
- '1.22'
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -36,7 +42,12 @@ python:
- 3.12.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
qhull:
- '2020.2'
spdlog:
- '1.13'
target_platform:
- win-64
zip_keys:
- - python
- numpy
7 changes: 7 additions & 0 deletions .scripts/build_steps.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .scripts/run_osx_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .scripts/run_win_build.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ source:
patches:

build:
number: 11
number: 12

outputs:
# {{ namecxx }}
Expand Down Expand Up @@ -60,7 +60,7 @@ outputs:
- casadi
- qhull
- libopencv
- pcl >1.12
- pcl 1.14.0
- onnxruntime-cpp
# transitive public dependency of pcl
- vtk-base
Expand Down Expand Up @@ -134,16 +134,16 @@ outputs:
- casadi
- libboost-devel
- pugixml
- pcl >1.12
- pcl 1.14.0
- xorg-libxfixes # [linux]
- icub-models # Requested just for tests
- scipy # Requested just for tests
- pytest # Requested just for tests
- manifpy # Requested just for tests
- numpy
run:
- {{ pin_subpackage(namecxx, exact=True) }}
- python
- numpy
- manifpy
- idyntree
test:
Expand Down