Skip to content

Commit

Permalink
added changelog entry; test if optional dependency setuptools is suff…
Browse files Browse the repository at this point in the history
…icient
  • Loading branch information
dlohmeier committed Aug 20, 2024
1 parent cc031b5 commit 9e62bb0
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
10 changes: 6 additions & 4 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ Change Log
=============


-[ADDED] heat_consumer plotting
-[CHANGED] switched from setup.py to pyproject.toml
- [CHANGED] variable "alpha_w_per_m2k" to "u_w_per_m2k"
- [FIXED] Pressure plot not working for circ pump
- [ADDED] heat_consumer plotting
- [ADDED] variable "u_w_per_m2k" to std_type pipe
- [ADDED] standard district heating pipe types
- [ADDED] support for Python 3.12
- [CHANGED] switched from setup.py to pyproject.toml
- [CHANGED] variable "alpha_w_per_m2k" to "u_w_per_m2k"
- [FIXED] Pressure plot not working for circ pump
- [REMOVED] support for Python 3.8 due to EOL



Expand Down
14 changes: 7 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ classifiers = [
"Programming Language :: Python :: 3.12"
]
dependencies = [
'pandapower ~= 2.14.6',
'matplotlib',
'shapely',
'setuptools; python_version >= "3.12"',
"pandapower ~= 2.14.6",
"matplotlib",
"shapely",
]
keywords = [
"network", "analysis", "optimization", "automation", "grid", "energy", "engineering", "simulation", "pipeflow", "pandapipes", "gas"
"network", "analysis", "optimization", "automation", "grid", "energy", "engineering",
"simulation", "pipeflow", "pandapipes", "gas"
]

[project.urls]
Expand All @@ -53,10 +53,10 @@ Changelog = "https://github.com/e2nIEE/pandapipes/blob/develop/CHANGELOG.rst"
[project.optional-dependencies]
docs = ["numpydoc", "sphinx", "sphinx_rtd_theme", "sphinxcontrib.bibtex", "sphinx-pyproject"]
plotting = ["plotly", "igraph"]
test = ["pytest", "pytest-xdist", "nbmake"]
test = ["pytest", "pytest-xdist", "nbmake", "setuptools; python_version >= '3.12'"]
all = [
"numpydoc", "sphinx", "sphinx_rtd_theme", "sphinxcontrib.bibtex",
"plotly", "igraph", "pytest", "pytest-xdist", "nbmake"
"plotly", "igraph", "pytest", "pytest-xdist", "nbmake", "setuptools; python_version >= '3.12'"
]

[tool.setuptools.packages.find]
Expand Down

0 comments on commit 9e62bb0

Please sign in to comment.