Merge pull request #742 from haoyu-haoyu/fix/ci-merge-conflicts

fix: resolve merge conflict markers in CI workflows and upgrade Actions

Author: Hananel-Hazan

.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

.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

.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