Skip to content

Commit 615135c

Browse files
committed
Merge branch 'release/v1.6.2'
2 parents 1c2c078 + 3134787 commit 615135c

33 files changed

Lines changed: 4149 additions & 1589 deletions

.github/workflows/github_test_action.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
strategy:
2121
matrix:
22-
python-version: ['3.9', '3.10', '3.11', '3.12']
22+
python-version: ['3.10', '3.11', '3.12', '3.13']
2323
# Reminder: when removing support of an old python version here, then don't forget to remove
2424
# it also in pyproject.toml 'requires-python'
2525
steps:
@@ -37,22 +37,21 @@ jobs:
3737
run: |
3838
python -m pip list
3939
- name: Test with pytest
40-
if: ${{ matrix.python-version != '3.9' }}
40+
if: ${{ matrix.python-version != '3.10' }}
4141
run: |
4242
pytest
4343
- name: Test with pytest and Codecov
44-
if: ${{ matrix.python-version == '3.9' }}
44+
if: ${{ matrix.python-version == '3.10' }}
4545
run: |
4646
pip install pytest-cov
4747
pytest --cov=./ --cov-report=xml
4848
- name: Upload coverage to Codecov
49-
if: ${{ matrix.python-version == '3.9' }}
49+
if: ${{ matrix.python-version == '3.10' }}
5050
uses: codecov/codecov-action@v1
5151
with:
5252
verbose: true
5353

5454
warnings:
55-
5655
runs-on: ubuntu-latest
5756
timeout-minutes: 30
5857
steps:
@@ -70,17 +69,16 @@ jobs:
7069
python -m pip list
7170
- name: Test with pytest
7271
run: |
73-
pytest -W error
72+
pytest -W default
7473
7574
tutorial_tests:
76-
7775
runs-on: ubuntu-latest
7876
steps:
7977
- uses: actions/checkout@v4
8078
- name: Set up Python
8179
uses: actions/setup-python@v5
8280
with:
83-
python-version: '3.11'
81+
python-version: '3.12'
8482
- name: Install dependencies
8583
run: |
8684
python -m pip install --upgrade pip
@@ -93,7 +91,6 @@ jobs:
9391
PYTHONPATH=$PYTHONPATH:$GITHUB_WORKSPACE python -m pytest --nbmake -n=auto --nbmake-timeout=900 "./tutorials"
9492
9593
tutorial_warnings_tests:
96-
9794
runs-on: ubuntu-latest
9895
steps:
9996
- uses: actions/checkout@v4
@@ -110,7 +107,7 @@ jobs:
110107
python -m pip list
111108
- name: Test with pytest
112109
run: |
113-
PYTHONPATH=$PYTHONPATH:$GITHUB_WORKSPACE python -m pytest -W error --nbmake -n=auto --nbmake-timeout=900 "./tutorials"
110+
PYTHONPATH=$PYTHONPATH:$GITHUB_WORKSPACE python -m pytest -W default --nbmake -n=auto --nbmake-timeout=900 "./tutorials"
114111
115112
docs_check:
116113
needs: build

.github/workflows/test_release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ${{ matrix.os }}
1818
strategy:
1919
matrix:
20-
python-version: ['3.9', '3.10', '3.11', '3.12']
20+
python-version: ['3.10', '3.11', '3.12', '3.13']
2121
os: [ ubuntu-latest, windows-latest ]
2222

2323
steps:
@@ -38,15 +38,15 @@ jobs:
3838
- name: Install specific dependencies (Windows)
3939
if: matrix.os == 'windows-latest'
4040
run: |
41-
if ( '${{ matrix.python-version }}' -eq '3.9' ) { python -m pip install pypower }
42-
if ( '${{ matrix.python-version }}' -ne '3.9' ) { python -m pip install numba }
41+
if ( '${{ matrix.python-version }}' -eq '3.10' ) { python -m pip install pypower }
42+
if ( '${{ matrix.python-version }}' -ne '3.10' ) { python -m pip install numba }
4343
if ( '${{ matrix.python-version }}' -eq '3.10' ) { python -m pip install lightsim2grid }
4444
4545
- name: Install specific dependencies (Ubuntu)
4646
if: matrix.os == 'ubuntu-latest'
4747
run: |
48-
if ${{ matrix.python-version == '3.9' }}; then python -m pip install pypower; fi
49-
if ${{ matrix.python-version != '3.9' }}; then python -m pip install numba; fi
48+
if ${{ matrix.python-version == '3.10' }}; then python -m pip install pypower; fi
49+
if ${{ matrix.python-version != '3.10' }}; then python -m pip install numba; fi
5050
if ${{ matrix.python-version == '3.10' }}; then python -m pip install lightsim2grid; fi
5151
5252
- name: List all installed packages

AUTHORS

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
Copyright (c) 2019-2021 by University of Kassel, TU Dortmund, RWTH Aachen University and Fraunhofer Institute for Energy Economics and Energy System Technology (IEE) Kassel and the following individual contributors list.
1+
Copyright (c) 2019-2026 by University of Kassel, TU Dortmund, RWTH Aachen University and Fraunhofer Institute for Energy Economics and Energy System Technology (IEE) Kassel and the following individual contributors list.
22
All rights reserved.
33

