Skip to content

Commit

Permalink
Merge branch 'develop' into chore/python_3_8_eol
Browse files Browse the repository at this point in the history
  • Loading branch information
dlohmeier authored Aug 20, 2024
2 parents f15ca1d + cc074ed commit b865134
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/run_tests_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
# 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-develop branch
# 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

Expand Down Expand Up @@ -30,7 +32,6 @@ jobs:
python -m pip install --upgrade pip
python -m pip install pytest pytest-split
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
python -m pip install pandapower
python -m pip install .
shell: bash
- name: List all installed packages
Expand Down Expand Up @@ -121,7 +122,6 @@ jobs:
python -m pip install --upgrade pip
python -m pip install flake8
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 .["all"]
shell: bash
- name: List all installed packages
Expand Down Expand Up @@ -153,7 +153,6 @@ jobs:
python -m pip install --upgrade pip
python -m pip install pytest==8.0.2 nbmake pytest-xdist pytest-split
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 .["all"]
shell: bash
- name: List all installed packages
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/run_tests_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ jobs:
python -m pip install --upgrade pip
python -m pip install pytest pytest-split
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
python -m pip install pandapower;
python -m pip install .["all"]
shell: bash
- name: List all installed packages
Expand Down

0 comments on commit b865134

Please sign in to comment.