deodates-dev
diff --git a/‎.github/workflows/build_wheels.yml
Copy file name to clipboardExpand all lines: .github/workflows/build_wheels.yml
+13-40Lines changed: 13 additions & 40 deletions b/‎.github/workflows/build_wheels.yml
Copy file name to clipboardExpand all lines: .github/workflows/build_wheels.yml
+13-40Lines changed: 13 additions & 40 deletions
@@ -248,51 +248,36 @@ jobs:
     needs: [build, build-windows-x86_64, build_sdist]
     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 wheels ${{ matrix.os }}
-        env:
-          # PYPI repository credentials
-          TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-          TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-          TEST_ENV_VAR: test
-        run: |
-          python -m pip install twine
-          echo ${{ secrets.OPENCV_PYTHON_USERNAME }}
-          echo ${Env:TWINE_USERNAME}
-          echo ${Env:TEST_ENV_VAR}
-          python -m twine upload --repository testpypi -u ${Env:TWINE_USERNAME} -p ${Env:TWINE_PASSWORD} --skip-existing wheelhouse/opencv_*
-
+      - name: Publish package
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          user: ${{ secrets.PYPI_USERNAME }}
+          password: ${{ secrets.PYPI_PASSWORD }}
+          repository_url: https://test.pypi.org/legacy/
+          packages_dir: wheelhouse/
+          skip_existing: true
+          verbose: true
 
   release_opencv_python:
     if: startsWith(github.ref, 'refs/tags/v')
     needs: [build, build-windows-x86_64, build_sdist]
     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 ${{ matrix.os }}
-        env:
-          # PYPI repository credentials
-          TWINE_USERNAME: ${{ secrets.OPENCV_PYTHON_USERNAME }}
-          TWINE_PASSWORD: ${{ secrets.OPENCV_PYTHON_PASSWORD }}
         run: |
           python -m pip install twine
-          python -m twine upload -u ${Env:TWINE_USERNAME} -p ${Env:TWINE_PASSWORD} --skip-existing wheelhouse/opencv_python-*
+          python -m twine upload -u ${{ secrets.OPENCV_PYTHON_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_PASSWORD }} --skip-existing wheelhouse/opencv_python-*
 
   release_opencv_contrib_python:
     if: startsWith(github.ref, 'refs/tags/v')
@@ -309,13 +294,9 @@ jobs:
           path: wheelhouse/
 
       - name: Upload wheels ${{ matrix.os }}
-        env:
-          # PYPI repository credentials
-          TWINE_USERNAME: ${{ secrets.OPENCV_CONTRIB_PYTHON_USERNAME }}
-          TWINE_PASSWORD: ${{ secrets.OPENCV_CONTRIB_PYTHON_PASSWORD }}
         run: |
           python -m pip install twine
-          python -m twine upload -u ${Env:TWINE_USERNAME} -p ${Env:TWINE_PASSWORD} --skip-existing wheelhouse/opencv_contrib_python-*
+          python -m twine upload -u ${{ secrets.OPENCV_CONTRIB_PYTHON_USERNAME }} -p ${{ secrets.OPENCV_CONTRIB_PYTHON_PASSWORD }} --skip-existing wheelhouse/opencv_contrib_python-*
 
   release_opencv_python_headless:
     if: startsWith(github.ref, 'refs/tags/v')
@@ -332,13 +313,9 @@ jobs:
           path: wheelhouse/
 
       - name: Upload wheels ${{ matrix.os }}
-        env:
-          # PYPI repository credentials
-          TWINE_USERNAME: ${{ secrets.OPENCV_PYTHON_HEADLESS_USERNAME }}
-          TWINE_PASSWORD: ${{ secrets.OPENCV_PYTHON_HEADLESS_PASSWORD }}
         run: |
           python -m pip install twine
-          python -m twine upload -u ${Env:TWINE_USERNAME} -p ${Env:TWINE_PASSWORD} --skip-existing wheelhouse/opencv_python_headless-*
+          python -m twine upload -u ${{ secrets.OPENCV_PYTHON_HEADLESS_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_HEADLESS_PASSWORD }} --skip-existing wheelhouse/opencv_python_headless-*
 
   release_opencv_contrib_python_headless:
     if: startsWith(github.ref, 'refs/tags/v')
@@ -355,10 +332,6 @@ jobs:
           path: wheelhouse/
 
       - name: Upload wheels ${{ matrix.os }}
-        env:
-          # PYPI repository credentials
-          TWINE_USERNAME: ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_USERNAME }}
-          TWINE_PASSWORD: ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_PASSWORD }}
         run: |
           python -m pip install twine
-          python -m twine upload -u ${Env:TWINE_USERNAME} -p ${Env:TWINE_PASSWORD} --skip-existing wheelhouse/opencv_contrib_python_headless-*
+          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-*