4+
* See simbench Contributors - https://github.com/e2nIEE/simbench/graphs/contributors
5+
6+
# simbench project Authors
47
Lead Developer:
58
- Steffen Meinecke
69

@@ -17,4 +20,6 @@ Coordination:
1720
- Lars-Peter Lauven
1821
- Tanja Kneiske
1922
- Albert Moser
20-
- Christian Rehtanz
23+
- Christian Rehtanz
24+
25+

CHANGELOG.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
Change Log
22
=============
33

4+
[1.6.2] - 2026-04-02
5+
----------------------
6+
- [ADDED] python 3.13 support
7+
- [CHANGED] drop python 3.9 support
8+
- [ADDED] new load parameters at the pandapower network creation to fit to pandapower 3.2
9+
- [CHANGED] extended the list of parameters (new in pandapower) that would be casted from NaN to True (without adaption in the converter function `csv_csv_data2pp()`) but should be False by default
10+
411
[1.6.1] - 2024-04-13
512
----------------------
613
- [CHANGED] nothing - just a correct upload to pypi

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2019-2021 by University of Kassel, TU Dortmund, RWTH Aachen University and Fraunhofer Institute for Energy Economics and Energy System Technology (IEE) Kassel and individual contributors (see AUTHORS file for details).
1+
Copyright (c) 2019-2026 by University of Kassel, TU Dortmund, RWTH Aachen University and Fraunhofer Institute for Energy Economics and Energy System Technology (IEE) Kassel and individual contributors (see AUTHORS file for details).
22
All rights reserved.
33

44

doc/conf.py

Lines changed: 50 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -18,40 +18,45 @@
1818
# If extensions (or modules to document with autodoc) are in another directory,
1919
# add these directories to sys.path here. If the directory is relative to the
2020
# documentation root, use os.path.abspath to make it absolute, like shown here.
21-
#sys.path.insert(0, os.path.abspath('.'))
21+
# sys.path.insert(0, os.path.abspath('.'))
2222

2323
# -- General configuration -----------------------------------------------------
2424

2525
# If your documentation needs a minimal Sphinx version, state it here.
26-
#needs_sphinx = '1.3'
26+
# needs_sphinx = '1.3'
2727

2828
sys.path.append(os.path.abspath(".."))
2929
sys.path.append(os.path.abspath(".\\_themes"))
3030
sys.path.append(os.path.abspath("..\\tests"))
3131
sys.path.append(os.path.abspath("..\\network_generator"))
3232
# Add any Sphinx extension module names here, as strings. They can be extensions
3333
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
34-
extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.mathjax', 'sphinx.ext.autodoc', 'numpydoc',
35-
'sphinx.ext.autosummary'] #sphinx.ext.mathjax and sphinx.ext.imgmath don't comply with each other anymore., pngmath will be replaced by imgmath in new sphinx version
34+
extensions = [
35+
"sphinx.ext.intersphinx",
36+
"sphinx.ext.mathjax",
37+
"sphinx.ext.autodoc",
38+
"numpydoc",
39+
"sphinx.ext.autosummary",
40+
] # sphinx.ext.mathjax and sphinx.ext.imgmath don't comply with each other anymore., pngmath will be replaced by imgmath in new sphinx version
3641

3742
# Add any paths that contain templates here, relative to this directory.
38-
templates_path = ['_templates']
43+
templates_path = ["_templates"]
3944

4045
# The suffix of source filenames.
41-
source_suffix = '.rst'
46+
source_suffix = ".rst"
4247

4348
# load pyproject.toml configuration
4449
config = SphinxConfig("../pyproject.toml")
4550

4651
# The encoding of source files.
47-
#source_encoding = 'utf-8-sig'
52+
# source_encoding = 'utf-8-sig'
4853

4954
# The master toctree document.
50-
master_doc = 'index'
55+
master_doc = "index"
5156

5257
# General information about the project.
5358
project = config.name
54-
copyright = u'2015-2024 by Fraunhofer IEE and University of Kassel'
59+
copyright = "2015-2025 by Fraunhofer IEE and University of Kassel"
5560

5661
# The version info for the project you're documenting, acts as replacement for
5762
# |version| and |release|, also used in various other places throughout the
@@ -64,37 +69,37 @@
6469

6570
# The language for content autogenerated by Sphinx. Refer to documentation
6671
# for a list of supported languages.
67-
#language = None
72+
# language = None
6873

6974
# There are two options for replacing |today|: either, you set today to some
7075
# non-false value, then it is used:
71-
#today = ''
76+
# today = ''
7277
# Else, today_fmt is used as the format for a strftime call.
73-
#today_fmt = '%B %d, %Y'
78+
# today_fmt = '%B %d, %Y'
7479

