From d9f9b2c4e1e1dec67eff5d058e7e4c247a548808 Mon Sep 17 00:00:00 2001
From: SexyERIC0723 <haoyuwang144@gmail.com>
Date: Fri, 27 Mar 2026 18:25:54 +0000
Subject: [PATCH] fix: resolve merge conflict markers in CI workflows and
 upgrade Actions

- Resolve unmerged git conflict markers in python-app.yml and
  pythonpackage.yml by choosing the origin side (Python 3.13
  support, Poetry 2.1.2), consistent with pyproject.toml and
  merged PR #710.

- Upgrade actions/checkout from v2/v3 to v4 and
  actions/setup-python from v2/v4 to v5 across all 3 workflows.
---
 .github/workflows/black.yml         |  4 ++--
 .github/workflows/python-app.yml    | 11 ++---------
 .github/workflows/pythonpackage.yml | 12 ++----------
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml
index 01519d98..46069ed4 100644
--- a/.github/workflows/black.yml
+++ b/.github/workflows/black.yml
@@ -6,6 +6,6 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
       - uses: psf/black@stable
\ No newline at end of file
diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
index 8a078ddf..ba9d88de 100644
--- a/.github/workflows/python-app.yml
+++ b/.github/workflows/python-app.yml
@@ -15,21 +15,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python 3.13
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
-<<<<<<< HEAD
-        python-version: 3.10
-    - name: Install Poetry
-      env:
-        POETRY_VERSION: 2.0.0
-=======
         python-version: 3.13
     - name: Install Poetry
       env:
         POETRY_VERSION: 2.1.2
->>>>>>> origin
       run: |
         curl -sSL https://install.python-poetry.org | python - -y &&\
             poetry config virtualenvs.create false
diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
index 0f0c7f6f..1eda92ba 100644
--- a/.github/workflows/pythonpackage.yml
+++ b/.github/workflows/pythonpackage.yml
@@ -9,25 +9,17 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-<<<<<<< HEAD
-        python-version: ["3.10", "3.11", "3.12"]
-=======
         python-version: ["3.10", "3.11", "3.12", "3.13"]
->>>>>>> origin
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install Poetry
       env:
-<<<<<<< HEAD
-        POETRY_VERSION: 2.0.0
-=======
         POETRY_VERSION: 2.1.2
->>>>>>> origin
       run: |
         curl -sSL https://install.python-poetry.org | python - -y &&\
             poetry config virtualenvs.create false