Merge branch 'develop' into issues/2321

.github/workflows/github_test_action.yml

@@ -55,20 +55,43 @@ jobs:
         if: ${{ matrix.python-version == '3.9' }}
         run: |
           python -m pip install pytest-cov
-          python -m pytest -n=auto --nbmake --cov=./ --cov-report=xml --splits 2 --group ${{ matrix.group }}
-          cp ./coverage.xml ./codecov_coverage.xml
-      - name: Upload coverage to Codacy
-        if: ${{ matrix.python-version == '3.9'}}
-        env:
-          CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
+          python -m pytest -n=auto --cov=./ --cov-report=xml --splits 2 --group ${{ matrix.group }}
+          cp ./coverage.xml ./coverage-${{ matrix.group }}.xml
+      - name: Upload coverage as artifact
+        if: ${{ matrix.python-version == '3.9' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage-${{ matrix.group }}
+          path: ./coverage-${{ matrix.group }}.xml
+  upload-coverage:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: .
+          pattern: coverage-*
+          merge-multiple: true
+      - name: duplicate reports
         run: |
-          bash <(curl -Ls https://coverage.codacy.com/get.sh) report -r coverage.xml
+          ls -al
+          cp coverage-1.xml codacy-coverage-1.xml
+          cp coverage-2.xml codacy-coverage-2.xml
+      - name: Upload coverage to Codacy
+        continue-on-error: true
+        uses: codacy/[email protected]
+        with:
+          coverage-reports: codacy-coverage-1.xml,codacy-coverage-2.xml
+          project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
       - name: Upload coverage to Codecov
-        if: ${{ matrix.python-version == '3.9' }}
+        continue-on-error: true
         uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          file: ./codecov_coverage.xml
+          file: ./coverage-1.xml,./coverage-2.xml
           verbose: true
 
   warnings:

pyproject.toml

@@ -87,3 +87,15 @@ addopts = ["--strict-markers"]
 markers = [
   "slow: marks tests as slow (deselect with '-m \"not slow\"'), e.g. in run_fast_tests"
 ]
+
+[tool.coverage.run]
+omit = [
+    "pandapower/test/*"
+    ]
+[tool.coverage.report]
+exclude_lines = [
+    "pragma: no cover",
+    "def __repr__",
+    "def __str__",
+    "if __name__ == .__main__.:"
+]