Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit b404b87

Browse filesBrowse files
skvarkskvark
committed
more fixes
1 parent 9c91116 commit b404b87
Copy full SHA for b404b87

File tree

Expand file treeCollapse file tree

2 files changed

+37
-37
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+37
-37
lines changed

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+36-36Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ jobs:
647647
before_install: |
648648
set -e
649649
650-
if [ -n "$SDIST" ]; then
650+
if [[ $SDIST == 1 ]]; then
651651
echo "sdist build"
652652
else
653653
# Check out and prepare the source
@@ -691,7 +691,7 @@ install: |
691691
# Build and package
692692
set -x
693693
694-
if [ -n "$SDIST" ]; then
694+
if [[ $SDIST == 1 ]]; then
695695
python -m pip install --upgrade pip
696696
python -m pip install scikit-build
697697
python setup.py sdist
@@ -705,7 +705,7 @@ script: |
705705
# Install and run tests
706706
set -x
707707
708-
if [ -n "$SDIST" ]; then
708+
if [[ $SDIST == 1 ]]; then
709709
echo "sdist"
710710
else
711711
install_run $PLAT && rc=$? || rc=$?
@@ -741,47 +741,47 @@ after_success: |
741741
742742
if [ -n "$TRAVIS_TAG" ]; then
743743
744-
if [[ $ENABLE_CONTRIB == 0 ]]; then
745-
if [[ $ENABLE_HEADLESS == 0 ]]; then
746-
echo "This is default build. Deployment will be done to to PyPI entry opencv-python."
747-
else
748-
echo "This is headless contrib build. Deployment will be done to to PyPI entry opencv-python-headless."
749-
fi
750-
else
751-
if [[ $ENABLE_HEADLESS == 0 ]]; then
752-
echo "This is contrib build. Deployment will be done to to PyPI entry opencv-contrib-python."
753-
else
754-
echo "This is headless contrib build. Deployment will be done to to PyPI entry opencv-contrib-python-headless."
755-
fi
756-
fi
757-
758-
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
759-
pip install --user twine
760-
pip install --user --upgrade six
761-
762-
if [ -n "$SDIST" ]; then
763-
twine upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/dist
744+
if [[ $ENABLE_CONTRIB == 0 ]]; then
745+
if [[ $ENABLE_HEADLESS == 0 ]]; then
746+
echo "This is default build. Deployment will be done to to PyPI entry opencv-python."
747+
else
748+
echo "This is headless contrib build. Deployment will be done to to PyPI entry opencv-python-headless."
749+
fi
750+
else
751+
if [[ $ENABLE_HEADLESS == 0 ]]; then
752+
echo "This is contrib build. Deployment will be done to to PyPI entry opencv-contrib-python."
764753
else
765-
twine upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/opencv*
754+
echo "This is headless contrib build. Deployment will be done to to PyPI entry opencv-contrib-python-headless."
766755
fi
756+
fi
757+
758+
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
759+
pip install --user twine
760+
pip install --user --upgrade six
767761
762+
if [[ $SDIST == 1 ]]; then
763+
twine upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/dist
764+
else
765+
twine upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/opencv*
768766
fi
769767
770-
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
771-
# macpython 3.5 doesn't support recent TLS protocols which causes twine
772-
# upload to fail, so we use the system Python to run twine
773-
/usr/bin/python -m ensurepip --user
774-
/usr/bin/python -m pip install --user -U pip
775-
/usr/bin/python -m pip install --user -U -I twine
768+
fi
776769
777-
if [ -n "$SDIST" ]; then
778-
/usr/bin/python -m upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/dist
779-
else
780-
/usr/bin/python -m upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/opencv*
781-
fi
770+
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
771+
# macpython 3.5 doesn't support recent TLS protocols which causes twine
772+
# upload to fail, so we use the system Python to run twine
773+
/usr/bin/python -m ensurepip --user
774+
/usr/bin/python -m pip install --user -U pip
775+
/usr/bin/python -m pip install --user -U -I twine
782776
777+
if [[ $SDIST == 1 ]]; then
778+
/usr/bin/python -m upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/dist
779+
else
780+
/usr/bin/python -m upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/opencv*
783781
fi
784782
783+
fi
784+
785785
fi
786786
787787
# Save to Azure storage always
@@ -794,7 +794,7 @@ after_success: |
794794
795795
az storage container create -n ${TRAVIS_COMMIT} --public-access blob
796796
797-
if [ -n "$SDIST" ]; then
797+
if [[ $SDIST == 1 ]]; then
798798
az storage blob upload-batch -d ${TRAVIS_COMMIT} -s ${TRAVIS_BUILD_DIR}/dist --pattern *.gz
799799
else
800800
az storage blob upload-batch -d ${TRAVIS_COMMIT} -s ${TRAVIS_BUILD_DIR}/wheelhouse --pattern *.whl

‎appveyor.yml

Copy file name to clipboardExpand all lines: appveyor.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ build_script:
141141
- cmd: |
142142
"%PYTHON%/python.exe" -m pip install --upgrade pip
143143
"%PYTHON%/python.exe" -m pip install --upgrade setuptools
144-
"%PYTHON%/python.exe" -m pip wheel . --no-build-isolation --verbose
144+
"%PYTHON%/python.exe" -m pip wheel . --verbose
145145
146146
before_test:
147147
- ps: |

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.