From e6f75a230d2d08d606bb1bba751539d9dd4e4405 Mon Sep 17 00:00:00 2001 From: Mulong <45600841+759401524@users.noreply.github.com> Date: Thu, 11 Nov 2021 18:16:25 +0800 Subject: [PATCH 1/2] Update build_wheels_windows.yml --- .github/workflows/build_wheels_windows.yml | 106 ++++++++++----------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/.github/workflows/build_wheels_windows.yml b/.github/workflows/build_wheels_windows.yml index 3eb13086..0e750a42 100644 --- a/.github/workflows/build_wheels_windows.yml +++ b/.github/workflows/build_wheels_windows.yml @@ -22,7 +22,7 @@ jobs: fail-fast: false matrix: os: [windows-latest] - python-version: ['3.6', '3.7', '3.8', '3.9', '3.10'] + python-version: ['3.6', '3.7', '3.8', '3.9', '3.10',"pypy3.7"] platform: [x86, x64] with_contrib: [0, 1] without_gui: [0, 1] @@ -84,55 +84,55 @@ jobs: name: wheels path: wheelhouse/opencv*.whl - test_release_opencv_python: - if: github.event_name == 'release' && github.event.release.prerelease - needs: [build-windows-x86_64] - runs-on: ubuntu-latest - environment: test-opencv-python-release - defaults: - run: - shell: bash - steps: - - uses: actions/download-artifact@v2 - with: - name: wheels - path: wheelhouse/ - - - name: Upload all wheels - run: | - python -m pip install twine - python -m twine upload --repository testpypi -u ${{ secrets.PYPI_USERNAME }} -p ${{ secrets.PYPI_PASSWORD }} --skip-existing wheelhouse/opencv_* - - release_opencv_python: - if: github.event_name == 'release' && !github.event.release.prerelease - needs: [build-windows-x86_64] - runs-on: ubuntu-latest - environment: opencv-python-release - defaults: - run: - shell: bash - steps: - - uses: actions/download-artifact@v2 - with: - name: wheels - path: wheelhouse/ - - - name: Upload wheels for opencv_python - run: | - python -m pip install twine - python -m twine upload -u ${{ secrets.OPENCV_PYTHON_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_PASSWORD }} --skip-existing wheelhouse/opencv_python-* - - - name: Upload wheels for opencv_contrib_python - run: | - python -m pip install twine - python -m twine upload -u ${{ secrets.OPENCV_CONTRIB_PYTHON_USERNAME }} -p ${{ secrets.OPENCV_CONTRIB_PYTHON_PASSWORD }} --skip-existing wheelhouse/opencv_contrib_python-* - - - name: Upload wheels for opencv_python_headless - run: | - python -m pip install twine - python -m twine upload -u ${{ secrets.OPENCV_PYTHON_HEADLESS_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_HEADLESS_PASSWORD }} --skip-existing wheelhouse/opencv_python_headless-* - - - name: Upload wheels for opencv_contrib_python_headless - run: | - python -m pip install twine - python -m twine upload -u ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_USERNAME }} -p ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_PASSWORD }} --skip-existing wheelhouse/opencv_contrib_python_headless-* +# test_release_opencv_python: +# if: github.event_name == 'release' && github.event.release.prerelease +# needs: [build-windows-x86_64] +# runs-on: ubuntu-latest +# environment: test-opencv-python-release +# defaults: +# run: +# shell: bash +# steps: +# - uses: actions/download-artifact@v2 +# with: +# name: wheels +# path: wheelhouse/ + +# - name: Upload all wheels +# run: | +# python -m pip install twine +# python -m twine upload --repository testpypi -u ${{ secrets.PYPI_USERNAME }} -p ${{ secrets.PYPI_PASSWORD }} --skip-existing wheelhouse/opencv_* + +# release_opencv_python: +# if: github.event_name == 'release' && !github.event.release.prerelease +# needs: [build-windows-x86_64] +# runs-on: ubuntu-latest +# environment: opencv-python-release +# defaults: +# run: +# shell: bash +# steps: +# - uses: actions/download-artifact@v2 +# with: +# name: wheels +# path: wheelhouse/ + +# - name: Upload wheels for opencv_python +# run: | +# python -m pip install twine +# python -m twine upload -u ${{ secrets.OPENCV_PYTHON_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_PASSWORD }} --skip-existing wheelhouse/opencv_python-* + +# - name: Upload wheels for opencv_contrib_python +# run: | +# python -m pip install twine +# python -m twine upload -u ${{ secrets.OPENCV_CONTRIB_PYTHON_USERNAME }} -p ${{ secrets.OPENCV_CONTRIB_PYTHON_PASSWORD }} --skip-existing wheelhouse/opencv_contrib_python-* + +# - name: Upload wheels for opencv_python_headless +# run: | +# python -m pip install twine +# python -m twine upload -u ${{ secrets.OPENCV_PYTHON_HEADLESS_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_HEADLESS_PASSWORD }} --skip-existing wheelhouse/opencv_python_headless-* + +# - name: Upload wheels for opencv_contrib_python_headless +# run: | +# python -m pip install twine +# python -m twine upload -u ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_USERNAME }} -p ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_PASSWORD }} --skip-existing wheelhouse/opencv_contrib_python_headless-* From 6aaaf8bd0809f79de3c7ac9f070bfbc179ae9a7b Mon Sep 17 00:00:00 2001 From: Mulong <45600841+759401524@users.noreply.github.com> Date: Thu, 11 Nov 2021 18:19:07 +0800 Subject: [PATCH 2/2] Update build_wheels_windows.yml --- .github/workflows/build_wheels_windows.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build_wheels_windows.yml b/.github/workflows/build_wheels_windows.yml index 0e750a42..6fdaea28 100644 --- a/.github/workflows/build_wheels_windows.yml +++ b/.github/workflows/build_wheels_windows.yml @@ -1,6 +1,9 @@ name: Build PYPI wheels for opencv-python on Windows on: + push: + branches: + - master pull_request: branches: - master