Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

geopandas 1.0 release fix #2368

Merged
merged 6 commits into from
Aug 7, 2024
Merged

geopandas 1.0 release fix #2368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a06b1d6
fix geopandas 1.0 release
Jun 26, 2024
1394aea
Merge branch 'hotfix/geopandas1_release'
Jun 26, 2024
081f2aa
added chaneglog for this fix and the prior scipy version fix
Jul 8, 2024
3df5424
Merge pull request #2318 from mfranz13/master
mfranz13 Aug 7, 2024
d05e527
fixed version problem from ls2g
vogt31337 Aug 7, 2024
f499d71
Merge branch 'hotfix/ls2g_fix'
vogt31337 Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
-------------------------------
Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
View file
Open in desktop
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.9"
release = "2.14.10"

# 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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
__version__ = "2.14.9"
__version__ = "2.14.10"
__format_version__ = "2.14.0"
12 changes: 6 additions & 6 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

setup(
name='pandapower',
version='2.14.9',
version='2.14.11',
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,19 +52,19 @@
"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"],
"performance": ["ortools", "numba", "lightsim2grid~=0.8.1"],
"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,
"ortools", "lightsim2grid~=0.8.1",
"xlsxwriter", "openpyxl", "cryptography",
"psycopg2", # for PostgreSQL I/O
"matpowercaseframes",
Expand Down
Loading