MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

[python] Handle geopandas.GeoSeries objects when displayed as series (PY-65265)

Browse Source 
GitOrigin-RevId: 0acf9212138809604c671110df60a869637e6578
This commit is contained in:
lada.gagina
2024-04-10 19:47:09 +02:00
committed by intellij-monorepo-bot
parent 89c7ffdfce
commit 6355c749f6
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
python/helpers/pydev/_pydevd_bundle/pydevd_tables.py
View File

@@ -66,7 +66,8 @@ def __get_table_provider(output):
table_provider = None
type_qualified_name = '{}.{}'.format(output_type.__module__, output_type.__name__)
if type_qualified_name in ['pandas.core.frame.DataFrame',
'pandas.core.series.Series']:
'pandas.core.series.Series',
'geopandas.geoseries.GeoSeries']:
import _pydevd_bundle.tables.pydevd_pandas as table_provider
# dict is needed for sort commands
elif type_qualified_name in ['numpy.ndarray', 'builtins.dict']:

13
python/helpers/pydev/_pydevd_bundle/tables/pydevd_pandas.py
View File

@@ -1,7 +1,8 @@
# Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
import numpy as np
import pandas as pd
import typing
from typing import Hashable, Union
from geopandas import GeoSeries, GeoDataFrame
TABLE_TYPE_NEXT_VALUE_SEPARATOR = '__pydev_table_column_type_val__'
MAX_COLWIDTH_PYTHON_2 = 100000
@@ -104,7 +105,7 @@ def __get_describe(table):
exclude=[np.complex64, np.complex128])
except (TypeError, OverflowError, ValueError):
return
if type(table) is pd.Series:
if type(table) is pd.Series or type(table) is GeoSeries:
return described_
else:
return described_.reindex(columns=table.columns, copy=False)
@@ -220,8 +221,8 @@ def add_custom_key_value_separator(pairs_list):
# noinspection PyUnresolvedReferences
def __convert_to_df(table):
# type: (Union[pd.DataFrame, pd.Series, pd.Categorical]) -> pd.DataFrame
if type(table) is pd.Series:
# type: (Union[pd.DataFrame, pd.Series, GeoSeries, pd.Categorical]) -> Union[pd.DataFrame, GeoDataFrame]
if type(table) is pd.Series or type(table) is GeoSeries:
return __series_to_df(table)
if type(table) is pd.Categorical:
return __categorical_to_df(table)
@@ -230,7 +231,7 @@ def __convert_to_df(table):
# pandas.Series support
def __get_column_name(table):
# type: (pd.Series) -> str
# type: (Union[pd.Series, GeoSeries]) -> str
if table.name is not None:
# noinspection PyTypeChecker
return table.name
@@ -238,7 +239,7 @@ def __get_column_name(table):
def __series_to_df(table):
# type: (pd.Series) -> pd.DataFrame
# type: (Union[pd.Series, GeoSeries]) -> Union[pd.DataFrame, GeoDataFrame]
return table.to_frame(name=__get_column_name(table))