Skip to content

Commit

Permalink
Merge branch 'develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonRubenDrauz authored Jan 8, 2025
2 parents 4c65d83 + 1fb8de3 commit e256df0
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 19 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
Change Log
=============

[upcoming release] - 2024-..-..
[upcoming release] - 2025-..-..
-------------------------------
- [REMOVED] Excluding tests and test_files from built packages
- [ADDED] Static Var Compensator with Voltage Control
- [ADDED] Implementation of Allocation Factor WLS (AF-WLS) for non observable distribution grids
- [FIXED] Deletion of multiple measurements at the same bus or branch
Expand Down
15 changes: 0 additions & 15 deletions MANIFEST.in

This file was deleted.

File renamed without changes.
31 changes: 28 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,34 @@ all = [
# "shapely", "pyproj", "Pyogrio" are dependencies of geopandas and should be already available ("Fiona" got dropped)
# "hashlib", "zlib", "base64" produce install problems, so they are not included

[tool.setuptools.packages]
find = {}

[tool.setuptools]
license-files = [
'LICEN[CS]E*',
'COPYING*',
'NOTICE*',
'AUTHORS*',
'CHANGELOG*',
'CITATION*',
]

[tool.setuptools.packages.find]
include = [
"pandapower*",
]
exclude = [
"pandapower.test*",
]

[tool.setuptools.package-data]
"*" = [
"*.p",
"*.m",
"*.mat",
"*.json",
"*.jl",
"*.csv"
]

[tool.pytest.ini_options]
addopts = ["--strict-markers"]
Expand All @@ -92,7 +117,7 @@ markers = [
[tool.coverage.run]
omit = [
"pandapower/test/*"
]
]
[tool.coverage.report]
exclude_lines = [
"pragma: no cover",
Expand Down

0 comments on commit e256df0

Please sign in to comment.