Skip to content

Commit

Permalink
Merge pull request #2306 from e2nIEE/hotfix/read-the-docs-config
Browse files Browse the repository at this point in the history
fixed .readthedocs.yml
  • Loading branch information
vogt31337 authored Jun 14, 2024
2 parents 991eef5 + 66e91fd commit f973e00
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 7 deletions.
11 changes: 10 additions & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
# 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: .
Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
Change Log
=============

[upcoming release] - 2024-..-..
[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
-------------------------------
Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pandapower/_version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
__version__ = "2.14.6"
__version__ = "2.14.7"
__format_version__ = "2.14.0"
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

setup(
name='pandapower',
version='2.14.6',
version='2.14.7',
author='Leon Thurner, Alexander Scheidler',
author_email='[email protected], [email protected]',
description='An easy to use open source tool for power system modeling, analysis and optimization with a high degree of automation.',
Expand All @@ -52,7 +52,7 @@
"deepdiff"],
extras_require={
"docs": ["numpydoc", "sphinx", "sphinx_rtd_theme"],
"plotting": ["plotly", "matplotlib", "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"],
Expand All @@ -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.9", "igraph", "geopandas", "geojson",
"pytest~=8.1", "pytest-xdist",
"ortools", # lightsim2grid,
"xlsxwriter", "openpyxl", "cryptography",
Expand Down

0 comments on commit f973e00

Please sign in to comment.