From 28f54e60c817f09cf196c1c5b52bb8268d4a61a4 Mon Sep 17 00:00:00 2001 From: Vladimir Semenov Date: Fri, 31 Mar 2023 10:11:36 +0300 Subject: [PATCH 1/7] Change upload command --- .github/workflows/build_wheels_linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml index 52c2a25a..6004c486 100644 --- a/.github/workflows/build_wheels_linux.yml +++ b/.github/workflows/build_wheels_linux.yml @@ -197,4 +197,4 @@ jobs: - 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_* wheelhouse/opencv-* + TWINE_PASSWORD=${{ secrets.PYPI_PASSWORD }} TWINE_USERNAME=${{ secrets.PYPI_USERNAME }} python -m twine upload --repository-url ${{ secrets.PYPI_REPOSITORY }} --skip-existing wheelhouse/opencv_* wheelhouse/opencv-* From 0a2dcd078731c89ffb793cc870ff245182e7e8bb Mon Sep 17 00:00:00 2001 From: Vladimir Semenov Date: Fri, 31 Mar 2023 10:29:12 +0300 Subject: [PATCH 2/7] Add build dependencies --- .github/workflows/build_wheels_linux.yml | 42 ++++++++++++++++++++++++ setup.py | 8 ++--- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml index 6004c486..2b473eff 100644 --- a/.github/workflows/build_wheels_linux.yml +++ b/.github/workflows/build_wheels_linux.yml @@ -56,6 +56,48 @@ jobs: if [[ "${{ github.event_name }}" == "schedule" || "${{ github.event_name }}" == "workflow_dispatch" ]]; then echo "ENABLE_ROLLING=1" >> $GITHUB_ENV fi + - name: Install dependencies + run: | + apt-get update && \ + apt-get dist-upgrade -y --autoremove && \ + apt-get install -y \ + build-essential \ + cmake \ + git \ + gfortran \ + python3.8-dev \ + python3-pip \ + libatlas-base-dev \ + libavcodec-dev \ + libavformat-dev \ + libavresample-dev \ + libdc1394-22-dev \ + libeigen3-dev \ + libglew-dev \ + libgstreamer-plugins-base1.0-dev \ + libgstreamer-plugins-good1.0-dev \ + libgstreamer1.0-dev \ + libjpeg-dev \ + libjpeg8-dev \ + libjpeg-turbo8-dev \ + liblapack-dev \ + liblapacke-dev \ + libopenblas-dev \ + libpng-dev \ + libpostproc-dev \ + libswscale-dev \ + libtbb-dev \ + libtbb2 \ + libtiff-dev \ + libv4l-dev \ + libxine2-dev \ + libxvidcore-dev \ + libx264-dev \ + pkg-config \ + qv4l2 \ + v4l-utils \ + zlib1g-dev + - name: Checkout uses: actions/checkout@v3 with: diff --git a/setup.py b/setup.py index 5c711faf..5252c263 100644 --- a/setup.py +++ b/setup.py @@ -76,16 +76,16 @@ def main(): # https://stackoverflow.com/questions/1405913/python-32bit-or-64bit-mode is64 = sys.maxsize > 2 ** 32 - package_name = "opencv-python-iv" + package_name = "opencv-python-gst" if build_contrib and not build_headless: - package_name = "opencv-contrib-python-iv" + package_name = "opencv-contrib-python-gst" if build_contrib and build_headless: - package_name = "opencv-contrib-python-headless-iv" + package_name = "opencv-contrib-python-headless-gst" if build_headless and not build_contrib: - package_name = "opencv-python-headless-iv" + package_name = "opencv-python-headless-gst" if build_rolling: package_name += "-rolling" From a75fd4d605e27d4a8ee515812e9b05ec46741813 Mon Sep 17 00:00:00 2001 From: Vladimir Semenov Date: Fri, 31 Mar 2023 10:31:44 +0300 Subject: [PATCH 3/7] Give sudo to workflow --- .github/workflows/build_wheels_linux.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml index 2b473eff..05bd44e1 100644 --- a/.github/workflows/build_wheels_linux.yml +++ b/.github/workflows/build_wheels_linux.yml @@ -58,9 +58,9 @@ jobs: fi - name: Install dependencies run: | - apt-get update && \ - apt-get dist-upgrade -y --autoremove && \ - apt-get install -y \ + sudo apt-get update && \ + sudo apt-get dist-upgrade -y --autoremove && \ + sudo apt-get install -y \ build-essential \ cmake \ git \ From eb666cbef5f652af0f552bb6832ffc084d734a3a Mon Sep 17 00:00:00 2001 From: Vladimir Semenov Date: Fri, 31 Mar 2023 11:03:54 +0300 Subject: [PATCH 4/7] Give sudo to everything --- .github/workflows/build_wheels_linux.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml index 05bd44e1..89435c65 100644 --- a/.github/workflows/build_wheels_linux.yml +++ b/.github/workflows/build_wheels_linux.yml @@ -56,6 +56,11 @@ jobs: if [[ "${{ github.event_name }}" == "schedule" || "${{ github.event_name }}" == "workflow_dispatch" ]]; then echo "ENABLE_ROLLING=1" >> $GITHUB_ENV fi + - name: Checkout + uses: actions/checkout@v3 + with: + submodules: false + fetch-depth: 0 - name: Install dependencies run: | sudo apt-get update && \ @@ -97,14 +102,8 @@ jobs: qv4l2 \ v4l-utils \ zlib1g-dev - - - name: Checkout - uses: actions/checkout@v3 - with: - submodules: false - fetch-depth: 0 - name: Build a package - run: source scripts/build.sh + run: sudo source scripts/build.sh - name: Saving all wheels uses: actions/upload-artifact@v3 with: From 1c21e6d5a2c24c3e1dd45ce3a47e7c9532c2669d Mon Sep 17 00:00:00 2001 From: Vladimir Semenov Date: Fri, 31 Mar 2023 16:29:27 +0300 Subject: [PATCH 5/7] Change baseline --- .github/workflows/build_wheels_linux.yml | 43 +----------------------- 1 file changed, 1 insertion(+), 42 deletions(-) diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml index 89435c65..576abaaa 100644 --- a/.github/workflows/build_wheels_linux.yml +++ b/.github/workflows/build_wheels_linux.yml @@ -39,7 +39,7 @@ jobs: MB_ML_VER: 2014 TRAVIS_BUILD_DIR: ${{ github.workspace }} CONFIG_PATH: travis_config.sh - DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20230117 + DOCKER_IMAGE: ghcr.io/invian/gstreamer_opencv_baseline:1.0.0 USE_CCACHE: 0 UNICODE_WIDTH: 32 PLAT: x86_64 @@ -61,47 +61,6 @@ jobs: with: submodules: false fetch-depth: 0 - - name: Install dependencies - run: | - sudo apt-get update && \ - sudo apt-get dist-upgrade -y --autoremove && \ - sudo apt-get install -y \ - build-essential \ - cmake \ - git \ - gfortran \ - python3.8-dev \ - python3-pip \ - libatlas-base-dev \ - libavcodec-dev \ - libavformat-dev \ - libavresample-dev \ - libdc1394-22-dev \ - libeigen3-dev \ - libglew-dev \ - libgstreamer-plugins-base1.0-dev \ - libgstreamer-plugins-good1.0-dev \ - libgstreamer1.0-dev \ - libjpeg-dev \ - libjpeg8-dev \ - libjpeg-turbo8-dev \ - liblapack-dev \ - liblapacke-dev \ - libopenblas-dev \ - libpng-dev \ - libpostproc-dev \ - libswscale-dev \ - libtbb-dev \ - libtbb2 \ - libtiff-dev \ - libv4l-dev \ - libxine2-dev \ - libxvidcore-dev \ - libx264-dev \ - pkg-config \ - qv4l2 \ - v4l-utils \ - zlib1g-dev - name: Build a package run: sudo source scripts/build.sh - name: Saving all wheels From 386c8ae3ebb333353bc518b678290978f20f3518 Mon Sep 17 00:00:00 2001 From: Vladimir Semenov Date: Fri, 31 Mar 2023 16:31:36 +0300 Subject: [PATCH 6/7] Remove sudo --- .github/workflows/build_wheels_linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml index 576abaaa..94ffec92 100644 --- a/.github/workflows/build_wheels_linux.yml +++ b/.github/workflows/build_wheels_linux.yml @@ -62,7 +62,7 @@ jobs: submodules: false fetch-depth: 0 - name: Build a package - run: sudo source scripts/build.sh + run: source scripts/build.sh - name: Saving all wheels uses: actions/upload-artifact@v3 with: From a68781153891d6d28d3b145a9d3901c1524c6d56 Mon Sep 17 00:00:00 2001 From: Vladimir Semenov Date: Fri, 31 Mar 2023 16:57:49 +0300 Subject: [PATCH 7/7] Change baseline --- .github/workflows/build_wheels_linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml index 94ffec92..5ad05a5b 100644 --- a/.github/workflows/build_wheels_linux.yml +++ b/.github/workflows/build_wheels_linux.yml @@ -39,7 +39,7 @@ jobs: MB_ML_VER: 2014 TRAVIS_BUILD_DIR: ${{ github.workspace }} CONFIG_PATH: travis_config.sh - DOCKER_IMAGE: ghcr.io/invian/gstreamer_opencv_baseline:1.0.0 + DOCKER_IMAGE: invian/opencv-gst-baseline:latest USE_CCACHE: 0 UNICODE_WIDTH: 32 PLAT: x86_64