Merge pull request #673 from retoflow/fix/optimize_GA

speeding up tests in GA
e2nIEE · Jan 8, 2025 · 97b73ce · 97b73ce
2 parents dc86acc + 48f3a79
commit 97b73ce
Show file tree

Hide file tree

Showing 6 changed files with 100 additions and 162 deletions.
diff --git a/.github/workflows/relying_test_on_dev_merge.yml b/.github/workflows/relying_test_on_dev_merge.yml
@@ -0,0 +1,34 @@
+# pandapipes-develop branch is designed to work with pandapower-master branch, but checks the ability to
+# work with pandapower-develop branch (relying tests, usually not required for merges) in order to avoid
+# problems in future releases
+
+name: ppipes_relying
+on:
+  pull_request:
+    types:
+      - closed
+  workflow_dispatch:
+
+jobs:
+  relying:
+    name: Relying tests
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        python-version: ['3.9', '3.10', '3.11', '3.12']
+        os:  [ ubuntu-latest, windows-latest ]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install uv
+        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          uv sync --extra test
+          uv pip install git+https://github.com/e2nIEE/pandapower@develop#egg=pandapower
+      - name: List all installed packages
+        run: |
+          uv pip list
+      - name: Test with pytest
+        run: uv run pytest -n auto
diff --git a/.github/workflows/run_tests_develop.yml b/.github/workflows/run_tests_develop.yml
@@ -2,10 +2,6 @@
 # A coverage report will be created for the Python 3.9 version
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
-# pandapipes-develop branch is designed to work with pandapower-master branch, but checks the ability to
-# work with pandapower-develop branch (relying tests, usually not required for merges) in order to avoid
-# problems in future releases
-
 name: ppipes_dev
 
 on:
@@ -15,76 +11,33 @@ on:
     branches-ignore: [ master ]
 
 jobs:
-  build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12']
-        os:  [ ubuntu-latest, windows-latest ]
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install .["all"]
-        shell: bash
-      - name: List all installed packages
-        run: |
-          python -m pip list
-      - name: Test with pytest
-        if: ${{ matrix.python-version != '3.11' }}
-        run: |
-          python -m pytest
-      - name: Test without numba
-        if: ${{ matrix.python-version == '3.11' }}
-        run: |
-          python -m pip uninstall numba -y
-          python -m pytest -n=auto
-      - name: Test with pytest and Codecov
-        if: ${{ matrix.python-version == '3.11' }}
-        run: |
-          python -m pip install pytest-cov
-          python -m pytest --cov=./ --cov-report=xml
-      - name: Upload coverage to Codecov
-        if: ${{ matrix.python-version == '3.11' }}
-        uses: codecov/codecov-action@v1
-        with:
-          verbose: true
-
-  relying:
+  tests:
+    name: Tests
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         python-version: ['3.9', '3.10', '3.11', '3.12']
         os:  [ ubuntu-latest, windows-latest ]
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+      - name: Install uv
+        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install git+https://github.com/e2nIEE/pandapower@develop#egg=pandapower
-          python -m pip install .["all"]
-        shell: bash
+        run: uv sync --extra test
       - name: List all installed packages
         run: |
-          python -m pip list
+          uv pip list
       - name: Test with pytest
         if: ${{ matrix.python-version != '3.11' }}
         run: |
-          python -m pytest
+          uv run pytest -n auto
       - name: Test with pytest and Codecov
         if: ${{ matrix.python-version == '3.11' }}
         run: |
-          python -m pip install pytest-cov
-          python -m pytest -n=auto --cov=./ --cov-report=xml
+          uv pip install pytest-cov
+          uv run pytest -n auto --cov=./ --cov-report=xml
       - name: Upload coverage to Codecov
         if: ${{ matrix.python-version == '3.11' }}
         uses: codecov/codecov-action@v4
@@ -100,87 +53,69 @@ jobs:
             'pandapipes/networks/network_files/**'
             '**.yml'
             '**.rst'
-      - name: Test without numba
-        if: ${{ matrix.python-version == '3.11' }}
-        run: |
-          python -m pip uninstall numba -y
-          python -m pytest -n=auto
 
   linting:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        python-version: ['3.11']
-        os:  [ ubuntu-latest, windows-latest ]
+    name: Linting
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+      - name: Install uv
+        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: 3.11
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
-          python -m pip install flake8
-          python -m pip install .["all"]
-        shell: bash
+          uv sync
+          uv pip install flake8
       - name: List all installed packages
         run: |
-          python -m pip list
+          uv pip list
       - name: Lint with flake8 (syntax errors and undefinded names)
         run: |
           # stop the build if there are Python syntax errors or undefined names
-          flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+          uv run flake8 . --exclude .venv --count --select=E9,F63,F7,F82 --show-source --statistics
       - name: Lint with flake8 (all errors/warnings)
         run: |
           # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-          flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+          uv run flake8 . --exclude .venv --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
 
   tutorial_tests:
+    name: Tutorial tests
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         python-version: ['3.9', '3.10', '3.11', '3.12']
         os:  [ ubuntu-latest, windows-latest ]
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+      - name: Install uv
+        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
-          python -m pip install .["all"]
-        shell: bash
+          uv sync --extra test --extra plotting
       - name: List all installed packages
         run: |
