Skip to content

Commit f973e00

Browse files
authored
Merge pull request #2306 from e2nIEE/hotfix/read-the-docs-config
fixed .readthedocs.yml
2 parents 991eef5 + 66e91fd commit f973e00

File tree

5 files changed

+18
-7
lines changed

5 files changed

+18
-7
lines changed

.readthedocs.yml

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
1+
# Read the Docs configuration file for Sphinx projects
2+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
13
version: 2
24

5+
build:
6+
os: ubuntu-22.04
7+
tools:
8+
python: "3.11"
9+
10+
sphinx:
11+
configuration: doc/conf.py
12+
313
python:
4-
version: 3.8
514
install:
615
- method: pip
716
path: .

CHANGELOG.rst

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
Change Log
22
=============
33

4-
[upcoming release] - 2024-..-..
4+
[2.14.7] - 2024-06-14
55
-------------------------------
6+
- [FIXED] read the docs configuration
7+
- [FIXED] bug caused by new matplotlib version in plotting
68

79
[2.14.6] - 2024-04-02
810
-------------------------------

doc/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
# The short X.Y version.
5757
version = "2.14"
5858
# The full version, including alpha/beta/rc tags.
59-
release = "2.14.0"
59+
release = "2.14.7"
6060

6161
# The language for content autogenerated by Sphinx. Refer to documentation
6262
# for a list of supported languages.

pandapower/_version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
__version__ = "2.14.6"
1+
__version__ = "2.14.7"
22
__format_version__ = "2.14.0"

setup.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
setup(
3636
name='pandapower',
37-
version='2.14.6',
37+
version='2.14.7',
3838
author='Leon Thurner, Alexander Scheidler',
3939
4040
description='An easy to use open source tool for power system modeling, analysis and optimization with a high degree of automation.',
@@ -52,7 +52,7 @@
5252
"deepdiff"],
5353
extras_require={
5454
"docs": ["numpydoc", "sphinx", "sphinx_rtd_theme"],
55-
"plotting": ["plotly", "matplotlib", "igraph", "geopandas", "geojson"],
55+
"plotting": ["plotly", "matplotlib<3.9", "igraph", "geopandas", "geojson"],
5656
# "shapely", "pyproj" are dependencies of geopandas and so already available;
5757
# "base64", "hashlib", "zlib" produce installing problems, so they are not included
5858
"test": ["pytest", "pytest-xdist"],
@@ -62,7 +62,7 @@
6262
# "fiona" is a depedency of geopandas and so already available
6363
"converter": ["matpowercaseframes"],
6464
"all": ["numpydoc", "sphinx", "sphinx_rtd_theme",
65-
"plotly>=3.1.1", "matplotlib", "igraph", "geopandas", "geojson",
65+
"plotly>=3.1.1", "matplotlib<3.9", "igraph", "geopandas", "geojson",
6666
"pytest~=8.1", "pytest-xdist",
6767
"ortools", # lightsim2grid,
6868
"xlsxwriter", "openpyxl", "cryptography",

0 commit comments

Comments
 (0)