Merge pull request #596 from asenyaev/asen/config_version

Changed a path to config-X.py file after python limited API support, optimized workflows
opencv · Dec 16, 2021 · c1ca98c · c1ca98c
2 parents fd3bf88 + edd6b14
commit c1ca98c
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 303 deletions.
diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml
@@ -67,33 +67,11 @@ jobs:
         name: wheels
         path: wheelhouse/opencv*.whl
 
-    - name: Saving opencv-python wheels
-      if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 0 }}
+    - name: Saving a wheel accordingly to matrix
       uses: actions/upload-artifact@v2
       with:
-        name: opencv-python-wheels
-        path: wheelhouse/opencv_python-*.whl
-
-    - name: Saving opencv-python-headless wheels
-      if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 0 }}
-      uses: actions/upload-artifact@v2
-      with:
-        name: opencv-python-headless-wheels
-        path: wheelhouse/opencv_python_headless-*.whl
-
-    - name: Saving opencv-contrib-python wheels
-      if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 1 }}
-      uses: actions/upload-artifact@v2
-      with:
-        name: opencv-contrib-python-wheels
-        path: wheelhouse/opencv_contrib_python-*.whl
-
-    - name: Saving opencv-contrib-python-headless wheels
-      if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 1 }}
-      uses: actions/upload-artifact@v2
-      with:
-        name: opencv-contrib-python-headless-wheels
-        path: wheelhouse/opencv_contrib_python_headless-*.whl
+        name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
+        path: wheelhouse/opencv*.whl
 
   test:
     needs: [build]
@@ -130,32 +108,10 @@ jobs:
     - name: Setup Environment variables
       run: if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
 
-    - name: Download opencv-python wheels
-      if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 0 }}
-      uses: actions/download-artifact@v2
-      with:
-        name: opencv-python-wheels
-        path: wheelhouse/
-
-    - name: Download opencv-python-headless wheels
-      if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 0 }}
-      uses: actions/download-artifact@v2
-      with:
-        name: opencv-python-headless-wheels
-        path: wheelhouse/
-
-    - name: Download opencv-contrib-python wheels
-      if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 1 }}
-      uses: actions/download-artifact@v2
-      with:
-        name: opencv-contrib-python-wheels
-        path: wheelhouse/
-
-    - name: Download opencv-contrib-python-headless wheels
-      if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 1 }}
+    - name: Download a wheel accordingly to matrix
       uses: actions/download-artifact@v2
       with:
-        name: opencv-contrib-python-headless-wheels
+        name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
         path: wheelhouse/
 
     - name: Package installation and run tests

diff --git a/.github/workflows/build_wheels_linux_arm.yml b/.github/workflows/build_wheels_linux_arm.yml
@@ -67,33 +67,11 @@ jobs:
         name: wheels
         path: wheelhouse/opencv*.whl
 
-    - name: Saving opencv-python wheels
-      if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 0 }}
+    - name: Saving a wheel accordingly to matrix
       uses: actions/upload-artifact@v2
       with:
-        name: opencv-python-wheels
-        path: wheelhouse/opencv_python-*.whl
-
-    - name: Saving opencv-python-headless wheels
-      if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 0 }}
-      uses: actions/upload-artifact@v2
-      with:
-        name: opencv-python-headless-wheels
-        path: wheelhouse/opencv_python_headless-*.whl
-
-    - name: Saving opencv-contrib-python wheels
-      if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 1 }}
-      uses: actions/upload-artifact@v2
-      with:
-        name: opencv-contrib-python-wheels
-        path: wheelhouse/opencv_contrib_python-*.whl
-
-    - name: Saving opencv-contrib-python-headless wheels
-      if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 1 }}
-      uses: actions/upload-artifact@v2
-      with:
-        name: opencv-contrib-python-headless-wheels
-        path: wheelhouse/opencv_contrib_python_headless-*.whl
+        name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
+        path: wheelhouse/opencv*.whl
 
   test:
     needs: [build_arm]
@@ -136,32 +114,10 @@ jobs:
     - name: Setup Environment variables
       run: if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
 
-    - name: Download opencv-python wheels
-      if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 0 }}
-      uses: actions/download-artifact@v2
-      with:
-        name: opencv-python-wheels
-        path: wheelhouse/
-
-    - name: Download opencv-python-headless wheels
-      if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 0 }}
-      uses: actions/download-artifact@v2
-      with:
-        name: opencv-python-headless-wheels
-        path: wheelhouse/
-
-    - name: Download opencv-contrib-python wheels
-      if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 1 }}
-      uses: actions/download-artifact@v2
-      with:
-        name: opencv-contrib-python-wheels
-        path: wheelhouse/
-
-    - name: Download opencv-contrib-python-headless wheels
-      if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 1 }}
+    - name: Download a wheel accordingly to matrix
       uses: actions/download-artifact@v2
       with:
