Skip to content

Commit

Permalink
Merge pull request #586 from e2nIEE/release_0.9.0
Browse files Browse the repository at this point in the history
bug in release yml fixed
  • Loading branch information
SimonRubenDrauz committed Dec 22, 2023
2 parents e17a338 + b1c734c commit f272c0d
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 17 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ jobs:
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 [${{ matrix.python-version != '3.11' }}]; then python -m pip install numba; fi
shell: bash
- name: Install pandapipes from TestPyPI
if: ${{ inputs.upload_server == 'testpypi'}}
run: |
Expand Down
19 changes: 11 additions & 8 deletions .github/workflows/run_tests_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ on:

jobs:
build:

runs-on: ubuntu-latest
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 }}
Expand All @@ -29,10 +29,11 @@ jobs:
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 [${{ 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@develop#egg=pandapower
python -m pip install .
shell: bash
- name: List all installed packages
run: |
python -m pip list
Expand All @@ -52,12 +53,11 @@ jobs:
verbose: true

linting:

runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: ['3.10']

os: [ ubuntu-latest, windows-latest ]
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -71,6 +71,7 @@ jobs:
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
python -m pip install git+https://github.com/e2nIEE/pandapower@develop#egg=pandapower
python -m pip install .
shell: bash
- name: List all installed packages
run: |
python -m pip list
Expand All @@ -84,10 +85,11 @@ jobs:
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
tutorial_tests:
runs-on: ubuntu-latest
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 }}
Expand All @@ -98,10 +100,11 @@ jobs:
run: |
python -m pip install --upgrade pip
python -m pip install pytest nbmake pytest-xdist pytest-split igraph
if ${{ matrix.python-version != '3.11' }}; then python -m pip install numba; fi
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@develop#egg=pandapower
python -m pip install .
shell: bash
- name: List all installed packages
run: |
python -m pip list
Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/run_tests_master.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions

# pandapipes-master branch has to work with pandapower-master branch
# pandapipes-master branch is designed to work with pandapower-master branch

name: ppipes_master

Expand All @@ -13,12 +13,11 @@ on:

jobs:
build:

runs-on: ubuntu-latest
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 }}
Expand All @@ -29,10 +28,11 @@ jobs:
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 [${{ 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
Expand All @@ -52,10 +52,11 @@ jobs:
verbose: true

tutorial_tests:
runs-on: ubuntu-latest
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 }}
Expand All @@ -66,10 +67,11 @@ jobs:
run: |
python -m pip install --upgrade pip
python -m pip install pytest nbmake pytest-xdist pytest-split igraph
if ${{ matrix.python-version != '3.11' }}; then python -m pip install numba; fi
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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

setup(
name='pandapipes',
version='0.9.0',
version='0.9.0.post1',
author='Simon Ruben Drauz-Mauel, Daniel Lohmeier, Jolando Marius Kisse',
author_email='simon.ruben.drauz-mauel@iee.fraunhofer.de, daniel.lohmeier@retoflow.de, '
'jolando.kisse@uni-kassel.de',
Expand Down

0 comments on commit f272c0d

Please sign in to comment.