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.9.0 #588

Merged
merged 191 commits into from
Dec 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
191 commits
Select commit Hold shift + click to select a range
4e57b76
Merge pull request #486 from e2nIEE/hotfix_0.8.2
SimonRubenDrauz Jan 8, 2023
a628497
Merge branch 'develop' into hotfix_0.8.3
SimonRubenDrauz Jan 9, 2023
280b895
Merge pull request #488 from e2nIEE/hotfix_0.8.3
SimonRubenDrauz Jan 9, 2023
1e2e873
add missing init to the topology tests (#490)
jkisse Jan 10, 2023
bb6d076
Load JSON string simplified
dlohmeier Jan 12, 2023
a7c73b8
Merge pull request #491 from dlohmeier/json_decoder_registry
dlohmeier Jan 12, 2023
ea6aec9
run release-tests without repo checkout, just with pip package (#492)
SimonRubenDrauz Jan 26, 2023
cd85dc8
Flow control is considered in nx_graph creation
dlohmeier Jan 26, 2023
78eff76
small edit
dlohmeier Jan 26, 2023
5491aff
Merge pull request #496 from dlohmeier/hotfix/nxgraph_flow_control
dlohmeier Jan 27, 2023
e88f4b8
add Python 3.11 to test matrix on develop
jkisse Jan 30, 2023
528000e
add Python 3.11 to master workflow and tutorials, change np.bool to bool
jkisse Jan 30, 2023
e96bc81
use the latest versions of action/checkout and action/setup-python
jkisse Jan 30, 2023
fd76539
update CHANGELOG.rst
jkisse Jan 30, 2023
01377f9
add create function for multiple heat exchangers (#503)
SimonRubenDrauz Jan 31, 2023
4440f81
Merge branch 'develop' into hotfix_0.8.4
SimonRubenDrauz Feb 2, 2023
3e7dbfd
Merge pull request #510 from e2nIEE/hotfix_0.8.4
SimonRubenDrauz Feb 2, 2023
2cd2c64
Add even more Python 3.11 (#504)
jkisse Feb 22, 2023
9527ded
pp.toolbox import fix & silence numpy warnings (#520)
SteffenMeinecke Feb 27, 2023
cf96a09
remove Python 3.7 from test workflow (#524)
jkisse Mar 15, 2023
c437200
created two biomethane gases
kbensafta Mar 22, 2023
bcfac5b
add biomethanes to call_lib and first effort to add docu about biomet…
kbensafta Mar 23, 2023
9d7b247
added the HHVS to the gas_compostions.txt
kbensafta Mar 24, 2023
29d5dbf
added biomethane to the doc, docstrings and to the tutos.
kbensafta Mar 24, 2023
13e7e72
slight modification in a tuto
kbensafta Mar 24, 2023
de3210c
updated find_packages() to find_namespace_packages()
May 12, 2023
70c5a84
separation of connectivity check for hydraulic and thermal calculation:
dlohmeier May 16, 2023
1eecc90
correction in result extraction for branches with internals
dlohmeier May 23, 2023
a171046
another correction in result extraction for branch components with in…
dlohmeier May 23, 2023
5ed7baf
another small correction in result extraction
dlohmeier May 23, 2023
9010add
yet another small correction to make many tests pass again
dlohmeier May 23, 2023
b70fd41
improvement of the heat connectivity check:
dlohmeier Jun 6, 2023
424f0d0
small corrections in pipeflow, tests corrected and one added
dlohmeier Jun 7, 2023
73b97bd
small changes for better consistency and hopefully understandability
dlohmeier Jun 7, 2023
2940a87
extended changelog
dlohmeier Jun 9, 2023
9ad6480
correction of not hard coding calculation mode in result extraction
dlohmeier Jun 12, 2023
8f34a99
small bug fix of missing argument
dlohmeier Jun 12, 2023
cbe1afb
provide BSD license via link to license file (#549)
SteffenMeinecke Jul 21, 2023
5d3b204
Merge remote-tracking branch 'e2nIEE_pandapipes/master' into develop
jkisse Jul 26, 2023
5e486e9
Update release.yml
jkisse Jul 26, 2023
885181f
Merge pull request #552 from jkisse/develop
jkisse Jul 26, 2023
b2de031
release preparation
jkisse Jul 26, 2023
1cbe5b9
Merge pull request #553 from jkisse/fix/remove_badge
jkisse Jul 26, 2023
0d55a14
Merge remote-tracking branch 'e2nIEE_pandapipes/master' into develop
jkisse Jul 31, 2023
30ceea9
Merge pull request #556 from jkisse/develop
EPrade Jul 31, 2023
6122c84
Merge branch 'develop' into connectivity_separate
dlohmeier Aug 1, 2023
8d8a3af
Adaption get_internal_tables_pandas (#539)
dlohmeier Aug 8, 2023
7d6b3eb
adapted the heat exchanger creation in the stanet converter (#538)
dlohmeier Aug 9, 2023
f87207d
small adaption of T_OUT in pipe component to be derived from nodes
dlohmeier Aug 10, 2023
8ea171b
Merge pull request #557 from dlohmeier/adapt_branch_pit_init
dlohmeier Aug 10, 2023
2779ef8
Update .readthedocs.yml (#558)
jkisse Aug 16, 2023
98d8cdf
Revert "Update .readthedocs.yml (#558)" (#559)
jkisse Aug 18, 2023
a775042
added test to make sure that pipeflow fails for disconnected nets wit…
dlohmeier Aug 30, 2023
4d7286c
slight improvement in test
dlohmeier Aug 30, 2023
a0a0fe3
rearrangement of result extraction:
dlohmeier Aug 30, 2023
dd5faec
Merge branch 'develop' of github.com:e2nIEE/pandapipes into connectiv…
dlohmeier Aug 30, 2023
926bc32
slight correction
dlohmeier Sep 1, 2023
513ef67
Merge pull request #540 from dlohmeier/connectivity_separate
dlohmeier Sep 1, 2023
523015b
internal component arrays
dlohmeier Sep 6, 2023
e983e90
slight adjustment of helper function get_component_array
dlohmeier Sep 8, 2023
ebd60a3
- define calculate_thermal_derivative more gobally
Sep 8, 2023
9fccd73
Merge pull request #561 from dlohmeier/feature/component_pit
dlohmeier Sep 11, 2023
219ea37
pipeflow cancellation if all nodes are out-of-service after the conne…
Sep 12, 2023
9c86f1e
readthedocs.yml deprecation
Sep 12, 2023
5aaa699
pp instead of pandapipes called
Sep 12, 2023
93b96f8
adapted CHANGELOG.rst
Sep 12, 2023
d4cbd90
bugfix in yml
Sep 12, 2023
6a05602
bugfix in yml
Sep 12, 2023
3f648a8
bugfix in yml
Sep 12, 2023
4a6528f
change the names TINIT and T_OUT back
Sep 13, 2023
349c740
Merge branch 'develop' into global_thermal
SimonRubenDrauz Sep 13, 2023
214a987
bugfix
Sep 13, 2023
5959ab3
Merge branch 'develop' into biogas
kbensafta Sep 15, 2023
6a87439
Merge pull request #565 from SimonRubenDrauz/readthedocs.yml
SimonRubenDrauz Sep 15, 2023
b2652d8
Merge branch 'develop' into develop
SimonRubenDrauz Sep 15, 2023
1f040ee
removing TINIT from branch variable as it is no solver variable
Sep 15, 2023
9b89642
Merge branch 'develop' into global_thermal
SimonRubenDrauz Sep 15, 2023
c807e62
Merge branch 'develop' into biogas
kbensafta Sep 18, 2023
85fe997
fix formatting error in the documentation
kbensafta Sep 18, 2023
d6f804d
Merge branch 'develop' of https://github.com/e2nIEE/pandapipes into b…
kbensafta Sep 18, 2023
ba8f8c3
Merge branch 'biogas' of https://github.com/kbensafta/pandapipes into…
kbensafta Sep 18, 2023
7d82b3f
Merge pull request #526 from kbensafta/biogas
dlohmeier Sep 19, 2023
7e32238
Merge branch 'develop' of github:e2niee/pandapipes into develop
Sep 29, 2023
32baa21
error in generic geodata: The second part was always missed and only …
Sep 29, 2023
98a8972
removing changes from local develop
Sep 29, 2023
de14ee6
Merge remote-tracking branch 'origin/develop' into global_thermal
Sep 29, 2023
4244569
renaming T_OUT in TOUTINIT, making test/pipeflow more stable
Sep 29, 2023
2aae8dc
Merge branch 'global_thermal' of https://github.com/SimonRubenDrauz/p…
Sep 29, 2023
a659a36
Merge remote-tracking branch 'origin/develop' into bugfix/setup.py
Oct 30, 2023
c0ac8a5
made list of liquids and gases global in fluids.py
dlohmeier Nov 3, 2023
bab5c14
corrections in fluid library to make call_lib pass again
dlohmeier Nov 3, 2023
b82f502
take only files from pandapipes folder
Nov 3, 2023
b7963eb
Merge pull request #563 from SimonRubenDrauz/global_thermal
SimonRubenDrauz Nov 13, 2023
2a98cde
Merge branch 'develop' into bugfix/generic_geodata
SimonRubenDrauz Nov 13, 2023
03ea06b
Merge branch 'develop' into fluid_lib_global
SimonRubenDrauz Nov 17, 2023
0380e4b
removing uncommented code
Nov 17, 2023
d5d25ae
Merge pull request #568 from SimonRubenDrauz/bugfix/generic_geodata
SimonRubenDrauz Nov 17, 2023
e2e4118
Merge branch 'develop' into develop
SimonRubenDrauz Nov 17, 2023
b1ee8db
added warning when not finding LHV / HHV in fluid lib
dlohmeier Nov 20, 2023
d91d201
Merge branch 'fluid_lib_global' of github.com:dlohmeier/pandapipes in…
dlohmeier Nov 20, 2023
b1d38e8
Merge branch 'develop' into fluid_lib_global
dlohmeier Nov 20, 2023
8a9d614
small fixes for graph creation wrt pressure circ_pumps and for stanet…
dlohmeier Nov 20, 2023
c425cb6
added option to guess slider valve types; some small adaptions
dlohmeier Dec 4, 2023
ba81ca0
removed trailing whitespace
dlohmeier Dec 4, 2023
55f2f2d
Merge remote-tracking branch 'origin/develop' into bugfix/setup.py
Dec 11, 2023
a15399c
Merge branch 'develop' of https://github.com/SimonRubenDrauz/pandapip…
Dec 11, 2023
1468b48
remove changes as part of seperate PR
Dec 11, 2023
ebaa13f
already considered in different PR
Dec 11, 2023
e501c15
adding a __init__.py to the repo
Dec 12, 2023
17315e1
might solve the problem
Dec 12, 2023
e5a9571
bug check
Dec 12, 2023
0fa38f1
upgrade setuptools due to bug
Dec 12, 2023
086f877
check for bugfix
Dec 12, 2023
ac372c4
removing upgrade setuptools
Dec 12, 2023
cb12427
pip install with pip install .
Dec 12, 2023
92b04ce
trying with python -m pip install .
Dec 12, 2023
f56fa14
trying to upgrade jupyter
Dec 12, 2023
5b17399
trying to solve problem with python -m
Dec 12, 2023
d75caad
install jupyter
Dec 12, 2023
521d38a
install pytest-pythonpath
Dec 12, 2023
6df52d4
upgrade setuptools
Dec 12, 2023
cdc5f8d
upgrade pytest
Dec 12, 2023
ba5828e
further packages installed
Dec 12, 2023
eba1c19
further packages installed
Dec 12, 2023
380d39a
uninstall certain packages
Dec 12, 2023
8becbb9
downgrade packages
Dec 12, 2023
3c8db9b
install further packages
Dec 12, 2023
26b65a3
install ipython
Dec 12, 2023
f7e9b7c
adding a pytest.ini
Dec 12, 2023
c39e1bd
add pandapipes. in front of namespace folder paths
Dec 13, 2023
278e850
calling pythonpath and sys path
Dec 13, 2023
c982457
call pandapipes packages
Dec 13, 2023
047332d
uninstall pytest-pythonpath
Dec 13, 2023
3dc0666
add a pytest.ini
Dec 13, 2023
8990951
add pytest.ini and adapt setup.py
Dec 13, 2023
bfe67fe
add pytest.ini and adapt setup.py
Dec 13, 2023
9dfe30b
first try only with pytest.ini
Dec 13, 2023
968495a
solution to problem
Dec 13, 2023
0cbeaa9
move everything in src folder
Dec 13, 2023
8934524
removing pytest.ini, restructuring setup.py slighly and adapt MANIFES…
Dec 13, 2023
a70f32c
change pandapipes reference in tutorial test
Dec 13, 2023
b84a6b7
remove pytest.ini from tutorials
Dec 13, 2023
f1d9ba7
switch pump junctions in DHN tutorial; closes #580
dlohmeier Dec 14, 2023
6fec1cf
converged is explicit. Only under net defined.
Dec 15, 2023
655cb10
Merge pull request #583 from SimonRubenDrauz/converged
SimonRubenDrauz Dec 19, 2023
48c1e7e
Merge branch 'develop' into hotfix/correct_tutorial
SimonRubenDrauz Dec 19, 2023
6f67869
Merge pull request #581 from dlohmeier/hotfix/correct_tutorial
SimonRubenDrauz Dec 19, 2023
6977435
Merge branch 'develop' into stanet_converter_sv_types
SimonRubenDrauz Dec 19, 2023
d1e61ad
Merge pull request #577 from dlohmeier/stanet_converter_sv_types
SimonRubenDrauz Dec 19, 2023
0a9584c
Merge branch 'develop' into fix/graph_cp
SimonRubenDrauz Dec 19, 2023
2067749
Merge branch 'develop' into fluid_lib_global
SimonRubenDrauz Dec 19, 2023
e4895bc
Merge pull request #575 from dlohmeier/fix/graph_cp
SimonRubenDrauz Dec 19, 2023
c904b41
Merge branch 'develop' into fluid_lib_global
SimonRubenDrauz Dec 19, 2023
6743b12
Merge pull request #571 from dlohmeier/fluid_lib_global
SimonRubenDrauz Dec 19, 2023
fea8b2e
Merge remote-tracking branch 'origin/develop' into all_nodes_oos
Dec 19, 2023
5989b46
Merge pull request #579 from SimonRubenDrauz/all_nodes_oos
SimonRubenDrauz Dec 19, 2023
37ce011
Merge remote-tracking branch 'origin/develop' into bugfix/setup.py
Dec 19, 2023
0c93172
remove logger set level
Dec 19, 2023
2d33bc9
- move Pipeflow Exception into pipeflow setup
Dec 19, 2023
f6cd27c
Merge branch 'develop' into all_nodes_oos
SimonRubenDrauz Dec 19, 2023
fc28577
- assert the net.converged is set correctly
Dec 19, 2023
4f2e957
Merge branch 'all_nodes_oos' of https://github.com/SimonRubenDrauz/pa…
Dec 19, 2023
2cc403a
Merge pull request #584 from SimonRubenDrauz/all_nodes_oos
SimonRubenDrauz Dec 19, 2023
4f97a50
Merge remote-tracking branch 'origin/develop' into bugfix/setup.py
Dec 19, 2023
60761fb
clean repo and adapt changelog slightly
Dec 21, 2023
d71c344
Merge pull request #578 from SimonRubenDrauz/bugfix/setup.py
SimonRubenDrauz Dec 21, 2023
9ee69d8
-changed copyright year
EPrade Dec 21, 2023
cd2f27d
using always python -m in workflows
Dec 21, 2023
c38ed6c
adapting version tag
Dec 21, 2023
2f74032
changing author name
Dec 21, 2023
b461ce4
adding src layout info in changelog
Dec 21, 2023
2505a89
Merge branch 'release_0.9.0' of https://github.com/e2nIEE/pandapipes …
Dec 21, 2023
882c914
-changed copyright year 2
EPrade Dec 21, 2023
69e2ad5
removing init from converter folder
Dec 21, 2023
a57fa81
adapting CHANGELOG.rst
Dec 21, 2023
941f1a5
small adaptions CHANGELOG.rst
Dec 21, 2023
b45de0c
Merge branch 'release_0.9.0' of https://github.com/e2nIEE/pandapipes …
Dec 21, 2023
201f966
changing tag in doc conf
Dec 21, 2023
40d8578
changing pandapower dependency
Dec 21, 2023
fcb97ac
adding example grids water and gas 0.9.0
Dec 21, 2023
e17a338
Merge pull request #585 from e2nIEE/release_0.9.0
SimonRubenDrauz Dec 22, 2023
754b69b
bug in release yml fixed
Dec 22, 2023
b4a1126
Merge branch 'develop' into release_0.9.0
SimonRubenDrauz Dec 22, 2023
f2470a4
test windows and ubuntu
Dec 22, 2023
7aec0eb
Merge branch 'release_0.9.0' of https://github.com/e2nIEE/pandapipes …
Dec 22, 2023
4663e83
test windows and ubuntu
Dec 22, 2023
b1c734c
remove comments add shell
Dec 22, 2023
f272c0d
Merge pull request #586 from e2nIEE/release_0.9.0
SimonRubenDrauz Dec 22, 2023
9ee1336
remove post1 from version tag
Dec 22, 2023
3f41163
Merge branch 'develop' into release_0.9.0
SimonRubenDrauz Dec 22, 2023
613fe60
Merge pull request #587 from e2nIEE/release_0.9.0
SimonRubenDrauz Dec 22, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 8 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,28 +75,30 @@ jobs:
needs: upload
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10']
python-version: ['3.8', '3.9', '3.10', '3.11']
os: [ ubuntu-latest, windows-latest ]
steps:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
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 numba
python -m pip install pytest igraph pytest-split
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: |
pip install --no-cache-dir -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple pandapipes
python -m pip install --no-cache-dir -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple pandapipes
- name: Install pandapipes from PyPI
if: ${{ inputs.upload_server == 'pypi'}}
run: |
pip install pandapipes
python -m pip install pandapipes
- name: List all installed packages
run: |
pip list
python -m pip list
- name: Test with pytest
run: |
pytest --pyargs pandapipes.test
63 changes: 34 additions & 29 deletions .github/workflows/run_tests_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,53 +14,54 @@ on:

jobs:
build:

runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10']
python-version: ['3.8', '3.9', '3.10', '3.11']
os: [ ubuntu-latest, windows-latest ]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
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 numba
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@develop#egg=pandapower
pip install .
python -m pip install .
shell: bash
- name: List all installed packages
run: |
pip list
python -m pip list
- name: Test with pytest
if: ${{ matrix.python-version != '3.9' }}
run: |
pytest
python -m pytest
- name: Test with pytest and Codecov
if: ${{ matrix.python-version == '3.9' }}
run: |
python -m pip install pytest-cov
pytest --cov=./ --cov-report=xml
python -m pytest --cov=./ --cov-report=xml
- name: Upload coverage to Codecov
if: ${{ matrix.python-version == '3.9' }}
uses: codecov/codecov-action@v1
with:
verbose: true

linting:

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

python-version: ['3.10']
os: [ ubuntu-latest, windows-latest ]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand All @@ -69,10 +70,11 @@ jobs:
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
pip install .
python -m pip install .
shell: bash
- name: List all installed packages
run: |
pip list
python -m pip list
- name: Lint with flake8 (syntax errors and undefinded names)
run: |
# stop the build if there are Python syntax errors or undefined names
Expand All @@ -83,39 +85,42 @@ 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']
python-version: ['3.8', '3.9', '3.10', '3.11']
os: [ ubuntu-latest, windows-latest ]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
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 nbmake pytest-xdist pytest-split igraph numba
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 [ -f requirements.txt ]; then pip install -r requirements.txt; fi
python -m pip install git+https://github.com/e2nIEE/pandapower@develop#egg=pandapower
pip install .
python -m pip install .
shell: bash
- name: List all installed packages
run: |
pip list
python -m pip list
- name: Test with pytest
run: |
pytest --nbmake -n=auto "./tutorials"
python -m pytest --nbmake -n=auto "./tutorials"

docs_check:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [ '3.8' ]
python-version: [ '3.10' ]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Check docs for Python ${{ matrix.python-version }}
Expand Down
50 changes: 27 additions & 23 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,77 +13,81 @@ on:

jobs:
build:

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

python-version: ['3.8', '3.9', '3.10', '3.11']
os: [ ubuntu-latest, windows-latest ]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
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 numba
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;
pip install .
python -m pip install .
shell: bash
- name: List all installed packages
run: |
pip list
python -m pip list
- name: Test with pytest
if: ${{ matrix.python-version != '3.9' }}
run: |
pytest
python -m pytest
- name: Test with pytest and Codecov
if: ${{ matrix.python-version == '3.9' }}
run: |
python -m pip install pytest-cov
pytest --cov=./ --cov-report=xml
python -m pytest --cov=./ --cov-report=xml
- name: Upload coverage to Codecov
if: ${{ matrix.python-version == '3.9' }}
uses: codecov/codecov-action@v1
with:
verbose: true

tutorial_tests:
runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10']
python-version: ['3.8', '3.9', '3.10', '3.11']
os: [ ubuntu-latest, windows-latest ]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
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 nbmake pytest-xdist pytest-split igraph numba
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 [ -f requirements.txt ]; then pip install -r requirements.txt; fi
python -m pip install git+https://github.com/e2nIEE/pandapower@master#egg=pandapower
pip install .
python -m pip install .
shell: bash
- name: List all installed packages
run: |
pip list
python -m pip list
- name: Test with pytest
run: |
pytest --nbmake -n=auto "./tutorials"
python -m pytest --nbmake -n=auto "./tutorials"

docs_check:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [ '3.8' ]
python-version: [ '3.10' ]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Check docs for Python ${{ matrix.python-version }}
Expand Down
11 changes: 6 additions & 5 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
version: 2

build:
os: ubuntu-22.04
tools:
python: "3.9"

python:
version: 3.7
install:
- method: pip
path: .
extra_requirements:
- docs
- requirements: doc/requirements.txt
4 changes: 2 additions & 2 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Copyright (c) 2020-2023 by Fraunhofer Institute for Energy Economics
Copyright (c) 2020-2024 by Fraunhofer Institute for Energy Economics
and Energy System Technology (IEE), Kassel, and University of Kassel. All rights reserved.

Lead Developers:
- Daniel Lohmeier
- Simon Ruben Drauz
- Simon Ruben Drauz-Mauel
- Jolando Marius Kisse

Main Contributors:
Expand Down
26 changes: 26 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,32 @@
Change Log
=============

[0.9.0] - 2023-12-22
-------------------------------

- [ADDED] multiple creation of heat exchanger
- [ADDED] support Python 3.11 (now included in test pipeline)
- [ADDED] after the connectivity check, intercept the pipeflow if no more nodes are in-service (heat and hydraulic)
- [ADDED] adding biomethane (pure and treated) as additonal fluid
- [ADDED] result tables can be assembled modularly
- [CHANGED] dropped support for Python 3.7 (no longer included in test pipeline)
- [CHANGED] connectivity check now separated by hydraulics and heat_transfer calculation, so that also results can differ in some rows (NaN or not)
- [CHANGED] dynamic creation of lookups for getting pit as pandas tables
- [CHANGED] components can have their own internal arrays for specific calculations (e.g. for compressor pressure ratio), so that the pit does not need to include such component specific entries
- [CHANGED] .readthedocs.yml due to deprecation
- [CHANGED] changing from setuptools flat-layout into src-layout
- [CHANGED] calculate thermal derivative globally, adaptions before/after can be done component-wise
- [CHANGED] moving 'PipeflowNotConverged' error from pipeflow to pipeflow_setup
- [CHANGED] moving 'result_extraction' under pf folder
- [FIXED] in STANET converter: bug fix for heat exchanger creation and external temperatures of pipes added
- [FIXED] build igraph considers all components
- [FIXED] creating nxgraph and considering pressure circulation pumps correctly
- [FIXED] error in tutorial 'circular flow in a district heating grid'
- [FIXED] caused error during 'pip install pandapipes'
- [REMOVED] broken travis badge removed from readme
- [REMOVED] branch TINIT removed as it is not a solution variable, temperature determined on the fly
- [REMOVED] 'converged' setting from options

[0.8.5] - 2023-06-19
-------------------------------
- [FIXED] consider ambient pressure in calculation of compression power for pumps/compressors
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2020-2023 by Fraunhofer Institute for Energy Economics
Copyright (c) 2020-2024 by Fraunhofer Institute for Energy Economics
and Energy System Technology (IEE), Kassel, and University of Kassel. Further
contributions by individual contributors (see AUTHORS file for details). All rights reserved.

Expand Down
8 changes: 2 additions & 6 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
include LICENSE AUTHORS README.rst CHANGELOG.rst .github/**/*.yml
global-include *.json
global-include *.csv
global-include *.txt
graft src

prune doc*
prune tutorials*
include LICENSE AUTHORS README.rst CHANGELOG.rst .github/**/*.yml
4 changes: 0 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
:target: http://pandapipes.readthedocs.io/
:alt: docs

.. image:: https://travis-ci.org/e2nIEE/pandapipes.svg?branch=master
:target: https://travis-ci.org/e2nIEE/pandapipes/branches
:alt: travis

.. image:: https://codecov.io/gh/e2nIEE/pandapipes/branch/master/graph/badge.svg
:target: https://codecov.io/github/e2nIEE/pandapipes?branch=master
:alt: codecov
Expand Down
Loading
Loading