Resolve CI/CD branch conflicts

.gitea/workflows/ci-cd.yml

@@ -46,24 +46,21 @@ jobs:
           git config --global http.lowSpeedLimit 0
           git config --global http.lowSpeedTime 999999
 
-      - name: Set up Python ${{ matrix.python-version }}
+      - name: Set up uv & Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: astral-sh/setup-uv@v5
         with:
           python-version: ${{ matrix.python-version }}
-
+          activate-environment: true
-      - name: Cache pip dependencies
+          enable-cache: true
-        uses: actions/cache@v3
+          cache-dependency-glob: |
-        with:
+            requirements.txt
-          path: ~/.cache/pip
+            requirements-test.txt
-          key: ${{ runner.os }}-py${{ matrix.python-version }}-pip-${{ hashFiles('requirements.txt', 'requirements-test.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-py${{ matrix.python-version }}-pip-
 
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip setuptools wheel
+          uv pip install --upgrade setuptools wheel
-          pip install -r requirements.txt
+          uv pip install -r requirements.txt
-          pip install -r requirements-test.txt
+          uv pip install -r requirements-test.txt
 
       - name: Create test configuration
         run: |
@@ -81,7 +78,7 @@ jobs:
 
       - name: Run unit tests with coverage
         run: |
-          pytest test_pterodisbot.py \
+          python -m pytest test_pterodisbot.py \
             -v \
             --tb=short \
             --cov=pterodisbot \
@@ -118,15 +115,17 @@ jobs:
           git config --global http.lowSpeedLimit 0
           git config --global http.lowSpeedTime 999999
 
-      - name: Set up Python
+      - name: Set up uv & Python
-        uses: actions/setup-python@v4
+        uses: astral-sh/setup-uv@v5
         with:
           python-version: '3.12'
+          activate-environment: true
+          enable-cache: true
 
       - name: Install linting tools
         run: |
-          python -m pip install --upgrade pip
+          uv pip install --upgrade setuptools wheel
-          pip install flake8 pylint black isort mypy
+          uv pip install flake8 pylint black isort mypy
 
       - name: Run flake8
         run: |
@@ -190,15 +189,17 @@ jobs:
           git config --global http.lowSpeedLimit 0
           git config --global http.lowSpeedTime 999999
 
-      - name: Set up Python
+      - name: Set up uv & Python
-        uses: actions/setup-python@v4
+        uses: astral-sh/setup-uv@v5
         with:
           python-version: '3.12'
+          activate-environment: true
+          enable-cache: true
 
       - name: Install security tools
         run: |
-          python -m pip install --upgrade pip
+          uv pip install --upgrade setuptools wheel
-          pip install bandit safety pip-audit
+          uv pip install bandit safety pip-audit
 
       - name: Run bandit security scan
         run: |
@@ -211,7 +212,7 @@ jobs:
 
       - name: Run safety dependency check
         run: |
-          pip install -r requirements.txt
+          uv pip install -r requirements.txt
           safety check --json --output safety-report.json || true
         continue-on-error: true
 
@@ -248,22 +249,21 @@ jobs:
           git config --global http.lowSpeedLimit 0
           git config --global http.lowSpeedTime 999999
 
-      - name: Set up Python
+      - name: Set up uv & Python
-        uses: actions/setup-python@v4
+        uses: astral-sh/setup-uv@v5
         with:
           python-version: '3.12'
-
+          activate-environment: true
-      - name: Cache dependencies
+          enable-cache: true
-        uses: actions/cache@v3
+          cache-dependency-glob: |
-        with:
+            requirements.txt
-          path: ~/.cache/pip
+            requirements-test.txt
-          key: ${{ runner.os }}-pip-integration-${{ hashFiles('requirements.txt') }}
 
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
+          uv pip install --upgrade setuptools wheel
-          pip install -r requirements.txt
+          uv pip install -r requirements.txt
-          pip install -r requirements-test.txt
+          uv pip install -r requirements-test.txt
 
       - name: Create test configuration
         run: |
@@ -281,7 +281,7 @@ jobs:
 
       - name: Run integration tests
         run: |
-          pytest test_pterodisbot.py::TestIntegration \
+          python -m pytest test_pterodisbot.py::TestIntegration \
             -v \
             --tb=short \
             --timeout=60