Merge branch 'master' into dependabot/pip/patool-gte-1.12-and-lt-3.1

Author: wil93

.github/workflows/main.yml

@@ -25,16 +25,26 @@ jobs:
         run: |
           docker compose -p cms -f docker-compose.test.yml run --rm testcms
 
-      - uses: codecov/codecov-action@v4
-        env:
-            CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      - name: Upload test results to Codecov
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@v1
+        with:
+          files: ./codecov/junit.xml
+          flags: unittests
+          token: ${{ secrets.CODECOV_TOKEN }}
+
+      - name: Upload unit test coverage results to Codecov
+        uses: codecov/codecov-action@v4
+        if: ${{ !cancelled() }}
         with:
           files: ./codecov/unittests.xml
           flags: unittests
+          token: ${{ secrets.CODECOV_TOKEN }}
 
-      - uses: codecov/codecov-action@v4
-        env:
-            CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      - name: Upload functional test coverage results to Codecov
+        uses: codecov/codecov-action@v4
+        if: ${{ !cancelled() }}
         with:
           files: ./codecov/functionaltests.xml
           flags: functionaltests
+          token: ${{ secrets.CODECOV_TOKEN }}

_cms-test-internal.sh

@@ -6,7 +6,7 @@ dropdb --host=testdb --username=postgres cmsdbfortesting
 createdb --host=testdb --username=postgres cmsdbfortesting
 cmsInitDB
 
-pytest --cov . --cov-report xml:codecov/unittests.xml
+pytest --cov . --cov-report xml:codecov/unittests.xml --junitxml=codecov/junit.xml -o junit_family=legacy
 UNIT=$?
 
 dropdb --host=testdb --username=postgres cmsdbfortesting

dev-requirements.txt

@@ -1,6 +1,6 @@
 # Only for testing
 beautifulsoup4>=4.8,<4.9
-coverage>=4.5,<4.6
+coverage>=4.5,<7.7
 pytest
 pytest-cov