-          python -m pip list
+          uv pip list
       - name: Test with pytest
         run: |
-          python -m pytest --nbmake -n=auto "./tutorials"
+          uv sync --extra test --extra plotting
+          uv run pytest --nbmake -n auto "./tutorials"
       - name: Test without numba
         if: ${{ matrix.python-version == '3.11' }}
         run: |
-          python -m pip uninstall numba -y
-          python -m pytest --nbmake -n=auto "./tutorials"
+          uv pip uninstall numba
+          uv run pytest --nbmake -n auto "./tutorials"
 
   docs_check:
+    name: Sphinx docs check
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [ '3.11' ]
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Check docs for Python ${{ matrix.python-version }}
-        uses: e2nIEE/sphinx-action@master
+      - name: Check sphinx build
+        uses: ammaraskar/[email protected]
         with:
-          pre-build-command: "apt update && apt upgrade -y && apt install -y build-essential gfortran cmake pkg-config libopenblas-dev;
-            python -m pip install --upgrade pip;
-            python -m pip install .[docs];"
+          pre-build-command: "python -m pip install uv && uv pip install .[docs] --system --link-mode=copy"
           build-command: "sphinx-build -b html source _build -W"
           docs-folder: "doc/"
diff --git a/.github/workflows/run_tests_master.yml b/.github/workflows/run_tests_master.yml
@@ -20,27 +20,24 @@ jobs:
         os:  [ ubuntu-latest, windows-latest ]
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+      - name: Install uv
+        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install .["all"]
-        shell: bash
+        run: uv sync --extra test
       - name: List all installed packages
         run: |
-          python -m pip list
+          uv pip list
       - name: Test with pytest
         if: ${{ matrix.python-version != '3.11' }}
         run: |
-          python -m pytest
+          uv run pytest -n auto
       - name: Test with pytest, Codecov and Coverage
         if: ${{ matrix.python-version == '3.11' }}
         run: |
-          python -m pip install pytest-cov
-          python -m pytest --nbmake -n=auto --cov=./ --cov-report=xml
+          uv pip install pytest-cov
+          uv run pytest --nbmake -n auto --cov=./ --cov-report=xml
           cp ./coverage.xml ./codecov_coverage.xml
       - name: Upload coverage to Codacy
         if: ${{ matrix.python-version == '3.11' && matrix.os == 'ubuntu-latest'}}
@@ -63,12 +60,6 @@ jobs:
             'pandapipes/networks/network_files/**'
             '**.yml'
             '**.rst'
-      - name: Test without numba
-        if: ${{ matrix.python-version == '3.11' }}
-        run: |
-          python -m pip uninstall numba -y
-          python -m pytest -n=auto
-
 
   relying:
     runs-on: ${{ matrix.os }}
@@ -78,74 +69,59 @@ jobs:
         os:  [ ubuntu-latest, windows-latest ]
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+      - name: Install uv
+        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
-          python -m pip install .["all"]
-        shell: bash
+          uv sync --extra test
+          uv pip install git+https://github.com/e2nIEE/pandapower@develop#egg=pandapower
       - name: List all installed packages
         run: |
-          python -m pip list
+          uv pip list
       - name: Test with pytest
-        # if: ${{ matrix.python-version != '3.11' }}
-        run: |
-          python -m pytest -n=auto
-      - name: Test without numba
-        if: ${{ matrix.python-version == '3.11' }}
+        if: ${{ matrix.python-version != '3.11' }}
         run: |
-          python -m pip uninstall numba -y
-          python -m pytest -n=auto
+          uv run pytest -n auto
 
   tutorial_tests:
+    name: Tutorial tests
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         python-version: ['3.9', '3.10', '3.11', '3.12']
         os:  [ ubuntu-latest, windows-latest ]
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+      - name: Install uv
+        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
-          python -m pip install .["all"]
-        shell: bash
+          uv sync --extra test --extra plotting
       - name: List all installed packages
         run: |
-          python -m pip list
+          uv pip list
       - name: Test with pytest
         run: |
-          python -m pytest --nbmake -n=auto "./tutorials"
+          uv run pytest --nbmake -n auto "./tutorials"
       - name: Test without numba
         if: ${{ matrix.python-version == '3.11' }}
         run: |
-          python -m pip uninstall numba -y
-          python -m pytest --nbmake -n=auto "./tutorials"
+          uv pip uninstall numba
+          uv run pytest --nbmake -n auto "./tutorials"
 
 
   docs_check:
+    name: Sphinx docs check
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [ '3.11' ]
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Check docs for Python ${{ matrix.python-version }}
-        uses: e2nIEE/sphinx-action@master
+      - name: Check sphinx build
+        uses: ammaraskar/[email protected]
         with:
-          pre-build-command: "apt update && apt upgrade -y && apt install -y build-essential gfortran cmake pkg-config libopenblas-dev;
-            python -m pip install --upgrade pip;
-            python -m pip install .[docs];"
+          pre-build-command: "python -m pip install uv && uv pip install .[docs] --system --link-mode=copy"
           build-command: "sphinx-build -b html source _build -W"
           docs-folder: "doc/"