Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:e2nIEE/pandapipes into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/run_tests_develop.yml
#	src/pandapipes/pf/result_extraction.py
  • Loading branch information
vogt31337 committed Jun 25, 2024
2 parents 1f0ca1e + bddfa77 commit d0581e1
Showing 1 changed file with 30 additions and 1 deletion.
31 changes: 30 additions & 1 deletion .github/workflows/run_tests_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
python -m pip install pytest igraph pytest-split
if [${{ matrix.python-version != '3.11' }}]; then python -m pip install numba; fi
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
python -m pip install git+https://github.com/e2nIEE/pandapower@master#egg=pandapower;
python -m pip install pandapower;
python -m pip install .
shell: bash
- name: List all installed packages
Expand Down Expand Up @@ -112,6 +112,35 @@ jobs:
'**.rst'
relying:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11']
os: [ ubuntu-latest, windows-latest ]
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install pytest igraph pytest-split
if [${{ matrix.python-version != '3.11' }}]; then python -m pip install numba; fi
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
python -m pip install git+https://github.com/e2nIEE/pandapower@master#egg=pandapower;
python -m pip install .
shell: bash
- name: List all installed packages
run: |
python -m pip list
- name: Test with pytest
if: ${{ matrix.python-version != '3.9' }}
run: |
python -m pytest
tutorial_tests:
runs-on: ${{ matrix.os }}
strategy:
Expand Down

0 comments on commit d0581e1

Please sign in to comment.