Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release 0.11.0 #660

Merged
merged 238 commits into from
Nov 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
238 commits
Select commit Hold shift + click to select a range
7acdd48
enable multiple creation of heat exchanger
Jan 31, 2023
b5deb90
Merge pull request #1 from senergyNets/workshop
SimonRubenDrauz Jan 31, 2023
d7cc21d
adapted changelog and added doc for multiple heat exchanger
Jan 31, 2023
4efccce
Merge branch 'develop' into develop
SimonRubenDrauz Jan 31, 2023
fed9fc7
not heat pumps, but heat exchanger
Jan 31, 2023
61b54e0
Merge branch 'develop' into workshop
SimonRubenDrauz Jan 31, 2023
b393069
Merge remote-tracking branch 'origin/workshop' into workshop
Jan 31, 2023
a06532e
workshop material
Jan 31, 2023
9c954dc
workshop material
Feb 1, 2023
95e8aef
create a mutlinet simulation
Feb 1, 2023
fa26dbb
Merge remote-tracking branch 'origin/develop' into workshop
Feb 1, 2023
5664c1f
Merge remote-tracking branch 'senergy/bugfix/multiple_pumps' into dev…
Feb 1, 2023
430cab1
Merge remote-tracking branch 'senergy/bugfix/multiple_pumps' into wor…
Feb 1, 2023
9b8ecef
workshop preparation
Feb 2, 2023
938625c
Merge branch 'develop' of github:e2niee/pandapipes into develop
Feb 2, 2023
b7041d2
further workshop updates
Feb 2, 2023
2b1ebfc
starting multinet
Feb 2, 2023
dcc730f
multinet finalization
Feb 2, 2023
2caccd3
Merge remote-tracking branch 'origin/develop' into workshop
Feb 3, 2023
283face
adding projects from scratch
Feb 3, 2023
a77342a
adapting circulation pumps to be full branch components and cleaning …
Feb 8, 2023
af9a336
bugfix in retrieving qext_w
Feb 8, 2023
35928c5
- removing cp in the equations as it makes NR instable
Feb 10, 2023
fbcd13b
Merge remote-tracking branch 'senergy/workshop' into feature/circ_pum…
Feb 11, 2023
c8b5f81
removing workshop files
Jun 9, 2023
6e8f003
Merge branch 'develop' into feature/circ_pump_branch_model
SimonRubenDrauz Jun 9, 2023
64f7712
resetting setup.py
Jun 9, 2023
ef85aad
commenting build system matrix
Dec 21, 2023
394ec12
-added heat_consumer patch
EPrade Apr 11, 2024
f4e2fd6
Update CHANGELOG.rst
EPrade Apr 11, 2024
9b98afc
-fixed error
EPrade Apr 11, 2024
8d2c324
Merge branch 'heat_consumer_plotting' of https://github.com/EPrade/pa…
EPrade Apr 11, 2024
91bb6c8
-changed alpha to u
EPrade Apr 12, 2024
626218e
-changed version tag
EPrade Apr 15, 2024
b3e7f7a
Update CHANGELOG.rst
EPrade Apr 15, 2024
70d6b21
Update CHANGELOG.rst
EPrade Apr 15, 2024
c8f7632
-changed if check for alpha
EPrade Apr 15, 2024
7bedd1a
-changed if check for alpha
EPrade Apr 15, 2024
73b3cf2
Merge branch 'u_heat_coefficient' of https://github.com/EPrade/pandap…
EPrade Apr 15, 2024
fff3d88
-changed tutorials
EPrade Apr 15, 2024
dca8f9e
Update CHANGELOG.rst
EPrade Apr 15, 2024
6cc6ba9
- circulation pumps are considered as default slack nodes as well
mfranz13 Apr 17, 2024
fd28d8e
introducing bidirectional calculation
SimonRubenDrauz Apr 18, 2024
b1b987e
extraction of vdot now based on real density for incompressible media
dlohmeier Apr 19, 2024
6398261
fixed argument order of call
dlohmeier Apr 19, 2024
088072b
another wrong argument
dlohmeier Apr 19, 2024
5c6c870
avoiding one-line if-conditions
SimonRubenDrauz Apr 20, 2024
52c47c8
std method not working, removed
SimonRubenDrauz Apr 20, 2024
580593a
Merge remote-tracking branch 'origin/develop' into feature/circ_pump_…
SimonRubenDrauz Apr 22, 2024
840c2f8
merge develop and further adaptions
SimonRubenDrauz Apr 23, 2024
4fbe9cb
bugfix
SimonRubenDrauz Apr 23, 2024
8a8d94f
Merge remote-tracking branch 'pp_fork/develop' into feature/circ_pump…
SimonRubenDrauz Apr 24, 2024
feb302e
required test adaption to ensure test passing
SimonRubenDrauz Apr 24, 2024
f195ece
- no mass creation in circ pumps
SimonRubenDrauz Apr 24, 2024
96da8d4
- mass at slack as one variable
SimonRubenDrauz Apr 24, 2024
adc00fc
pandapower release fail
SimonRubenDrauz Apr 24, 2024
7cd13e8
switched from setup.py to pyproject.toml
Apr 25, 2024
25d69ae
Merge pull request #614 from mfranz13/fix/pressure_plot
mfranz13 May 6, 2024
8602dd1
fix failing tests due to hard coded pandapower geojson implementation…
dlohmeier May 7, 2024
3adb3dc
Merge branch 'develop' of github.com:e2nIEE/pandapipes into hotfix/pa…
dlohmeier May 7, 2024
b6a99b0
Merge pull request #620 from dlohmeier/hotfix/pandapower_geojson_messup
SimonRubenDrauz May 7, 2024
6844480
Merge branch 'develop' into feature/pyproject-toml
SimonRubenDrauz May 7, 2024
1ebcafd
Merge branch 'develop' into develop_sdrauz
dlohmeier May 8, 2024
5c65022
some pep
dlohmeier May 13, 2024
cadde9d
some more pep
dlohmeier May 13, 2024
2778bbc
added docs requirements to docs_check pipeline
May 15, 2024
f72d738
Merge branch 'feature/pyproject-toml' of github.com:KS-HTK/pandapipes…
May 15, 2024
688db93
updated docs/requirements.txt
May 15, 2024
7e11a5b
Merge branch 'develop' of github:e2niee/pandapipes into develop
SimonRubenDrauz May 23, 2024
b069f2a
get realistic results at circ pump tout even though they are not rele…
SimonRubenDrauz May 23, 2024
64caedb
bugfix setting infeed nodes
SimonRubenDrauz May 23, 2024
5145ac9
pressure control adaption
SimonRubenDrauz May 23, 2024
1acc41b
considering alpha in mdot as it is sensitive in bidirectional simulat…
SimonRubenDrauz May 23, 2024
a843786
added workflow trigger
mfranz13 Jun 3, 2024
780c4e5
setting text of pipes to None and assuming ambient temperature
SimonRubenDrauz Jun 4, 2024
775331a
adapting the heat consumer tests
SimonRubenDrauz Jun 4, 2024
fa0aa46
from node t and to node t are no fix entries and can be passed from a…
SimonRubenDrauz Jun 4, 2024
8648651
further adaption of heat consumer component
SimonRubenDrauz Jun 4, 2024
e0480c3
-added relying and changed build in github test actions
EPrade Jun 10, 2024
9954755
Merge remote-tracking branch 'origin/develop' into github_tests
EPrade Jun 10, 2024
930c3d4
-removed codecov from relying tests
EPrade Jun 10, 2024
81e8173
Merge pull request #632 from EPrade/github_tests
EPrade Jun 10, 2024
113757f
Merge branch 'develop' into feature/pyproject-toml
EPrade Jun 10, 2024
c327330
Merge pull request #617 from KS-HTK/feature/pyproject-toml
EPrade Jun 10, 2024
bf3d4ee
-added src syspath
EPrade Jun 11, 2024
afd9f3e
-changed readthedocs yml back
EPrade Jun 11, 2024
964ae48
Merge branch 'develop' into fix_docs
jkisse Jun 11, 2024
3e3e0ad
Merge branch 'develop' into feature/bidirectional_coupling
SimonRubenDrauz Jun 11, 2024
3b9e8d3
Merge pull request #633 from e2nIEE/fix_docs
EPrade Jun 11, 2024
270749f
Merge branch 'develop' into feature/bidirectional_coupling
SimonRubenDrauz Jun 11, 2024
0e88b46
Merge remote-tracking branch 'pp/develop' into heat_consumer_plotting
EPrade Jun 14, 2024
953b325
-changed plotting patch of heat consumer
EPrade Jun 14, 2024
91fbca0
-doc
EPrade Jun 17, 2024
ec6f723
-codecav changes
EPrade Jun 17, 2024
f162ed5
Merge branch 'develop' into heat_consumer_plotting
EPrade Jun 17, 2024
c524765
Update CHANGELOG.rst
EPrade Jun 17, 2024
4024050
Merge branch 'develop' of https://github.com/mfranz13/pandapipes into…
mfranz13 Jun 17, 2024
e6da5e5
numpy 2.0 migration
mfranz13 Jun 18, 2024
a9ea1c5
remove workflow_dispatch
mfranz13 Jun 18, 2024
93456bb
Merge pull request #634 from mfranz13/fix/numpy_release
mfranz13 Jun 19, 2024
153c908
Merge remote-tracking branch 'origin/develop' into feature/bidirectio…
SimonRubenDrauz Jun 20, 2024
bddfa77
Merge pull request #622 from retoflow/feature/bidirectional_coupling
SimonRubenDrauz Jun 20, 2024
f711d95
Merge remote-tracking branch 'origin/develop' into feature/circ_pump_…
SimonRubenDrauz Jun 20, 2024
e905d23
update test heat consumer
SimonRubenDrauz Jun 20, 2024
a5f05f6
Merge branch 'develop' into heat_consumer_plotting
EPrade Jun 24, 2024
02a01d9
introducing bidirectional calculation
SimonRubenDrauz Apr 18, 2024
70e4a6b
avoiding one-line if-conditions
SimonRubenDrauz Apr 20, 2024
e23f0cb
std method not working, removed
SimonRubenDrauz Apr 20, 2024
4e15285
fix failing tests due to hard coded pandapower geojson implementation…
dlohmeier May 7, 2024
d1a7472
- circulation pumps are considered as default slack nodes as well
mfranz13 Apr 17, 2024
8f49e8d
some pep
dlohmeier May 13, 2024
36dd492
some more pep
dlohmeier May 13, 2024
87878e6
setting text of pipes to None and assuming ambient temperature
SimonRubenDrauz Jun 4, 2024
c97fd2a
adapting the heat consumer tests
SimonRubenDrauz Jun 4, 2024
4cd74e1
from node t and to node t are no fix entries and can be passed from a…
SimonRubenDrauz Jun 4, 2024
843183a
further adaption of heat consumer component
SimonRubenDrauz Jun 4, 2024
510e04f
switched from setup.py to pyproject.toml
Apr 25, 2024
a143771
added docs requirements to docs_check pipeline
May 15, 2024
b155051
updated docs/requirements.txt
May 15, 2024
011d3b8
-added relying and changed build in github test actions
EPrade Jun 10, 2024
c7d743f
-added src syspath
EPrade Jun 11, 2024
4029bd9
-changed readthedocs yml back
EPrade Jun 11, 2024
8fa154f
added workflow trigger
mfranz13 Jun 3, 2024
ff3e509
numpy 2.0 migration
mfranz13 Jun 18, 2024
1f0ca1e
remove workflow_dispatch
mfranz13 Jun 18, 2024
d0581e1
Merge branch 'develop' of github.com:e2nIEE/pandapipes into develop
vogt31337 Jun 25, 2024
3ec84b8
fixed some merge bugs.
vogt31337 Jun 25, 2024
564f026
fixed the result extraction, seems to be broken during the rebase.
vogt31337 Jun 25, 2024
1ec4280
Merge branch 'develop' into heat_consumer_plotting
EPrade Jun 25, 2024
323d0ea
Merge pull request #609 from EPrade/heat_consumer_plotting
EPrade Jun 25, 2024
afb55d3
Merge branch 'develop' into feature/circ_pump_branch_model
dlohmeier Jun 27, 2024
103b75b
-fixed heat consumer result extraction (#636)
EPrade Jun 27, 2024
a1df0a7
Merge remote-tracking branch 'pp/develop' into u_heat_coefficient
EPrade Jun 28, 2024
0cb374e
-implemented warning changes and convert format change
EPrade Jun 28, 2024
a07f863
-added import
EPrade Jun 28, 2024
319e83c
-added tests
EPrade Jun 28, 2024
8b8b7ba
Merge pull request #612 from EPrade/u_heat_coefficient
EPrade Jul 1, 2024
314d0bf
in create_pipes_from_parameters, the check for the value of u_w_per_m…
dlohmeier Jul 2, 2024
0e48f52
-changed junction into flow junction for circ pumps
EPrade Jul 4, 2024
869a164
-wording and changelog
EPrade Jul 4, 2024
12cf554
-removed warning and moved the hint to docstring
EPrade Jul 4, 2024
5b7e42c
Merge pull request #638 from EPrade/fix/plot_pressure_drop
mfranz13 Jul 4, 2024
cb63793
Merge remote-tracking branch 'origin/develop' into feature/circ_pump_…
SimonRubenDrauz Jul 22, 2024
1991278
Merge branch 'feature/circ_pump_branch_model' of https://github.com/r…
SimonRubenDrauz Jul 22, 2024
9d6d465
convergence problems with new circ pump implementation --> increase o…
SimonRubenDrauz Jul 22, 2024
862cbab
use numpy setdiff instead of set in derivative calculation
dlohmeier Jul 23, 2024
7d3e3fd
Merge branch 'develop' into hotfix/vdot_extraction_imcompressible_rea…
dlohmeier Jul 26, 2024
ac3b77d
further adaptions for code improvement
SimonRubenDrauz Jul 26, 2024
7b09270
Merge branch 'feature/circ_pump_branch_model' of https://github.com/r…
SimonRubenDrauz Jul 26, 2024
12c8256
small doc fix as raised by issue #562 (#641)
dlohmeier Jul 30, 2024
c66fa0b
Merge branch 'develop' into hotfix/vdot_extraction_imcompressible_rea…
dlohmeier Jul 30, 2024
7afa6f6
differentiate between vdot and vdot_norm in result extraction, depend…
dlohmeier Aug 19, 2024
34bd245
added entry to CHANGELOG.rst
dlohmeier Aug 19, 2024
4a1cf98
reverted unnecessary change in stanet converter
dlohmeier Aug 20, 2024
cc074ed
github workflow for develop tests: make tutorial tests use pandapower…
dlohmeier Aug 20, 2024
b5de251
Merge branch 'develop' into hotfix/vdot_extraction_imcompressible_rea…
dlohmeier Aug 20, 2024
a143789
calculate pressure drop for compressible media based on real density …
dlohmeier Aug 20, 2024
6a012d9
in plotting toolbox: specify columns of geodata for which to calculat…
dlohmeier Aug 21, 2024
6c31746
improvement in calculation of rho_n -> usage of np.full and filling s…
dlohmeier Aug 21, 2024
1182ab8
small correction
dlohmeier Aug 21, 2024
691295f
fixed bug of transferring a wrong lookup from active pit to pit
dlohmeier Aug 22, 2024
c1e091a
-draft for t_outlet
EPrade Aug 25, 2024
a0fec55
-fixed change
EPrade Aug 25, 2024
f511146
Merge branch 'develop' into hotfix/vdot_extraction_imcompressible_rea…
dlohmeier Aug 26, 2024
671e5d3
-fixes and added other branch components
EPrade Aug 26, 2024
cc296ac
-small change and changelog
EPrade Aug 27, 2024
aac49d6
Chore: EOL of python v 3.8 (#644)
dlohmeier Aug 27, 2024
34d0bac
Merge branch 'develop' into fix/from_node_t_lookup
dlohmeier Aug 27, 2024
9f0eb54
-log conflict
EPrade Aug 27, 2024
fb8f8b5
Merge remote-tracking branch 'pp/develop' into feature/t_outlet
EPrade Aug 27, 2024
f215fb3
-conflict fix
EPrade Aug 27, 2024
66a6670
Merge pull request #648 from EPrade/feature/t_outlet
EPrade Aug 27, 2024
a029119
Merge branch 'develop' into fix/from_node_t_lookup
dlohmeier Aug 27, 2024
aeb1705
Merge branch 'develop' into hotfix/vdot_extraction_imcompressible_rea…
dlohmeier Aug 28, 2024
257c99f
Merge pull request #647 from dlohmeier/fix/from_node_t_lookup
SimonRubenDrauz Aug 28, 2024
a0d4d05
Merge branch 'develop' into hotfix/vdot_extraction_imcompressible_rea…
dlohmeier Aug 28, 2024
1c40dbc
Merge pull request #640 from dlohmeier/hotfix/vdot_extraction_imcompr…
SimonRubenDrauz Sep 6, 2024
1cd36e9
fixed some imports from pandapower. (#650)
vogt31337 Sep 19, 2024
1aa2c10
Merge remote-tracking branch 'origin/develop' into bugfix/bidirectional
SimonRubenDrauz Oct 12, 2024
ad12708
idx branch adapted
SimonRubenDrauz Oct 12, 2024
a6f9d6e
Merge remote-tracking branch 'origin/develop' into feature/circ_pump_…
SimonRubenDrauz Oct 12, 2024
41ab3ef
Merge remote-tracking branch 'pp_fork/feature/circ_pump_branch_model'…
SimonRubenDrauz Oct 12, 2024
8fcb2fb
Merge remote-tracking branch 'pp_fork/feature/circ_pump_branch_model'…
SimonRubenDrauz Oct 12, 2024
628105d
bugfix
SimonRubenDrauz Oct 12, 2024
68c109f
changes in pandas
SimonRubenDrauz Oct 12, 2024
b746540
bug correction
SimonRubenDrauz Oct 12, 2024
9aefeac
bug correction
SimonRubenDrauz Oct 12, 2024
c15ce2a
bug correction
SimonRubenDrauz Oct 12, 2024
e756949
bug correction
SimonRubenDrauz Oct 12, 2024
ee3d138
bug correction
SimonRubenDrauz Oct 12, 2024
8dd9c20
Merge remote-tracking branch 'senergy/feature/circ_pump_branch_model'…
SimonRubenDrauz Oct 12, 2024
82f23c3
Merge remote-tracking branch 'senergy/feature/circ_pump_branch_model'…
SimonRubenDrauz Oct 14, 2024
26e033b
bug correction
SimonRubenDrauz Oct 14, 2024
365c113
init adaptions
SimonRubenDrauz Oct 14, 2024
08b241e
deletion of duplicated code
SimonRubenDrauz Oct 17, 2024
dfe690d
change file_io back to develop version
SimonRubenDrauz Oct 17, 2024
48b76b2
the return temperature of the heat consumer is not fixed for the solv…
dlohmeier Oct 21, 2024
992dfed
some fixes for numpy 2.0
mfranz13 Oct 21, 2024
8b80ffd
Merge pull request #655 from mfranz13/develop
mfranz13 Oct 22, 2024
912466a
-updated changelog
EPrade Oct 24, 2024
099fdfb
-changed versions
EPrade Oct 24, 2024
123ccc8
-changed format version
EPrade Oct 24, 2024
dae80bd
remove velocity and clean up
SimonRubenDrauz Oct 25, 2024
fc4dd7c
restructuring idx_branch and idx_node
SimonRubenDrauz Oct 25, 2024
1958982
adapted set_fixed_node_entries to clarify its purpose
SimonRubenDrauz Oct 25, 2024
aa348b1
removed diameter from many zero-length components
SimonRubenDrauz Oct 25, 2024
810cd35
cleaned up file_io.py
SimonRubenDrauz Oct 25, 2024
02beeb9
starting placeholder for leakages
SimonRubenDrauz Oct 25, 2024
04b1a4e
code clean up
SimonRubenDrauz Oct 25, 2024
13884e4
removed diameter from zero length components
SimonRubenDrauz Oct 25, 2024
520d339
new approach for heat calculation
SimonRubenDrauz Oct 25, 2024
8955cd1
Merge branch 'develop' into feature/circ_pump_branch_model
SimonRubenDrauz Oct 25, 2024
fd6dcfb
bugfix in set fixed node entries
SimonRubenDrauz Oct 28, 2024
f40edde
Merge branch 'feature/circ_pump_branch_model' of https://github.com/r…
SimonRubenDrauz Oct 28, 2024
8b9e71c
install meson and ninja
SimonRubenDrauz Oct 28, 2024
19cc10e
further bug check
SimonRubenDrauz Oct 28, 2024
15ddaf3
adapt tests
SimonRubenDrauz Oct 28, 2024
144b84d
use python 3.10
SimonRubenDrauz Oct 28, 2024
6c6a444
use python 3.9
SimonRubenDrauz Oct 28, 2024
4e9c690
update python-version back to 3.11
SimonRubenDrauz Oct 28, 2024
8e102f3
Merge remote-tracking branch 'origin/develop' into bugfix/bidirectional
SimonRubenDrauz Nov 4, 2024
941ee4d
Merge pull request #635 from retoflow/feature/circ_pump_branch_model
SimonRubenDrauz Nov 4, 2024
712f1d0
Merge branch 'e2nIEE:develop' into release_0.11
EPrade Nov 7, 2024
8604b86
- remove D and AREA from import as not required
SimonRubenDrauz Nov 7, 2024
b36f558
-define logger
SimonRubenDrauz Nov 7, 2024
c8b834d
use np.any in heat_consumer_component.py
dlohmeier Nov 7, 2024
53a12b3
use np.sum in pipeflow_setup.py
dlohmeier Nov 7, 2024
2883737
small bugfixes
SimonRubenDrauz Nov 7, 2024
7e029c0
Merge branch 'bugfix/bidirectional' of https://github.com/SimonRubenD…
SimonRubenDrauz Nov 7, 2024
5d182b7
Merge pull request #628 from SimonRubenDrauz/bugfix/bidirectional
SimonRubenDrauz Nov 7, 2024
216e33d
Merge branch 'e2nIEE:develop' into release_0.11
EPrade Nov 7, 2024
9c7a0d1
-updated changelog
EPrade Nov 7, 2024
34b1746
-upped iterations for test network and added old version nets
EPrade Nov 7, 2024
853f4ec
Merge pull request #659 from EPrade/release_0.11
EPrade Nov 7, 2024
e31d216
-changed readme.md to readme.rst
EPrade Nov 7, 2024
693f412
Merge pull request #661 from EPrade/bugfix_pyproject
EPrade Nov 7, 2024
7d93681
-updated changelog
EPrade Nov 7, 2024
464fb63
Merge pull request #662 from EPrade/changelod_update
EPrade Nov 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ jobs:
# Upgrade pip
python3 -m pip install --upgrade pip
# Install twine
python3 -m pip install setuptools wheel twine
python3 -m pip install build setuptools wheel twine

# Upload to TestPyPI
- name: Build and Upload to TestPyPI
if: ${{ inputs.upload_server == 'testpypi'}}
run: |
python3 setup.py sdist --formats=zip
twine check dist/* --strict
python3 -m build
python3 -m twine check dist/* --strict
python3 -m twine upload dist/*
env:
TWINE_USERNAME: __token__
Expand All @@ -56,8 +56,8 @@ jobs:
- name: Build and Upload to PyPI
if: ${{ inputs.upload_server == 'pypi' }}
run: |
python3 setup.py sdist --formats=zip
twine check dist/* --strict
python3 -m build
python3 -m twine check dist/* --strict
python3 -m twine upload dist/*
env:
TWINE_USERNAME: __token__
Expand All @@ -70,12 +70,11 @@ jobs:
time: 300s

build:

runs-on: ${{ matrix.os }}
needs: upload
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11']
python-version: ['3.9', '3.10', '3.11', '3.12']
os: [ ubuntu-latest, windows-latest ]
steps:
- name: Set up Python ${{ matrix.python-version }}
Expand Down
86 changes: 59 additions & 27 deletions .github/workflows/run_tests_develop.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
# A coverage report will be created for the Python 3.8 version
# 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 All @@ -17,7 +19,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11']
python-version: ['3.9', '3.10', '3.11', '3.12']
os: [ ubuntu-latest, windows-latest ]
steps:
- uses: actions/checkout@v4
Expand All @@ -28,30 +30,63 @@ jobs:
- name: Install dependencies
run: |
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 git+https://github.com/e2nIEE/pandapower@develop#egg=pandapower
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.9' }}
if: ${{ matrix.python-version != '3.11' }}
run: |
python -m pytest
- name: Test with numba
- 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:
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 git+https://github.com/e2nIEE/pandapower@develop#egg=pandapower
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 pip install numba
python -m pytest
- name: Test with pytest and Codecov
if: ${{ matrix.python-version == '3.9' }}
if: ${{ matrix.python-version == '3.11' }}
run: |
python -m pip install pytest-cov
python -m pytest -n=auto --cov=./ --cov-report=xml
- name: Upload coverage to Codecov
if: ${{ matrix.python-version == '3.9' }}
if: ${{ matrix.python-version == '3.11' }}
uses: codecov/codecov-action@v4
with:
verbose: true
Expand All @@ -65,12 +100,17 @@ 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.10']
python-version: ['3.11']
os: [ ubuntu-latest, windows-latest ]
steps:
- uses: actions/checkout@v4
Expand All @@ -82,8 +122,6 @@ jobs:
run: |
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 All @@ -102,7 +140,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11']
python-version: ['3.9', '3.10', '3.11', '3.12']
os: [ ubuntu-latest, windows-latest ]
steps:
- uses: actions/checkout@v4
Expand All @@ -113,28 +151,25 @@ jobs:
- name: Install dependencies
run: |
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 .
python -m pip install .["all"]
shell: bash
- name: List all installed packages
run: |
python -m pip list
- name: Test with pytest
run: |
python -m pytest --nbmake -n=auto "./tutorials"
- name: Test with numba
- name: Test without numba
if: ${{ matrix.python-version == '3.11' }}
run: |
python -m pip install numba
python -m pip uninstall numba -y
python -m pytest --nbmake -n=auto "./tutorials"

docs_check:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [ '3.10' ]
python-version: [ '3.11' ]
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -144,10 +179,7 @@ jobs:
- name: Check docs for Python ${{ matrix.python-version }}
uses: e2nIEE/sphinx-action@master
with:
pre-build-command: "apt-get update -y && apt-get install -y git;
git --version;
python -m pip install --upgrade pip;
python -m pip install git+https://github.com/e2nIEE/pandapower@develop#egg=pandapower;
python -m pip install .['all']"
pre-build-command: "python -m pip install --upgrade pip;
python -m pip install .[docs]"
build-command: "sphinx-build -b html source _build -W"
docs-folder: "doc/"
71 changes: 46 additions & 25 deletions .github/workflows/run_tests_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11']
python-version: ['3.9', '3.10', '3.11', '3.12']
os: [ ubuntu-latest, windows-latest ]
steps:
- uses: actions/checkout@v4
Expand All @@ -27,37 +27,29 @@ jobs:
- name: Install dependencies
run: |
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
run: |
python -m pip list
- name: Test with pytest
if: ${{ matrix.python-version != '3.9' }}
if: ${{ matrix.python-version != '3.11' }}
run: |
python -m pytest
- name: Test with numba
if: ${{ matrix.python-version == '3.11' }}
run: |
python -m pip install numba
python -m pytest -n=auto
- name: Test with pytest, Codecov and Coverage
if: ${{ matrix.python-version == '3.9' }}
if: ${{ matrix.python-version == '3.11' }}
run: |
python -m pip install pytest-cov
python -m pytest --nbmake -n=auto --cov=./ --cov-report=xml
cp ./coverage.xml ./codecov_coverage.xml
- name: Upload coverage to Codacy
if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest'}}
if: ${{ matrix.python-version == '3.11' && matrix.os == 'ubuntu-latest'}}
env:
CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
run: |
bash <(curl -Ls https://coverage.codacy.com/get.sh) report -r coverage.xml
- name: Upload coverage to Codecov
if: ${{ matrix.python-version == '3.9' }}
if: ${{ matrix.python-version == '3.11' }}
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
Expand All @@ -71,13 +63,48 @@ 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 }}
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 -n=auto
- name: Test without numba
if: ${{ matrix.python-version == '3.11' }}
run: |
python -m pip uninstall numba -y
python -m pytest -n=auto

tutorial_tests:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11']
python-version: ['3.9', '3.10', '3.11', '3.12']
os: [ ubuntu-latest, windows-latest ]
steps:
- uses: actions/checkout@v4
Expand All @@ -88,9 +115,6 @@ jobs:
- name: Install dependencies
run: |
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 pandapower
python -m pip install .["all"]
shell: bash
- name: List all installed packages
Expand All @@ -99,18 +123,18 @@ jobs:
- name: Test with pytest
run: |
python -m pytest --nbmake -n=auto "./tutorials"
- name: Test with numba
- name: Test without numba
if: ${{ matrix.python-version == '3.11' }}
run: |
python -m pip install numba
python -m pip uninstall numba -y
python -m pytest --nbmake -n=auto "./tutorials"


docs_check:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [ '3.10' ]
python-version: [ '3.11' ]
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -120,10 +144,7 @@ jobs:
- name: Check docs for Python ${{ matrix.python-version }}
uses: e2nIEE/sphinx-action@master
with:
pre-build-command: "apt-get update -y && apt-get install -y git;
git --version;
python -m pip install --upgrade pip;
python -m pip install pandapower;
python -m pip install .['all']"
pre-build-command: "python -m pip install --upgrade pip;
python -m pip install .[docs]"
build-command: "sphinx-build -b html source _build -W"
docs-folder: "doc/"
2 changes: 2 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@ build:

python:
install:
- method: pip
path: .
- requirements: doc/requirements.txt
Loading
Loading