From 35213dae06fb8147a3e1d9429c61c603512fb511 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Fri, 30 Dec 2022 17:54:27 +0400 Subject: [PATCH 1/6] Configured dependabot updates for main pip requirements --- .github/dependabot.yml | 79 +++++++++++++++++++++---- .github/workflows/build_doc.yml | 2 +- .github/workflows/dependencies.yml | 38 ++++++++++++ .github/workflows/dependency_review.yml | 17 ------ .github/workflows/mo.yml | 4 +- 5 files changed, 110 insertions(+), 30 deletions(-) create mode 100644 .github/workflows/dependencies.yml delete mode 100644 .github/workflows/dependency_review.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ef8e05d117e581..1f0954411980a9 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -2,16 +2,75 @@ version: 2 updates: - # Enable version updates for Python API + # Python API requirements - package-ecosystem: pip - directory: "/src/bindings/python" + directory: "/src/bindings/python/" schedule: - interval: weekly - day: sunday - time: "13:00" - open-pull-requests-limit: 0 - reviewers: - - jiwaszki - - akuporos + interval: "daily" + time: "09:00" + timezone: "Poland" + open-pull-requests-limit: 3 + assignees: + - "jiwaszki" + - "p-wysocki" labels: - - "category: dependencies" + - "category: dependency_changes" + versioning-strategy: increase-if-necessary + + # Model Optimizer requirements + - package-ecosystem: pip + directory: "/tools/mo" + schedule: + interval: "daily" + time: "09:00" + timezone: "Asia/Dubai" + open-pull-requests-limit: 3 + assignees: + - "rkazants" + - "andrei-kochin" + - "jiwaszki" + - "p-wysocki" + allow: + - dependency-name: "*" + dependency-type: "production" + labels: + - "category: dependency_changes" + versioning-strategy: increase-if-necessary + + # POT requirements + - package-ecosystem: pip + directory: "/tools/pot" + schedule: + interval: "daily" + time: "09:00" + timezone: "Asia/Dubai" + open-pull-requests-limit: 3 + assignees: + - "AlexKoff88" + - "KodiaqQ" + - "jiwaszki" + - "p-wysocki" + labels: + - "category: dependency_changes" + versioning-strategy: increase-if-necessary + + # PaddlePaddle tests requirements + - package-ecosystem: pip + directory: "/src/frontends/paddle/tests/" + schedule: + interval: "daily" + time: "17:40" + timezone: "Asia/Shanghai" + open-pull-requests-limit: 3 + labels: + - "category: dependency_changes" + versioning-strategy: increase-if-necessary + + # Github actions + - package-ecosystem: github-actions + directory: "/" + schedule: + interval: "daily" + time: "09:00" + timezone: "Asia/Dubai" + open-pull-requests-limit: 3 diff --git a/.github/workflows/build_doc.yml b/.github/workflows/build_doc.yml index 72b2a4e7b984d5..8cc01230d55071 100644 --- a/.github/workflows/build_doc.yml +++ b/.github/workflows/build_doc.yml @@ -25,7 +25,7 @@ jobs: lfs: true - name: Install apt-get dependencies - uses: awalsh128/cache-apt-pkgs-action@v1.1.3 + uses: awalsh128/cache-apt-pkgs-action@v1 with: packages: graphviz texlive liblua5.2-0 libclang1-9 libclang-cpp9 version: 3.0 diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml new file mode 100644 index 00000000000000..13310fc3563b99 --- /dev/null +++ b/.github/workflows/dependencies.yml @@ -0,0 +1,38 @@ +name: 'Dependencies' +on: [pull_request] + +jobs: + Review: + runs-on: ubuntu-latest + permissions: + contents: read + steps: + - name: Clone OpenVINO + uses: actions/checkout@v3 + + - name: Dependency Review + uses: actions/dependency-review-action@v3 + with: + config-file: './.github/dependency_review.yml' + + Dependabot_Approve: + runs-on: ubuntu-latest + permissions: + pull-requests: write + contents: write + if: ${{ github.actor == 'dependabot[bot]' }} + steps: + - name: Dependabot metadata + id: dependabot-metadata + uses: dependabot/fetch-metadata@v1 + with: + github-token: "${{ secrets.GITHUB_TOKEN }}" + + - name: Approve a PR for auto-merge + if: ${{ steps.dependabot-metadata.outputs.update-type == 'version-update:semver-minor' }} + run: | + gh pr review --approve "$PR_URL" + gh pr merge --auto --squash "$PR_URL" + env: + PR_URL: ${{ github.event.pull_request.html_url }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/dependency_review.yml b/.github/workflows/dependency_review.yml deleted file mode 100644 index 8e93de51b5c767..00000000000000 --- a/.github/workflows/dependency_review.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: 'Dependency Review' -on: [pull_request] - -permissions: - contents: read - -jobs: - dependency-review: - runs-on: ubuntu-latest - steps: - - name: Clone OpenVINO - uses: actions/checkout@v3 - - - name: Dependency Review - uses: actions/dependency-review-action@v3 - with: - config-file: './.github/dependency_review.yml' diff --git a/.github/workflows/mo.yml b/.github/workflows/mo.yml index 330a4e63573635..e32acd0d346958 100644 --- a/.github/workflows/mo.yml +++ b/.github/workflows/mo.yml @@ -3,14 +3,14 @@ on: push: paths: - 'openvino/tools/mo/**' - - '.github/workflows/mo.py' + - '.github/workflows/mo.yml' branches: - 'master' - 'releases/**' pull_request: paths: - 'openvino/tools/mo/**' - - '.github/workflows/mo.py' + - '.github/workflows/mo.yml' concurrency: group: ${{ github.workflow }}-${{ github.ref }} From 5fcd6444976127149538e96a47b824ece4a9136e Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Fri, 30 Dec 2022 18:06:01 +0400 Subject: [PATCH 2/6] Fixed MO working directory --- .github/workflows/dependencies.yml | 38 ------------------------- .github/workflows/dependency_review.yml | 17 +++++++++++ .github/workflows/mo.yml | 4 +-- 3 files changed, 19 insertions(+), 40 deletions(-) delete mode 100644 .github/workflows/dependencies.yml create mode 100644 .github/workflows/dependency_review.yml diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml deleted file mode 100644 index 13310fc3563b99..00000000000000 --- a/.github/workflows/dependencies.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: 'Dependencies' -on: [pull_request] - -jobs: - Review: - runs-on: ubuntu-latest - permissions: - contents: read - steps: - - name: Clone OpenVINO - uses: actions/checkout@v3 - - - name: Dependency Review - uses: actions/dependency-review-action@v3 - with: - config-file: './.github/dependency_review.yml' - - Dependabot_Approve: - runs-on: ubuntu-latest - permissions: - pull-requests: write - contents: write - if: ${{ github.actor == 'dependabot[bot]' }} - steps: - - name: Dependabot metadata - id: dependabot-metadata - uses: dependabot/fetch-metadata@v1 - with: - github-token: "${{ secrets.GITHUB_TOKEN }}" - - - name: Approve a PR for auto-merge - if: ${{ steps.dependabot-metadata.outputs.update-type == 'version-update:semver-minor' }} - run: | - gh pr review --approve "$PR_URL" - gh pr merge --auto --squash "$PR_URL" - env: - PR_URL: ${{ github.event.pull_request.html_url }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/dependency_review.yml b/.github/workflows/dependency_review.yml new file mode 100644 index 00000000000000..8e93de51b5c767 --- /dev/null +++ b/.github/workflows/dependency_review.yml @@ -0,0 +1,17 @@ +name: 'Dependency Review' +on: [pull_request] + +permissions: + contents: read + +jobs: + dependency-review: + runs-on: ubuntu-latest + steps: + - name: Clone OpenVINO + uses: actions/checkout@v3 + + - name: Dependency Review + uses: actions/dependency-review-action@v3 + with: + config-file: './.github/dependency_review.yml' diff --git a/.github/workflows/mo.yml b/.github/workflows/mo.yml index e32acd0d346958..330a4e63573635 100644 --- a/.github/workflows/mo.yml +++ b/.github/workflows/mo.yml @@ -3,14 +3,14 @@ on: push: paths: - 'openvino/tools/mo/**' - - '.github/workflows/mo.yml' + - '.github/workflows/mo.py' branches: - 'master' - 'releases/**' pull_request: paths: - 'openvino/tools/mo/**' - - '.github/workflows/mo.yml' + - '.github/workflows/mo.py' concurrency: group: ${{ github.workflow }}-${{ github.ref }} From 386b785fa723976b880e4566d669d60710c4d811 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Wed, 4 Jan 2023 02:56:04 +0400 Subject: [PATCH 3/6] Update .github/workflows/build_doc.yml --- .github/dependabot.yml | 142 +++++++++++++++++++++++++++++--- .github/workflows/build_doc.yml | 2 +- 2 files changed, 132 insertions(+), 12 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 1f0954411980a9..5793fa8a93c3fe 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -2,6 +2,10 @@ version: 2 updates: + # + # Python product dependencies + # + # Python API requirements - package-ecosystem: pip directory: "/src/bindings/python/" @@ -13,8 +17,7 @@ updates: assignees: - "jiwaszki" - "p-wysocki" - labels: - - "category: dependency_changes" + - "rkazants" versioning-strategy: increase-if-necessary # Model Optimizer requirements @@ -33,8 +36,6 @@ updates: allow: - dependency-name: "*" dependency-type: "production" - labels: - - "category: dependency_changes" versioning-strategy: increase-if-necessary # POT requirements @@ -50,22 +51,138 @@ updates: - "KodiaqQ" - "jiwaszki" - "p-wysocki" - labels: - - "category: dependency_changes" + - "rkazants" versioning-strategy: increase-if-necessary - # PaddlePaddle tests requirements + # benchmark_tool requirements + - package-ecosystem: pip + directory: "/tools/benchmark_tool" + schedule: + interval: "daily" + time: "09:00" + timezone: "Asia/Dubai" + open-pull-requests-limit: 3 + assignees: + - "Wovchena" + - "jiwaszki" + - "p-wysocki" + - "rkazants" + versioning-strategy: increase-if-necessary + + # + # Tests requirements for frontends + # + + # PaddlePaddle FE tests requirements - package-ecosystem: pip directory: "/src/frontends/paddle/tests/" schedule: interval: "daily" - time: "17:40" + time: "09:00" timezone: "Asia/Shanghai" open-pull-requests-limit: 3 - labels: - - "category: dependency_changes" + assignees: + - "ceciliapeng2011" + - "meiyang-intel" + - "jiwaszki" + - "p-wysocki" + - "rkazants" versioning-strategy: increase-if-necessary + # ONNX FE tests requirements + - package-ecosystem: pip + directory: "/src/frontends/onnx/tests/" + schedule: + interval: "daily" + time: "09:00" + timezone: "Poland" + open-pull-requests-limit: 3 + assignees: + - "mbencer" + - "tomdol" + - "jiwaszki" + - "p-wysocki" + - "rkazants" + versioning-strategy: increase-if-necessary + + # TensorFlow FE tests requirements + - package-ecosystem: pip + directory: "/src/frontends/tensorflow/tests/" + schedule: + interval: "daily" + time: "09:00" + timezone: "Asia/Dubai" + open-pull-requests-limit: 3 + assignees: + - "rkazants" + - "jiwaszki" + - "p-wysocki" + versioning-strategy: increase-if-necessary + + # + # Python Samples + # + + - package-ecosystem: pip + directory: "/samples/python/hello_reshape_ssd/" + schedule: + interval: "daily" + time: "09:00" + timezone: "Asia/Dubai" + open-pull-requests-limit: 3 + assignees: + - "Wovchena" + - "jiwaszki" + - "p-wysocki" + - "rkazants" + versioning-strategy: increase-if-necessary + + - package-ecosystem: pip + directory: "/samples/python/classification_sample_async/" + schedule: + interval: "daily" + time: "09:00" + timezone: "Asia/Dubai" + open-pull-requests-limit: 3 + assignees: + - "Wovchena" + - "jiwaszki" + - "p-wysocki" + - "rkazants" + versioning-strategy: increase-if-necessary + + - package-ecosystem: pip + directory: "/samples/python/benchmark/bert_benchmark/" + schedule: + interval: "daily" + time: "09:00" + timezone: "Asia/Dubai" + open-pull-requests-limit: 3 + assignees: + - "Wovchena" + - "jiwaszki" + - "p-wysocki" + - "rkazants" + versioning-strategy: increase-if-necessary + + - package-ecosystem: pip + directory: "/samples/python/hello_classification/" + schedule: + interval: "daily" + time: "09:00" + timezone: "Asia/Dubai" + open-pull-requests-limit: 3 + assignees: + - "Wovchena" + - "jiwaszki" + - "p-wysocki" + - "rkazants" + versioning-strategy: increase-if-necessary + + # + # Github actions - CI + # + # Github actions - package-ecosystem: github-actions directory: "/" @@ -73,4 +190,7 @@ updates: interval: "daily" time: "09:00" timezone: "Asia/Dubai" - open-pull-requests-limit: 3 + assignees: + - "ilyachur" + - "ilya-lavrenov" + open-pull-requests-limit: 3 \ No newline at end of file diff --git a/.github/workflows/build_doc.yml b/.github/workflows/build_doc.yml index 8cc01230d55071..72b2a4e7b984d5 100644 --- a/.github/workflows/build_doc.yml +++ b/.github/workflows/build_doc.yml @@ -25,7 +25,7 @@ jobs: lfs: true - name: Install apt-get dependencies - uses: awalsh128/cache-apt-pkgs-action@v1 + uses: awalsh128/cache-apt-pkgs-action@v1.1.3 with: packages: graphviz texlive liblua5.2-0 libclang1-9 libclang-cpp9 version: 3.0 From 62989385ff03004eaf8e164693c78f2422119230 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Jan 2023 11:25:46 +0000 Subject: [PATCH 4/6] pip(deps): bump urllib3 from 1.26.5 to 1.26.13 (#62) Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.5 to 1.26.13. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](https://github.com/urllib3/urllib3/compare/1.26.5...1.26.13) --- updated-dependencies: - dependency-name: urllib3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 459715b6e812ed..8f0408ba4c806f 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -42,5 +42,5 @@ sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 toml==0.10.2 -urllib3==1.26.5 +urllib3==1.26.13 zipp==3.4.1 From 1a6ef6f62265d0c85e59b6d40585a6bf1901997c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Jan 2023 11:25:56 +0000 Subject: [PATCH 5/6] pip(deps): bump six from 1.15.0 to 1.16.0 (#60) Bumps [six](https://github.com/benjaminp/six) from 1.15.0 to 1.16.0. - [Release notes](https://github.com/benjaminp/six/releases) - [Changelog](https://github.com/benjaminp/six/blob/master/CHANGES) - [Commits](https://github.com/benjaminp/six/compare/1.15.0...1.16.0) --- updated-dependencies: - dependency-name: six dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 8f0408ba4c806f..6a5e420dd7b789 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -27,7 +27,7 @@ pytest-metadata==1.11.0 py>=1.9.0 pytz==2021.1 requests==2.25.1 -six==1.15.0 +six==1.16.0 snowballstemmer==2.1.0 soupsieve==2.2.1 sphinx==4.5.0 From 3e7b789a0e18d8088635e573fc122f4b0ab63a07 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Jan 2023 11:26:17 +0000 Subject: [PATCH 6/6] pip(deps): bump imagesize from 1.2.0 to 1.4.1 (#70) Bumps [imagesize](https://github.com/shibukawa/imagesize_py) from 1.2.0 to 1.4.1. - [Release notes](https://github.com/shibukawa/imagesize_py/releases) - [Commits](https://github.com/shibukawa/imagesize_py/compare/1.2.0...1.4.1) --- updated-dependencies: - dependency-name: imagesize dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/dependabot.yml | 2 +- docs/requirements.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 5793fa8a93c3fe..f3b9703c67f2f7 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -193,4 +193,4 @@ updates: assignees: - "ilyachur" - "ilya-lavrenov" - open-pull-requests-limit: 3 \ No newline at end of file + open-pull-requests-limit: 3 diff --git a/docs/requirements.txt b/docs/requirements.txt index 6a5e420dd7b789..459715b6e812ed 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -27,7 +27,7 @@ pytest-metadata==1.11.0 py>=1.9.0 pytz==2021.1 requests==2.25.1 -six==1.16.0 +six==1.15.0 snowballstemmer==2.1.0 soupsieve==2.2.1 sphinx==4.5.0 @@ -42,5 +42,5 @@ sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 toml==0.10.2 -urllib3==1.26.13 +urllib3==1.26.5 zipp==3.4.1