Merge branch 'main' into feature/2025.1

shiguredo · Jan 8, 2025 · 7b9bae9 · 7b9bae9
2 parents a9a2bae + 1fa18b6
commit 7b9bae9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -19,7 +19,9 @@ jobs:
   e2e_test_ubuntu:
     strategy:
       matrix:
-        python_version: ["3.10", "3.11", "3.12", "3.13"]
+        # mediapipe が Python 3.13 に対応していない
+        # python_version: ["3.10", "3.11", "3.12", "3.13"]
+        python_version: ["3.10", "3.11", "3.12"]
         os: ["ubuntu-22.04", "ubuntu-24.04"]
     runs-on: ${{ matrix.os}}
     timeout-minutes: 15
@@ -49,7 +51,9 @@ jobs:
   e2e_test_macos:
     strategy:
       matrix:
-        python_version: ["3.10", "3.11", "3.12", "3.13"]
+        # mediapipe が Python 3.13 に対応していない
+        # python_version: ["3.10", "3.11", "3.12", "3.13"]
+        python_version: ["3.10", "3.11", "3.12"]
         # macos-13 は test_macos.py が上手くテストが動かないのでスキップ
         os: ["macos-14", "macos-15"]
     runs-on: ${{ matrix.os }}
@@ -76,6 +80,8 @@ jobs:
   e2e_test_windows:
     strategy:
       matrix:
+        # mediapipe が Python 3.13 に対応していない
+        # python_version: ["3.10", "3.11", "3.12"]
         python_version: ["3.10", "3.11", "3.12", "3.13"]
     runs-on: windows-2022
     timeout-minutes: 15
@@ -129,4 +135,4 @@ jobs:
           SLACK_COLOR: danger
           SLACK_TITLE: "FAILED"
           SLACK_ICON_EMOJI: ":japanese_ogre:"
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}  
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}  
diff --git a/CHANGES.md b/CHANGES.md
@@ -17,5 +17,3 @@
   - @voluntas
 - [CHANGE] E2E テスト成功時に slack 通知をしないようにする
   - @voluntas
-- [ADD] E2E テストに Python 3.13 を追加
-  - @voluntas