From f7a04468dd20c00f61b7cac9b7aecef4230f99c7 Mon Sep 17 00:00:00 2001 From: Yunchu Lee Date: Wed, 28 Feb 2024 11:07:51 +0900 Subject: [PATCH 1/6] Bump mlflow version to 2.10.2 to omit XSS issue (#3000) --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 728ef0f5e9a..c46b90672c0 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -10,4 +10,4 @@ onnx==1.15.0 onnxruntime==1.14.1 pytest-csv==3.0.* tox==4.11.* -mlflow==2.9.* +mlflow==2.10.2 From 596bb34136c2066c43daf305134b4b3a14ba456a Mon Sep 17 00:00:00 2001 From: Yunchu Lee Date: Wed, 28 Feb 2024 11:11:59 +0900 Subject: [PATCH 2/6] Update codeql workflow (#3001) --- .github/workflows/codeql.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index da14d04e988..a087aa4071e 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -13,9 +13,15 @@ name: "CodeQL" on: push: - branches: ["develop", "releases/*", "v2"] + branches: + - develop + - releases + - v2 pull_request: - branches: ["develop", "releases/*", "v2"] + types: + - opened + - reopened + - synchronize schedule: - cron: "0 0 * * 0" From 26bcfc6fe38a855a3f7c30623300cc2dca14e4d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Feb 2024 11:40:21 +0900 Subject: [PATCH 3/6] Remove yapf dependency (#2987) --- requirements/action.txt | 1 - requirements/classification.txt | 1 - requirements/detection.txt | 1 - requirements/segmentation.txt | 1 - 4 files changed, 4 deletions(-) diff --git a/requirements/action.txt b/requirements/action.txt index e1de0979cf3..070d2c8ff49 100644 --- a/requirements/action.txt +++ b/requirements/action.txt @@ -4,4 +4,3 @@ mmcv-full==1.7.0 mmaction2==0.24.1 mmdet==2.28.1 mmdeploy==0.14.0 -yapf<0.40.0 # it should be removed after https://github.com/google/yapf/issues/1118 is solved diff --git a/requirements/classification.txt b/requirements/classification.txt index bfe35197d9c..2256a3e755a 100644 --- a/requirements/classification.txt +++ b/requirements/classification.txt @@ -5,4 +5,3 @@ mmcls==0.25.0 timm==0.6.12 mmdeploy==0.14.0 pytorchcv==0.0.67 -yapf<0.40.0 # it should be removed after https://github.com/google/yapf/issues/1118 is solved diff --git a/requirements/detection.txt b/requirements/detection.txt index ddcc33f1347..a2d59b4d6a3 100644 --- a/requirements/detection.txt +++ b/requirements/detection.txt @@ -8,4 +8,3 @@ timm==0.6.12 mmdeploy==0.14.0 mmengine==0.7.4 scikit-image # specifying different version w.r.t python_version is not effect -yapf<0.40.0 # it should be removed after https://github.com/google/yapf/issues/1118 is solved diff --git a/requirements/segmentation.txt b/requirements/segmentation.txt index fdda6fa9cde..48ccce21381 100644 --- a/requirements/segmentation.txt +++ b/requirements/segmentation.txt @@ -7,4 +7,3 @@ mmdeploy==0.14.0 timm==0.6.12 pytorchcv==0.0.67 einops==0.6.1 -yapf<0.40.0 # it should be removed after https://github.com/google/yapf/issues/1118 is solved From 0ea5f8ff026118ea97506ca2bb085f1070fd9bfd Mon Sep 17 00:00:00 2001 From: Yunchu Lee Date: Wed, 28 Feb 2024 15:14:39 +0900 Subject: [PATCH 4/6] Apply changes to omit artifact upload issue (#2999) --- .github/workflows/publish.yml | 7 +++++-- .github/workflows/publish_internal.yml | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c881c8f5cac..b3edd93ce64 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -19,6 +19,7 @@ jobs: uses: pypa/cibuildwheel@0ecddd92b62987d7a2ae8911f4bb8ec9e2e4496a # v2.13.1 - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 with: + name: artifact-wheels path: ./wheelhouse/*.whl build_sdist: @@ -41,6 +42,7 @@ jobs: run: python -m build --sdist - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 with: + name: artifact-sdist path: dist/*.tar.gz publish_package: @@ -52,12 +54,13 @@ jobs: packages: write steps: - name: Download artifacts - uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4.1.2 + uses: actions/download-artifact@87c55149d96e628cc2ef7e6fc2aab372015aec85 # v4.1.3 with: # unpacks default artifact into dist/ # if `name: artifact` is omitted, the action will create extra parent dir - name: artifact path: dist + pattern: artifact-* + merge-multiple: true # to determine where to publish the source distribution to PyPI or TestPyPI - name: Check tag id: check-tag diff --git a/.github/workflows/publish_internal.yml b/.github/workflows/publish_internal.yml index 2b3856557e5..9dd3c73f3ed 100644 --- a/.github/workflows/publish_internal.yml +++ b/.github/workflows/publish_internal.yml @@ -17,6 +17,7 @@ jobs: uses: pypa/cibuildwheel@0ecddd92b62987d7a2ae8911f4bb8ec9e2e4496a # v2.13.1 - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 with: + name: artifact-wheels path: ./wheelhouse/*.whl build_sdist: @@ -39,6 +40,7 @@ jobs: run: python -m build --sdist - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 with: + name: artifact-sdist path: dist/*.tar.gz publish_package: @@ -62,12 +64,13 @@ jobs: pip install --require-hashes --no-deps -r /tmp/otx-publish-requirements.txt rm /tmp/otx-publish-requirements.txt - name: Download artifacts - uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4.1.2 + uses: actions/download-artifact@87c55149d96e628cc2ef7e6fc2aab372015aec85 # v4.1.3 with: # unpacks default artifact into dist/ # if `name: artifact` is omitted, the action will create extra parent dir - name: artifact path: dist + pattern: artifact-* + merge-multiple: true - name: Check tag id: check-tag uses: actions-ecosystem/action-regex-match@9e6c4fb3d5e898f505be7a1fb6e7b0a278f6665b # v2.0.2 From 2e8b369a10130bd1e7c18e83305c1d73fcc99693 Mon Sep 17 00:00:00 2001 From: Yunchu Lee Date: Wed, 28 Feb 2024 15:20:41 +0900 Subject: [PATCH 5/6] Loose codecov failure checking threshold 0 to 1% (#2995) --- .github/codecov.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .github/codecov.yml diff --git a/.github/codecov.yml b/.github/codecov.yml new file mode 100644 index 00000000000..e152c0a9559 --- /dev/null +++ b/.github/codecov.yml @@ -0,0 +1,6 @@ +coverage: + status: + project: + default: + target: auto #default + threshold: 1% From 39dc67ca54f77a2357c70a531b03240d213b7686 Mon Sep 17 00:00:00 2001 From: Yunchu Lee Date: Thu, 29 Feb 2024 07:55:51 +0900 Subject: [PATCH 6/6] Fix weekly workflow issue (#2974) --- .github/workflows/perf-accuracy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/perf-accuracy.yml b/.github/workflows/perf-accuracy.yml index ef367a6f9d1..dc438f6ca89 100644 --- a/.github/workflows/perf-accuracy.yml +++ b/.github/workflows/perf-accuracy.yml @@ -101,4 +101,4 @@ jobs: task: ${{ matrix.task }} timeout-minutes: 8640 upload-artifact: true - artifact-prefix: ${{ inputs.perf-accuracy-benchmark }} + artifact-prefix: ${{ inputs.artifact-prefix }}