-        name: opencv-contrib-python-headless-wheels
+        name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
         path: wheelhouse/
 
     - name: Package installation and run tests

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
@@ -94,33 +94,11 @@ jobs:
         name: wheels
         path: wheelhouse/opencv*.whl
 
-    - name: Saving opencv-python wheels
-      if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 0 }}
+    - name: Saving a wheel accordingly to matrix
       uses: actions/upload-artifact@v2
       with:
-        name: opencv-python-wheels
-        path: wheelhouse/opencv_python-*.whl
-
-    - name: Saving opencv-python-headless wheels
-      if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 0 }}
-      uses: actions/upload-artifact@v2
-      with:
-        name: opencv-python-headless-wheels
-        path: wheelhouse/opencv_python_headless-*.whl
-
-    - name: Saving opencv-contrib-python wheels
-      if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 1 }}
-      uses: actions/upload-artifact@v2
-      with:
-        name: opencv-contrib-python-wheels
-        path: wheelhouse/opencv_contrib_python-*.whl
-
-    - name: Saving opencv-contrib-python-headless wheels
-      if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 1 }}
-      uses: actions/upload-artifact@v2
-      with:
-        name: opencv-contrib-python-headless-wheels
-        path: wheelhouse/opencv_contrib_python_headless-*.whl
+        name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
+        path: wheelhouse/opencv*.whl
 
   test:
     needs: [build]
@@ -175,32 +153,10 @@ jobs:
     - name: Setup Environment variables
       run: if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
 
-    - name: Download opencv-python wheels
-      if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 0 }}
-      uses: actions/download-artifact@v2
-      with:
-        name: opencv-python-wheels
-        path: wheelhouse/
-
-    - name: Download opencv-python-headless wheels
-      if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 0 }}
-      uses: actions/download-artifact@v2
-      with:
-        name: opencv-python-headless-wheels
-        path: wheelhouse/
-
-    - name: Download opencv-contrib-python wheels
-      if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 1 }}
-      uses: actions/download-artifact@v2
-      with:
-        name: opencv-contrib-python-wheels
-        path: wheelhouse/
-
-    - name: Download opencv-contrib-python-headless wheels
-      if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 1 }}
+    - name: Download a wheel accordingly to matrix
       uses: actions/download-artifact@v2
       with:
-        name: opencv-contrib-python-headless-wheels
+        name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
         path: wheelhouse/
 
     - name: Package installation

diff --git a/.github/workflows/build_wheels_macos_m1.yml b/.github/workflows/build_wheels_macos_m1.yml
@@ -59,33 +59,11 @@ jobs:
         name: wheels
         path: wheelhouse/opencv*.whl
 
-    - name: Saving opencv-python wheels
-      if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 0 }}
+    - name: Saving a wheel accordingly to matrix
       uses: actions/upload-artifact@v2
       with:
-        name: opencv-python-wheels
-        path: wheelhouse/opencv_python-*.whl
-
-    - name: Saving opencv-python-headless wheels
-      if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 0 }}
-      uses: actions/upload-artifact@v2
-      with:
-        name: opencv-python-headless-wheels
-        path: wheelhouse/opencv_python_headless-*.whl
-
-    - name: Saving opencv-contrib-python wheels
-      if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 1 }}
-      uses: actions/upload-artifact@v2
-      with:
-        name: opencv-contrib-python-wheels
-        path: wheelhouse/opencv_contrib_python-*.whl
-
-    - name: Saving opencv-contrib-python-headless wheels
-      if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 1 }}
-      uses: actions/upload-artifact@v2
-      with:
-        name: opencv-contrib-python-headless-wheels
-        path: wheelhouse/opencv_contrib_python_headless-*.whl
+        name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
+        path: wheelhouse/opencv*.whl
 
   test:
     needs: [build]
@@ -111,32 +89,10 @@ jobs:
         submodules: true
         fetch-depth: 0
 
-    - name: Download opencv-python wheels
-      if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 0 }}
-      uses: actions/download-artifact@v2
-      with:
-        name: opencv-python-wheels
-        path: wheelhouse/
-
-    - name: Download opencv-python-headless wheels
-      if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 0 }}
-      uses: actions/download-artifact@v2
-      with:
-        name: opencv-python-headless-wheels
-        path: wheelhouse/
-
-    - name: Download opencv-contrib-python wheels
-      if: ${{ matrix.without_gui == 0 && matrix.with_contrib == 1 }}
-      uses: actions/download-artifact@v2
-      with:
-        name: opencv-contrib-python-wheels
-        path: wheelhouse/
-
-    - name: Download opencv-contrib-python-headless wheels
-      if: ${{ matrix.without_gui == 1 && matrix.with_contrib == 1 }}
+    - name: Download a wheel accordingly to matrix
       uses: actions/download-artifact@v2
       with:
-        name: opencv-contrib-python-headless-wheels
+        name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
         path: wheelhouse/
 
     - name: Package installation