From ca4748b6dc717d477d1390c5e40d2b149f7dfb67 Mon Sep 17 00:00:00 2001 From: hkoertge Date: Fri, 14 Jun 2024 09:34:33 +0200 Subject: [PATCH 1/5] fixed .readthedocs.yml --- .readthedocs.yml | 13 +++++++++++-- CHANGELOG.rst | 3 ++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index bd6d4e74a..f54334a47 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -1,9 +1,18 @@ +# Read the Docs configuration file for Sphinx projects +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details version: 2 +build: + os: ubuntu-22.04 + tools: + python: "3.11" + +sphinx: + configuration: doc/conf.py + python: - version: 3.8 install: - method: pip path: . extra_requirements: - - docs,plotting + - docs,plotting \ No newline at end of file diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c7cafd1c4..5b323b6ee 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,8 +1,9 @@ Change Log ============= -[upcoming release] - 2024-..-.. +[2.14.7] - 2024-06-14 ------------------------------- +- [FIXED] read the docs configuration [2.14.6] - 2024-04-02 ------------------------------- From f4f9f2856cdd57e09928a0e7cdf736cf80549eb6 Mon Sep 17 00:00:00 2001 From: hkoertge Date: Fri, 14 Jun 2024 09:42:41 +0200 Subject: [PATCH 2/5] bumped version number --- doc/conf.py | 2 +- pandapower/_version.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index a6738f48f..6c2bf67e5 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.0" +release = "2.14.7" # 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 a1ed121c0..c08a2a99b 100644 --- a/pandapower/_version.py +++ b/pandapower/_version.py @@ -1,2 +1,2 @@ -__version__ = "2.14.6" +__version__ = "2.14.7" __format_version__ = "2.14.0" diff --git a/setup.py b/setup.py index aed612059..ae48216d7 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ setup( name='pandapower', - version='2.14.6', + version='2.14.7', 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.', From f58b5e1ab1e231a25a5eb7445ea25cfe2f2151ee Mon Sep 17 00:00:00 2001 From: hkoertge Date: Fri, 14 Jun 2024 11:32:37 +0200 Subject: [PATCH 3/5] retrigger checks --- .readthedocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index f54334a47..5f7051cc2 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -15,4 +15,4 @@ python: - method: pip path: . extra_requirements: - - docs,plotting \ No newline at end of file + - docs,plotting From 471395b2a453ad0d465c6ebbae63921e6a25f26e Mon Sep 17 00:00:00 2001 From: hkoertge Date: Fri, 14 Jun 2024 13:12:18 +0200 Subject: [PATCH 4/5] added version limit for matplotlib due to error --- CHANGELOG.rst | 1 + setup.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5b323b6ee..fb6a0d621 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,7 @@ Change Log [2.14.7] - 2024-06-14 ------------------------------- - [FIXED] read the docs configuration +- [FIXED] bug caused by new matplotlib version in plotting [2.14.6] - 2024-04-02 ------------------------------- diff --git a/setup.py b/setup.py index ae48216d7..55bc31c44 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ "deepdiff"], extras_require={ "docs": ["numpydoc", "sphinx", "sphinx_rtd_theme"], - "plotting": ["plotly", "matplotlib", "igraph", "geopandas", "geojson"], + "plotting": ["plotly", "matplotlib~=3.8.0", "igraph", "geopandas", "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"], @@ -62,7 +62,7 @@ # "fiona" is a depedency of geopandas and so already available "converter": ["matpowercaseframes"], "all": ["numpydoc", "sphinx", "sphinx_rtd_theme", - "plotly>=3.1.1", "matplotlib", "igraph", "geopandas", "geojson", + "plotly>=3.1.1", "matplotlib~=3.8.0", "igraph", "geopandas", "geojson", "pytest~=8.1", "pytest-xdist", "ortools", # lightsim2grid, "xlsxwriter", "openpyxl", "cryptography", From 66e91fdd576469366366621f8817167b6b42d018 Mon Sep 17 00:00:00 2001 From: hkoertge Date: Fri, 14 Jun 2024 13:15:30 +0200 Subject: [PATCH 5/5] updated issue in version limit --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 55bc31c44..0c1bc1873 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ "deepdiff"], extras_require={ "docs": ["numpydoc", "sphinx", "sphinx_rtd_theme"], - "plotting": ["plotly", "matplotlib~=3.8.0", "igraph", "geopandas", "geojson"], + "plotting": ["plotly", "matplotlib<3.9", "igraph", "geopandas", "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"], @@ -62,7 +62,7 @@ # "fiona" is a depedency of geopandas and so already available "converter": ["matpowercaseframes"], "all": ["numpydoc", "sphinx", "sphinx_rtd_theme", - "plotly>=3.1.1", "matplotlib~=3.8.0", "igraph", "geopandas", "geojson", + "plotly>=3.1.1", "matplotlib<3.9", "igraph", "geopandas", "geojson", "pytest~=8.1", "pytest-xdist", "ortools", # lightsim2grid, "xlsxwriter", "openpyxl", "cryptography",