Skip to content

Rework Mac OS build #1

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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Rework Mac OS build #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f9bf025
Restore set +e; dropped with `before_cache` step
GArik Jan 14, 2021
964ef12
Use MacOS 10.15.5 for build
GArik Dec 8, 2020
673effc
Update multibuild submodule to the latest version
GArik Jan 22, 2021
3826d25
Rework Mac OS build
GArik Dec 30, 2020
6b9eb0f
Implement build timeouts
GArik Jan 19, 2021
3359907
Fix incorrect paths for delocate
GArik Jan 26, 2021
ad06688
Test deployment to PyPI
GArik Jan 26, 2021
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
88 changes: 62 additions & 26 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,153 +79,185 @@ jobs:
- stage: final
- os: osx
language: generic
osx_image: xcode9.4
osx_image: xcode11.6
env:
- MB_PYTHON_VERSION=3.6
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
- TEST_DEPENDS=numpy==1.13.3
cache:
directories: $HOME/.ccache

- os: osx
language: generic
osx_image: xcode9.4
osx_image: xcode11.6
env:
- MB_PYTHON_VERSION=3.7
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
- TEST_DEPENDS=numpy==1.14.5
cache:
directories: $HOME/.ccache

- os: osx
language: generic
osx_image: xcode9.4
osx_image: xcode11.6
env:
- MB_PYTHON_VERSION=3.8
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
- TEST_DEPENDS=numpy==1.17.3
cache:
directories: $HOME/.ccache

- os: osx
language: generic
osx_image: xcode9.4
osx_image: xcode11.6
env:
- MB_PYTHON_VERSION=3.9
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
- TEST_DEPENDS=numpy==1.19.3
cache:
directories: $HOME/.ccache


# headless builds for MacOS
- os: osx
language: generic
osx_image: xcode9.4
osx_image: xcode11.6
env:
- MB_PYTHON_VERSION=3.6
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
- TEST_DEPENDS=numpy==1.13.3
cache:
directories: $HOME/.ccache

- os: osx
language: generic
osx_image: xcode9.4
osx_image: xcode11.6
env:
- MB_PYTHON_VERSION=3.7
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
- TEST_DEPENDS=numpy==1.14.5
cache:
directories: $HOME/.ccache

- os: osx
language: generic
osx_image: xcode9.4
osx_image: xcode11.6
env:
- MB_PYTHON_VERSION=3.8
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
- TEST_DEPENDS=numpy==1.17.3
cache:
directories: $HOME/.ccache

- os: osx
language: generic
osx_image: xcode9.4
osx_image: xcode11.6
env:
- MB_PYTHON_VERSION=3.9
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
- TEST_DEPENDS=numpy==1.19.3
cache:
directories: $HOME/.ccache


# Contrib builds for MacOS
- os: osx
language: generic
osx_image: xcode9.4
osx_image: xcode11.6
env:
- MB_PYTHON_VERSION=3.6
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
- TEST_DEPENDS=numpy==1.13.3
cache:
directories: $HOME/.ccache

- os: osx
language: generic
osx_image: xcode9.4
osx_image: xcode11.6
env:
- MB_PYTHON_VERSION=3.7
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
- TEST_DEPENDS=numpy==1.14.5
cache:
directories: $HOME/.ccache

- os: osx
language: generic
osx_image: xcode9.4
osx_image: xcode11.6
env:
- MB_PYTHON_VERSION=3.8
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
- TEST_DEPENDS=numpy==1.17.3
cache:
directories: $HOME/.ccache

- os: osx
language: generic
osx_image: xcode9.4
osx_image: xcode11.6
env:
- MB_PYTHON_VERSION=3.9
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
- TEST_DEPENDS=numpy==1.19.3
cache:
directories: $HOME/.ccache


# headless contrib builds for MacOS
- os: osx
language: generic
osx_image: xcode9.4
osx_image: xcode11.6
env:
- MB_PYTHON_VERSION=3.6
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1
- TEST_DEPENDS=numpy==1.13.3
cache:
directories: $HOME/.ccache

- os: osx
language: generic
osx_image: xcode9.4
osx_image: xcode11.6
env:
- MB_PYTHON_VERSION=3.7
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1
- TEST_DEPENDS=numpy==1.14.5
cache:
directories: $HOME/.ccache

- os: osx
language: generic
osx_image: xcode9.4
osx_image: xcode11.6
env:
- MB_PYTHON_VERSION=3.8
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1
- TEST_DEPENDS=numpy==1.17.3
cache:
directories: $HOME/.ccache

- os: osx
language: generic
osx_image: xcode9.4
osx_image: xcode11.6
env:
- MB_PYTHON_VERSION=3.9
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1
- TEST_DEPENDS=numpy==1.19.3
cache:
directories: $HOME/.ccache


# default builds for Linux
Expand Down Expand Up @@ -896,9 +928,13 @@ install: |
if [[ $SDIST == 1 ]]; then
python -m pip install --upgrade pip
python -m pip install scikit-build
git submodule sync
git submodule update --init --recursive opencv
git submodule update --init --recursive opencv_contrib
python setup.py sdist
else
build_wheel $REPO_DIR $PLAT
ret_code=$?
fi

