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 #585

Merged
merged 14 commits into from
Dec 22, 2023
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,14 @@ jobs:
- 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
14 changes: 7 additions & 7 deletions .github/workflows/run_tests_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@ jobs:
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 .
- 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
Expand All @@ -70,10 +70,10 @@ 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 .
- 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 Down Expand Up @@ -104,7 +104,7 @@ jobs:
python -m pip install .
- name: List all installed packages
run: |
pip list
python -m pip list
- name: Test with pytest
run: |
python -m pytest --nbmake -n=auto "./tutorials"
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/run_tests_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@ jobs:
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 .
- 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
Expand All @@ -69,13 +69,13 @@ jobs:
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 .
- 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
Expand Down
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
15 changes: 14 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,18 +1,31 @@
Change Log
=============

[upcoming release] - 2023-..-..
[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
-------------------------------
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
6 changes: 3 additions & 3 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# -- Project information -----------------------------------------------------

project = 'pandapipes'
copyright = '2020-2023 by Fraunhofer Institute for Energy Economics \
copyright = '2020-2024 by Fraunhofer Institute for Energy Economics \
and Energy System Technology (IEE), Kassel, and University of Kassel. All rights reserved.'


Expand All @@ -47,9 +47,9 @@
# built documents.
#
# The short X.Y version.
version = "0.8"
version = "0.9"
# The full version, including alpha/beta/rc tags.
release = "0.8.5"
release = "0.9.0"

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
6 changes: 3 additions & 3 deletions setup.py
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand Down Expand Up @@ -35,7 +35,7 @@

setup(
name='pandapipes',
version='0.8.5',
version='0.9.0',
author='Simon Ruben Drauz-Mauel, Daniel Lohmeier, Jolando Marius Kisse',
author_email='[email protected], [email protected], '
'[email protected]',
Expand All @@ -44,7 +44,7 @@
long_description_content_type='text/x-rst',
url='http://www.pandapipes.org',
license='BSD',
install_requires=["pandapower>=2.11.1", "matplotlib", "shapely"],
install_requires=["pandapower>=2.13.1", "matplotlib", "shapely"],
extras_require={"docs": ["numpydoc", "sphinx", "sphinx_rtd_theme", "sphinxcontrib.bibtex"],
"plotting": ["plotly", "igraph"],
"test": ["pytest", "pytest-xdist", "nbmake"],
Expand Down
4 changes: 2 additions & 2 deletions src/pandapipes/__init__.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# 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.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

__version__ = '0.8.5'
__version__ = '0.9.0'
__format_version__ = '0.8.0'

import pandas as pd
Expand Down
2 changes: 1 addition & 1 deletion src/pandapipes/component_models/__init__.py
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand Down
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand Down
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand Down
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand Down
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand Down
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand Down
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand Down
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand Down
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand Down
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand Down
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand Down
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand Down
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion src/pandapipes/component_models/component_toolbox.py
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion src/pandapipes/component_models/compressor_component.py
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion src/pandapipes/component_models/ext_grid_component.py
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion src/pandapipes/component_models/flow_control_component.py
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand Down
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion src/pandapipes/component_models/junction_component.py
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion src/pandapipes/component_models/mass_storage_component.py
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
from pandapipes.component_models.junction_component import Junction
Expand Down
2 changes: 1 addition & 1 deletion src/pandapipes/component_models/pipe_component.py
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand Down
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion src/pandapipes/component_models/pump_component.py
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion src/pandapipes/component_models/sink_component.py
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
from pandapipes.component_models.junction_component import Junction
Expand Down
2 changes: 1 addition & 1 deletion src/pandapipes/component_models/source_component.py
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
from pandapipes.component_models.junction_component import Junction
Expand Down
2 changes: 1 addition & 1 deletion src/pandapipes/component_models/valve_component.py
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion src/pandapipes/constants.py
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion src/pandapipes/control/__init__.py
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion src/pandapipes/control/run_control.py
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. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand Down
5 changes: 0 additions & 5 deletions src/pandapipes/converter/__init__.py

This file was deleted.

Loading