From f42afd09617bb4dc4bae30f020f5da461faca7fa Mon Sep 17 00:00:00 2001 From: Mateusz Bysiek Date: Mon, 9 Dec 2019 13:14:20 +0900 Subject: [PATCH 1/4] don't try to upload to pypi - won't work from the fork anyway --- .travis.yml | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/.travis.yml b/.travis.yml index d5f56edd..2b9b33c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -709,38 +709,3 @@ before_cache: | fi set +x; set +e - -after_success: | - # Upload wheels to pypi if requested - if [ -n "$TRAVIS_TAG" ]; then - set -x - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - pip install --user twine - pip install --user --upgrade six - fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - pip install twine - pip install --upgrade pyOpenSSL - fi - - 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." - else - echo "This is headless contrib build. Deployment will be done to 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." - else - echo "This is headless contrib build. Deployment will be done to to PyPI entry opencv-contrib-python-headless." - fi - fi - - twine upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/opencv* - set +x - else - echo "Tag not set, deployment skipped." - fi From 7ed0216580c5a9455c6d11c109840a6ee6383916 Mon Sep 17 00:00:00 2001 From: Mateusz Bysiek Date: Mon, 9 Dec 2019 13:17:59 +0900 Subject: [PATCH 2/4] enable Bintray deployment --- .travis.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.travis.yml b/.travis.yml index 2b9b33c9..cc3227fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -709,3 +709,20 @@ before_cache: | fi set +x; set +e + +before_deploy: + - pyenv global 3.7 + - pip3 install -U --user version_query || pip3 install -U version_query + - wget https://gist.githubusercontent.com/mbdevpl/46d458350f0c9cc7d793b67573e01f7b/raw/prepare_bintray_deployment.py + - python3 prepare_bintray_deployment.py "${TRAVIS_OS_NAME}-${PLAT:-x86_64}-python${MB_PYTHON_VERSION}" "wheelhouse/*.whl" + +deploy: + - provider: bintray + file: ".bintray.json" + user: "mbdevpl" + key: + secure: "NyZU2xOxxVH8KrqI9VRf+791kpAgxidre+6f5nkG46wHnK54dU6q7n8GbyTbPLNRfVdkTPNvAEA1nEZMucA/B09+6dm9uygFVQsv5eO/ZpyNr3yLQ+rih/bvT6wcVs1hhWFL4tC9oHH+XQYkWhQwtNKWGHyo48at9L7hvK/Xq8y03Kz1ijnxVaaWjwnLTxOWnR+EITss2mL86Gl2YfnhHJPT1M/EPm0yl3yAlbILPy8XYaMSVKLOycNdyMnOpvsywImKE2Hz8t9RmYaxgmskb6fFM0iLXZPUgt8dxOPVBkbV57TBBIJUhSPEzmnbegf2qgm3JPydfYSlybLHbqrKo0iHqkFsl4BvgB51Iqe5P30WY3meJwPawQBMHbnxWV9lLZCc3nYGg7A3Tzj8ibI3iVbsOyYn2ZeKzFFlM7KBe3aPDthst4JjAMBrOID8osOoUvC/ke+DwpQpF51dGlIMrfseA4N2WUgi4bkebSaf/rj4/lh2Id/UJ8H/d1zACHy+Kk7Cb/ppN1rdO7MgHqrFWfNX6+wqW4FpISch5Aznm9yWuBSTS7w/4+uurucsTkJj9/dimX9BQzT8px+tVmdkLSb2clG2eahdTPFQmukRa/B+vtgsXPT376EeKk6PJPfvgTSHMUXc6b/NX6t60HQkKp2s9zo6qdL7li0F1VA2cAs=" + on: + all_branches: true + condition: -z "${MB_PYTHON_VERSION-}" + skip_cleanup: true From 5a2946593be8126676695831b3db55f6688914b0 Mon Sep 17 00:00:00 2001 From: Mateusz Bysiek Date: Mon, 16 Dec 2019 22:50:23 +0900 Subject: [PATCH 3/4] deployment condition was never satisfied --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cc3227fb..4dea5040 100644 --- a/.travis.yml +++ b/.travis.yml @@ -724,5 +724,5 @@ deploy: secure: "NyZU2xOxxVH8KrqI9VRf+791kpAgxidre+6f5nkG46wHnK54dU6q7n8GbyTbPLNRfVdkTPNvAEA1nEZMucA/B09+6dm9uygFVQsv5eO/ZpyNr3yLQ+rih/bvT6wcVs1hhWFL4tC9oHH+XQYkWhQwtNKWGHyo48at9L7hvK/Xq8y03Kz1ijnxVaaWjwnLTxOWnR+EITss2mL86Gl2YfnhHJPT1M/EPm0yl3yAlbILPy8XYaMSVKLOycNdyMnOpvsywImKE2Hz8t9RmYaxgmskb6fFM0iLXZPUgt8dxOPVBkbV57TBBIJUhSPEzmnbegf2qgm3JPydfYSlybLHbqrKo0iHqkFsl4BvgB51Iqe5P30WY3meJwPawQBMHbnxWV9lLZCc3nYGg7A3Tzj8ibI3iVbsOyYn2ZeKzFFlM7KBe3aPDthst4JjAMBrOID8osOoUvC/ke+DwpQpF51dGlIMrfseA4N2WUgi4bkebSaf/rj4/lh2Id/UJ8H/d1zACHy+Kk7Cb/ppN1rdO7MgHqrFWfNX6+wqW4FpISch5Aznm9yWuBSTS7w/4+uurucsTkJj9/dimX9BQzT8px+tVmdkLSb2clG2eahdTPFQmukRa/B+vtgsXPT376EeKk6PJPfvgTSHMUXc6b/NX6t60HQkKp2s9zo6qdL7li0F1VA2cAs=" on: all_branches: true - condition: -z "${MB_PYTHON_VERSION-}" + condition: -n "${ENABLE_CONTRIB-}" && -n "${ENABLE_HEADLESS-}" skip_cleanup: true From e664d2ffcd52ca0b9ed6b1d0ee5b047170d2ebb5 Mon Sep 17 00:00:00 2001 From: Mateusz Bysiek Date: Mon, 23 Dec 2019 14:59:01 +0900 Subject: [PATCH 4/4] [skip appveyor] tweak deployment config on Travis --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4dea5040..3e3db40c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -711,9 +711,10 @@ before_cache: | set +x; set +e before_deploy: - - pyenv global 3.7 + - pyenv global 3.7 || which pip3 - pip3 install -U --user version_query || pip3 install -U version_query - wget https://gist.githubusercontent.com/mbdevpl/46d458350f0c9cc7d793b67573e01f7b/raw/prepare_bintray_deployment.py + - sudo chown -R ${USER}:${USER} . && cd opencv && git reset --hard HEAD && cd .. - python3 prepare_bintray_deployment.py "${TRAVIS_OS_NAME}-${PLAT:-x86_64}-python${MB_PYTHON_VERSION}" "wheelhouse/*.whl" deploy: @@ -724,5 +725,5 @@ deploy: secure: "NyZU2xOxxVH8KrqI9VRf+791kpAgxidre+6f5nkG46wHnK54dU6q7n8GbyTbPLNRfVdkTPNvAEA1nEZMucA/B09+6dm9uygFVQsv5eO/ZpyNr3yLQ+rih/bvT6wcVs1hhWFL4tC9oHH+XQYkWhQwtNKWGHyo48at9L7hvK/Xq8y03Kz1ijnxVaaWjwnLTxOWnR+EITss2mL86Gl2YfnhHJPT1M/EPm0yl3yAlbILPy8XYaMSVKLOycNdyMnOpvsywImKE2Hz8t9RmYaxgmskb6fFM0iLXZPUgt8dxOPVBkbV57TBBIJUhSPEzmnbegf2qgm3JPydfYSlybLHbqrKo0iHqkFsl4BvgB51Iqe5P30WY3meJwPawQBMHbnxWV9lLZCc3nYGg7A3Tzj8ibI3iVbsOyYn2ZeKzFFlM7KBe3aPDthst4JjAMBrOID8osOoUvC/ke+DwpQpF51dGlIMrfseA4N2WUgi4bkebSaf/rj4/lh2Id/UJ8H/d1zACHy+Kk7Cb/ppN1rdO7MgHqrFWfNX6+wqW4FpISch5Aznm9yWuBSTS7w/4+uurucsTkJj9/dimX9BQzT8px+tVmdkLSb2clG2eahdTPFQmukRa/B+vtgsXPT376EeKk6PJPfvgTSHMUXc6b/NX6t60HQkKp2s9zo6qdL7li0F1VA2cAs=" on: all_branches: true - condition: -n "${ENABLE_CONTRIB-}" && -n "${ENABLE_HEADLESS-}" + condition: -n "${ENABLE_CONTRIB-}" && -n "${ENABLE_HEADLESS-}" && "${TRAVIS_OS_NAME}" == "linux" skip_cleanup: true