set +x
Expand All @@ -922,32 +958,32 @@ script: |
after_success: |
# Upload wheels to pypi if tag is set

set -x
set -x; set +e

if [ -n "$TRAVIS_TAG" ]; then

if [[ $ENABLE_CONTRIB == 0 ]]; then
if [[ $ENABLE_HEADLESS == 0 ]]; then
echo "This is default build. Deployment will be done to to PyPI entry opencv-python."
echo "This is default build. Deployment will be done to PyPI entry opencv-python."
else
echo "This is headless contrib build. Deployment will be done to to PyPI entry opencv-python-headless."
echo "This is headless contrib build. Deployment will be done to PyPI entry opencv-python-headless."
fi
else
if [[ $ENABLE_HEADLESS == 0 ]]; then
echo "This is contrib build. Deployment will be done to to PyPI entry opencv-contrib-python."
echo "This is contrib build. Deployment will be done to PyPI entry opencv-contrib-python."
else
echo "This is headless contrib build. Deployment will be done to to PyPI entry opencv-contrib-python-headless."
echo "This is headless contrib build. Deployment will be done to PyPI entry opencv-contrib-python-headless."
fi
fi

if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
if [[ $SDIST == 1 ]]; then
pip install twine
twine upload -u ${PYPI_USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/dist/opencv*
twine upload -u ${PYPI_USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/dist/openc*
else
pip install --user twine
pip install --user --upgrade six
twine upload -u ${PYPI_USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/opencv*
twine upload -u ${PYPI_USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/openc*
fi

fi
Expand All @@ -960,9 +996,9 @@ after_success: |
/usr/bin/python -m pip install --user -U -I twine

if [[ $SDIST == 1 ]]; then
/usr/bin/python -m twine upload -u ${PYPI_USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/dist/opencv*
/usr/bin/python -m twine upload -u ${PYPI_USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/dist/openc*
else
/usr/bin/python -m twine upload -u ${PYPI_USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/opencv*
/usr/bin/python -m twine upload -u ${PYPI_USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/openc*
fi

fi
Expand All @@ -983,7 +1019,7 @@ after_success: |
if [[ $SDIST == 1 ]]; then
az storage blob upload-batch -d ${TRAVIS_COMMIT} -s ${TRAVIS_BUILD_DIR}/dist --pattern *.gz
else
az storage blob upload-batch -d ${TRAVIS_COMMIT} -s ${TRAVIS_BUILD_DIR}/wheelhouse --pattern opencv*.whl
az storage blob upload-batch -d ${TRAVIS_COMMIT} -s ${TRAVIS_BUILD_DIR}/wheelhouse --pattern openc*.whl
fi
fi

Expand Down
11 changes: 5 additions & 6 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
environment:
USER:
secure: fXgF9uyy6sT0JoVOR7BoqA==

secure: faDqtT21igTqQlsKgq9+UA==
PASS:
secure: 0bXSOVjf9x8L7nErTivu92TF1FwNosTjFJQPmxp8Dys=
secure: LARTd04b3VIW+7ADTEP7Lw==

matrix:
- PYTHON: "C:\\Python36"
Expand Down Expand Up @@ -158,7 +157,7 @@ before_test:

cd ${Env:APPVEYOR_BUILD_FOLDER}\tests
$env:PYTHONWARNINGS = "ignore:::pip._internal.cli.base_command"
&"${Env:PYTHON}\\python.exe" -m pip install --user --no-warn-script-location (ls "../dist/opencv_*.whl")
&"${Env:PYTHON}\\python.exe" -m pip install --user --no-warn-script-location (ls "../dist/opencovis_*.whl")
if ($LastExitCode -ne 0) {throw $LastExitCode}

test_script:
Expand All @@ -168,7 +167,7 @@ test_script:
"%PYTHON%\\python.exe" -m unittest test

artifacts:
- path: dist\opencv*.whl
- path: dist\opencovis*.whl
name: wheels

deploy_script:
Expand All @@ -194,7 +193,7 @@ deploy_script:
}

&"${Env:PYTHON}\\python.exe" -m pip install twine
&"${Env:PYTHON}\\python.exe" -m twine upload -u ${Env:USER} -p ${Env:PASS} --skip-existing dist/opencv*
&"${Env:PYTHON}\\python.exe" -m twine upload -u ${Env:USER} -p ${Env:PASS} --skip-existing dist/opencovis*
}
else {
echo "Tag not set, deployment skipped."
Expand Down
2 changes: 1 addition & 1 deletion multibuild
Open in desktop
Submodule multibuild updated 9 files
+1 −0 .travis.yml
+1 −1 LICENSE
+5 −2 README.rst
+4 −4 common_utils.sh
+3 −3 configure_build.sh
+12 −12 library_builders.sh
+3 −3 osx_utils.sh
+4 −4 tests/test_library_builders.sh
+2 −2 tests/test_multibuild.sh
Loading