Skip to content

Commit

Permalink
Rebuild for libopencv481 (#33)
Browse files Browse the repository at this point in the history
automerged PR by conda-forge/automerge-action
  • Loading branch information
github-actions[bot] committed Sep 28, 2023
2 parents f6ae3d4 + c3e9dd1 commit af3c941
Show file tree
Hide file tree
Showing 15 changed files with 142 additions and 125 deletions.
56 changes: 8 additions & 48 deletions .azure-pipelines/azure-pipelines-win.yml

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

3 changes: 1 addition & 2 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ffmpeg:
libjpeg_turbo:
- 2.1.5
libopencv:
- 4.8.0
- 4.8.1
libpng:
- '1.6'
openssl:
Expand All @@ -31,7 +31,6 @@ pin_run_as_build:
python:
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.8.* *_73_pypy
- 3.8.* *_cpython
- 3.9.* *_73_pypy
- 3.9.* *_cpython
Expand Down
3 changes: 1 addition & 2 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ffmpeg:
libjpeg_turbo:
- 2.1.5
libopencv:
- 4.8.0
- 4.8.1
libpng:
- '1.6'
openssl:
Expand All @@ -35,7 +35,6 @@ pin_run_as_build:
python:
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.8.* *_73_pypy
- 3.8.* *_cpython
- 3.9.* *_73_pypy
- 3.9.* *_cpython
Expand Down
3 changes: 1 addition & 2 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ffmpeg:
libjpeg_turbo:
- 2.1.5
libopencv:
- 4.8.0
- 4.8.1
libpng:
- '1.6'
openssl:
Expand All @@ -31,7 +31,6 @@ pin_run_as_build:
python:
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.8.* *_73_pypy
- 3.8.* *_cpython
- 3.9.* *_73_pypy
- 3.9.* *_cpython
Expand Down
15 changes: 0 additions & 15 deletions .ci_support/migrations/jpeg_to_libjpeg_turbo.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ __migrator:
kind: version
migration_number: 1
libopencv:
- 4.8.0
migrator_ts: 1692537145.7461627
- 4.8.1
migrator_ts: 1695868924.8858316
37 changes: 0 additions & 37 deletions .ci_support/migrations/python311.yaml

This file was deleted.

3 changes: 1 addition & 2 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ffmpeg:
libjpeg_turbo:
- 2.1.5
libopencv:
- 4.8.0
- 4.8.1
libpng:
- '1.6'
macos_machine:
Expand All @@ -31,7 +31,6 @@ pin_run_as_build:
python:
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.8.* *_73_pypy
- 3.8.* *_cpython
- 3.9.* *_73_pypy
- 3.9.* *_cpython
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ffmpeg:
libjpeg_turbo:
- 2.1.5
libopencv:
- 4.8.0
- 4.8.1
libpng:
- '1.6'
macos_machine:
Expand Down
3 changes: 1 addition & 2 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ffmpeg:
libjpeg_turbo:
- 2.1.5
libopencv:
- 4.8.0
- 4.8.1
libpng:
- '1.6'
openssl:
Expand All @@ -23,7 +23,6 @@ pin_run_as_build:
python:
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.8.* *_73_pypy
- 3.8.* *_cpython
- 3.9.* *_73_pypy
- 3.9.* *_cpython
Expand Down
9 changes: 4 additions & 5 deletions .scripts/build_steps.sh

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

4 changes: 2 additions & 2 deletions .scripts/logging_utils.sh

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

8 changes: 4 additions & 4 deletions .scripts/run_osx_build.sh

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

115 changes: 115 additions & 0 deletions .scripts/run_win_build.bat

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

Loading

0 comments on commit af3c941

Please sign in to comment.