From a06b1d69d386b8f46cd608cf694c7013e3064371 Mon Sep 17 00:00:00 2001 From: Moritz Franz Date: Wed, 26 Jun 2024 07:58:45 +0200 Subject: [PATCH 1/3] fix geopandas 1.0 release --- doc/conf.py | 2 +- pandapower/_version.py | 2 +- setup.py | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index 534e2db0e..a51db903a 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -56,7 +56,7 @@ # The short X.Y version. version = "2.14" # The full version, including alpha/beta/rc tags. -release = "2.14.9" +release = "2.14.10" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/pandapower/_version.py b/pandapower/_version.py index a631f068a..af8265f54 100644 --- a/pandapower/_version.py +++ b/pandapower/_version.py @@ -1,2 +1,2 @@ -__version__ = "2.14.9" +__version__ = "2.14.10" __format_version__ = "2.14.0" diff --git a/setup.py b/setup.py index e303c4e00..d7190f0ce 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ setup( name='pandapower', - version='2.14.9', + version='2.14.10', author='Leon Thurner, Alexander Scheidler', author_email='leon.thurner@retoflow.de, alexander.scheidler@iee.fraunhofer.de', description='An easy to use open source tool for power system modeling, analysis and optimization with a high degree of automation.', @@ -52,17 +52,17 @@ "deepdiff"], extras_require={ "docs": ["numpydoc", "sphinx", "sphinx_rtd_theme"], - "plotting": ["plotly", "matplotlib<3.9", "igraph", "geopandas", "geojson"], + "plotting": ["plotly", "matplotlib<3.9", "igraph", "geopandas<1.0", "geojson"], # "shapely", "pyproj" are dependencies of geopandas and so already available; # "base64", "hashlib", "zlib" produce installing problems, so they are not included "test": ["pytest", "pytest-xdist"], "performance": ["ortools", "numba", "lightsim2grid"], "pgm": ["power-grid-model-io"], - "fileio": ["xlsxwriter", "openpyxl", "cryptography", "geopandas", "psycopg2"], + "fileio": ["xlsxwriter", "openpyxl", "cryptography", "geopandas<1.0", "psycopg2"], # "fiona" is a depedency of geopandas and so already available "converter": ["matpowercaseframes"], "all": ["numpydoc", "sphinx", "sphinx_rtd_theme", - "plotly>=3.1.1", "matplotlib<3.9", "igraph", "geopandas", "geojson", + "plotly>=3.1.1", "matplotlib<3.9", "igraph", "geopandas<1.0", "geojson", "pytest~=8.1", "pytest-xdist", "ortools", # lightsim2grid, "xlsxwriter", "openpyxl", "cryptography", From 081f2aad30bd6ba20084195a1029aa3e5ffea16b Mon Sep 17 00:00:00 2001 From: Moritz Franz Date: Mon, 8 Jul 2024 07:33:49 +0200 Subject: [PATCH 2/3] added chaneglog for this fix and the prior scipy version fix --- CHANGELOG.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 858c9520e..932e7c643 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,12 @@ Change Log ============= +[2.14.10] - 2024-07-08 +------------------------------- +- [FIXED] geopandas version + +[2.14.9] - 2024-06-25 +------------------------------- +- [FIXED] scipy version [2.14.8] - 2024-06-19 ------------------------------- From d05e527bf9d99a446b61111cc3707828e9c3ec1d Mon Sep 17 00:00:00 2001 From: mvogt Date: Wed, 7 Aug 2024 15:12:23 +0200 Subject: [PATCH 3/3] fixed version problem from ls2g --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index d7190f0ce..247869323 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ setup( name='pandapower', - version='2.14.10', + version='2.14.11', author='Leon Thurner, Alexander Scheidler', author_email='leon.thurner@retoflow.de, alexander.scheidler@iee.fraunhofer.de', description='An easy to use open source tool for power system modeling, analysis and optimization with a high degree of automation.', @@ -56,7 +56,7 @@ # "shapely", "pyproj" are dependencies of geopandas and so already available; # "base64", "hashlib", "zlib" produce installing problems, so they are not included "test": ["pytest", "pytest-xdist"], - "performance": ["ortools", "numba", "lightsim2grid"], + "performance": ["ortools", "numba", "lightsim2grid~=0.8.1"], "pgm": ["power-grid-model-io"], "fileio": ["xlsxwriter", "openpyxl", "cryptography", "geopandas<1.0", "psycopg2"], # "fiona" is a depedency of geopandas and so already available @@ -64,7 +64,7 @@ "all": ["numpydoc", "sphinx", "sphinx_rtd_theme", "plotly>=3.1.1", "matplotlib<3.9", "igraph", "geopandas<1.0", "geojson", "pytest~=8.1", "pytest-xdist", - "ortools", # lightsim2grid, + "ortools", "lightsim2grid~=0.8.1", "xlsxwriter", "openpyxl", "cryptography", "psycopg2", # for PostgreSQL I/O "matpowercaseframes",