Skip to content

Commit 80072c1

Browse files
authored
Merge pull request #928 from venu1412/master
Updated pandas to 2.x
2 parents ab9b761 + 50d9c80 commit 80072c1

File tree

7 files changed

+11
-7
lines changed

7 files changed

+11
-7
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
### Updates
66

7+
- Updated pandas version to 2.x
78
- Enable automated test run as required step for release process
89
- Enable basic DependaBot scanning for pip packages and GitHub actions used in CI
910
- Add CI support for release proces with [release.yaml](.github/workflows/release.yml) workflow

autovizwidget/autovizwidget/plotlygraphs/graphbase.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def _get_x_y_values_aggregated(df, x_column, y_column, y_aggregation):
115115
else:
116116
try:
117117
if y_aggregation == Encoding.y_agg_avg:
118-
df_transformed = df_grouped.mean()
118+
df_transformed = df_grouped.mean(numeric_only=True)
119119
elif y_aggregation == Encoding.y_agg_min:
120120
df_transformed = df_grouped.min()
121121
elif y_aggregation == Encoding.y_agg_max:

autovizwidget/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ plotly>=3
22
ipywidgets>5.0.0
33
hdijupyterutils>=0.6
44
notebook>=4.2
5-
pandas>=0.20.1,<2.0.0
5+
pandas<3.0.0

hdijupyterutils/hdijupyterutils/configuration.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"""Utility to read configs from file."""
2+
23
# Distributed under the terms of the Modified BSD License.
34
import json
45
import sys

hdijupyterutils/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ ipython>=4.0.2
22
ipywidgets>5.0.0
33
ipykernel>=4.2.2
44
jupyter>=1
5-
pandas>=0.17.1,<2.0.0
5+
pandas<3.0.0
66
numpy>=1.16.5
77
notebook>=4.2

sparkmagic/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
hdijupyterutils>=0.6
22
autovizwidget>=0.6
33
ipython>=4.0.2
4-
pandas>=0.17.1,<2.0.0
4+
pandas<3.0.0
55
numpy
66
requests
77
ipykernel>=4.2.2

sparkmagic/sparkmagic/livyclientlib/livysession.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -404,9 +404,11 @@ def get_row_html(self, current_session_id):
404404
self.get_html_link("Link", self.get_spark_ui_url()),
405405
self.get_html_link("Link", self.get_driver_log_url()),
406406
self.get_user(),
407-
""
408-
if current_session_id is None or current_session_id != self.id
409-
else "\u2714",
407+
(
408+
""
409+
if current_session_id is None or current_session_id != self.id
410+
else "\u2714"
411+
),
410412
)
411413

412414
@staticmethod

0 commit comments

Comments
 (0)