7580
# List of patterns, relative to source directory, that match files and
7681
# directories to ignore when looking for source files.
77-
exclude_patterns = ['_build', '**.ipynb_checkpoints']
82+
exclude_patterns = ["_build", "**.ipynb_checkpoints"]
7883

7984
# The reST default role (used for this markup: `text`) to use for all documents.
80-
#default_role = None
85+
# default_role = None
8186

8287
# If true, '()' will be appended to :func: etc. cross-reference text.
83-
#add_function_parentheses = True
88+
# add_function_parentheses = True
8489

8590
# If true, the current module name will be prepended to all description
8691
# unit titles (such as .. function::).
87-
#add_module_names = True
92+
# add_module_names = True
8893

8994
# If true, sectionauthor and moduleauthor directives will be shown in the
9095
# output. They are ignored by default.
91-
#show_authors = False
96+
# show_authors = False
9297

9398
# The name of the Pygments (syntax highlighting) style to use.
94-
pygments_style = 'sphinx'
99+
pygments_style = "sphinx"
95100

96101
# A list of ignored prefixes for module index sorting.
97-
#modindex_common_prefix = []
102+
# modindex_common_prefix = []
98103

99104

100105
# -- Options for HTML output ---------------------------------------------------
@@ -107,26 +112,26 @@
107112
# Theme options are theme-specific and customize the look and feel of a theme
108113
# further. For a list of options available for each theme, see the
109114
# documentation.
110-
#html_theme_options = {}
115+
# html_theme_options = {}
111116

112117
# Add any paths that contain custom themes here, relative to this directory.
113118
html_theme_path = ["_themes"]
114119

115120
# The name for this set of Sphinx documents. If None, it defaults to
116121
# "<project> v<release> documentation".
117-
#html_title = None
122+
# html_title = None
118123

119124
# A shorter title for the navigation bar. Default is the same as html_title.
120-
#html_short_title = None
125+
# html_short_title = None
121126

122127
# The name of an image file (relative to this directory) to place at the top
123128
# of the sidebar.
124-
#html_logo = None
129+
# html_logo = None
125130

126131
# The name of an image file (within the static path) to use as favicon of the
127132
# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
128133
# pixels large.
129-
#html_favicon = None
134+
# html_favicon = None
130135

131136
# Add any paths that contain custom static files (such as style sheets) here,
132137
# relative to this directory. They are copied after the builtin static files,
@@ -135,57 +140,62 @@
135140

136141
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
137142
# using the given strftime format.
138-
#html_last_updated_fmt = '%b %d, %Y'
143+
# html_last_updated_fmt = '%b %d, %Y'
139144

140145
# If true, SmartyPants will be used to convert quotes and dashes to
141146
# typographically correct entities.
142-
#html_use_smartypants = True
147+
# html_use_smartypants = True
143148

144149
# Custom sidebar templates, maps document names to template names.
145-
#html_sidebars = {}
150+
# html_sidebars = {}
146151

147152
# Additional templates that should be rendered to pages, maps page names to
148153
# template names.
149-
#html_additional_pages = {}
154+
# html_additional_pages = {}
150155

151156
# If false, no module index is generated.
152-
#html_domain_indices = True
157+
# html_domain_indices = True
153158

154159
# If false, no index is generated.
155-
#html_use_index = True
160+
# html_use_index = True
156161

157162
# If true, the index is split into individual pages for each letter.
158-
#html_split_index = False
163+
# html_split_index = False
159164

160165
# If true, links to the reST sources are added to the pages.
161-
#html_show_sourcelink = True
166+
# html_show_sourcelink = True
162167

163168
# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
164-
#html_show_sphinx = True
169+
# html_show_sphinx = True
165170

166171
# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
167-
#html_show_copyright = True
172+
# html_show_copyright = True
168173

169174
# If true, an OpenSearch description file will be output, and all pages will
170175
# contain a <link> tag referring to it. The value of this option must be the
171176
# base URL from which the finished HTML is served.
172-
#html_use_opensearch = ''
177+
# html_use_opensearch = ''
173178

174179
# This is the file name suffix for HTML files (e.g. ".xhtml").
175-
#html_file_suffix = None
180+
# html_file_suffix = None
176181

177182
# Output file base name for HTML help builder.
178-
htmlhelp_basename = 'sb_doc'
183+
htmlhelp_basename = "sb_doc"
179184

180185

181186
# -- Options for manual page output --------------------------------------------
182187

183188
# One entry per manual page. List of tuples
184189
# (source start file, name, description, authors, manual section).
185190
man_pages = [
186-
('index', 'jsonpy', u'jsonpy Documentation',
187-
['Fraunhofer IEE', 'Kassel University'], 1)
191+
(
192+
"index",
193+
"jsonpy",
194+
"jsonpy Documentation",
195+
["Fraunhofer IEE", "Kassel University"],
196+
1,
197+
)
188198
]
189199

190200
# If true, show URL addresses after external links.
191-
#man_show_urls = False
201+
# man_show_urls = False

0 commit comments

Comments
 (0)