Skip to content

Commit 9a42975

Browse files
committed
Update pandas to 2.1.4
1 parent 17d1014 commit 9a42975

7 files changed

Lines changed: 25 additions & 25 deletions

File tree

dabest/_dabest_object.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@ def _get_plot_data(self, x, y, all_plot_groups):
667667
all_plot_groups, ordered=True, inplace=True
668668
)
669669
else:
670-
plot_data.loc[:, self.__xvar] = pd.Categorical(
670+
plot_data[self.__xvar] = pd.Categorical(
671671
plot_data[self.__xvar], categories=all_plot_groups, ordered=True
672672
)
673673

dabest/plot_tools.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,25 +117,25 @@ def error_bar(
117117
else:
118118
group_order = pd.unique(data[x])
119119

120-
means = data.groupby(x)[y].mean().reindex(index=group_order)
120+
means = data.groupby(x, observed=False)[y].mean().reindex(index=group_order)
121121

122122
if method in ["proportional_error_bar", "sankey_error_bar"]:
123123
g = lambda x: np.sqrt(
124124
(np.sum(x) * (len(x) - np.sum(x))) / (len(x) * len(x) * len(x))
125125
)
126-
sd = data.groupby(x)[y].apply(g)
126+
sd = data.groupby(x, observed=False)[y].apply(g)
127127
else:
128-
sd = data.groupby(x)[y].std().reindex(index=group_order)
128+
sd = data.groupby(x, observed=False)[y].std().reindex(index=group_order)
129129

130130
lower_sd = means - sd
131131
upper_sd = means + sd
132132

133133
if (lower_sd < ax_ylims[0]).any() or (upper_sd > ax_ylims[1]).any():
134134
kwargs["clip_on"] = True
135135

136-
medians = data.groupby(x)[y].median().reindex(index=group_order)
136+
medians = data.groupby(x, observed=False)[y].median().reindex(index=group_order)
137137
quantiles = (
138-
data.groupby(x)[y].quantile([0.25, 0.75]).unstack().reindex(index=group_order)
138+
data.groupby(x, observed=False)[y].quantile([0.25, 0.75]).unstack().reindex(index=group_order)
139139
)
140140
lower_quartiles = quantiles[0.25]
141141
upper_quartiles = quantiles[0.75]

dabest/plotter.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ def effectsize_df_plotter(effectsize_df, **plot_kwargs):
780780
)
781781

782782
# Add the counts to the rawdata axes xticks.
783-
counts = plot_data.groupby(xvar).count()[yvar]
783+
counts = plot_data.groupby(xvar, observed=False).count()[yvar]
784784
ticks_with_counts = []
785785
ticks_loc = rawdata_axes.get_xticks()
786786
rawdata_axes.xaxis.set_major_locator(matplotlib.ticker.FixedLocator(ticks_loc))
@@ -1076,19 +1076,19 @@ def effectsize_df_plotter(effectsize_df, **plot_kwargs):
10761076
# Check that the effect size is within the swarm ylims.
10771077
if effect_size_type in ["mean_diff", "cohens_d", "hedges_g", "cohens_h"]:
10781078
control_group_summary = (
1079-
plot_data.groupby(xvar)
1079+
plot_data.groupby(xvar, observed=False)
10801080
.mean(numeric_only=True)
10811081
.loc[current_control, yvar]
10821082
)
10831083
test_group_summary = (
1084-
plot_data.groupby(xvar).mean(numeric_only=True).loc[current_group, yvar]
1084+
plot_data.groupby(xvar, observed=False).mean(numeric_only=True).loc[current_group, yvar]
10851085
)
10861086
elif effect_size_type == "median_diff":
10871087
control_group_summary = (
1088-
plot_data.groupby(xvar).median(numeric_only=True).loc[current_control, yvar]
1088+
plot_data.groupby(xvar, observed=False).median(numeric_only=True).loc[current_control, yvar]
10891089
)
10901090
test_group_summary = (
1091-
plot_data.groupby(xvar).median(numeric_only=True).loc[current_group, yvar]
1091+
plot_data.groupby(xvar, observed=False).median(numeric_only=True).loc[current_group, yvar]
10921092
)
10931093

10941094
if swarm_ylim is None:
@@ -1132,7 +1132,7 @@ def effectsize_df_plotter(effectsize_df, **plot_kwargs):
11321132
pooled_sd = stds[0]
11331133

11341134
if effect_size_type == "hedges_g":
1135-
gby_count = plot_data.groupby(xvar).count()
1135+
gby_count = plot_data.groupby(xvar, observed=False).count()
11361136
len_control = gby_count.loc[current_control, yvar]
11371137
len_test = gby_count.loc[current_group, yvar]
11381138

nbs/API/dabest_object.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@
735735
" all_plot_groups, ordered=True, inplace=True\n",
736736
" )\n",
737737
" else:\n",
738-
" plot_data.loc[:, self.__xvar] = pd.Categorical(\n",
738+
" plot_data[self.__xvar] = pd.Categorical(\n",
739739
" plot_data[self.__xvar], categories=all_plot_groups, ordered=True\n",
740740
" )\n",
741741
"\n",

nbs/API/plot_tools.ipynb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,25 +170,25 @@
170170
" else:\n",
171171
" group_order = pd.unique(data[x])\n",
172172
"\n",
173-
" means = data.groupby(x)[y].mean().reindex(index=group_order)\n",
173+
" means = data.groupby(x, observed=False)[y].mean().reindex(index=group_order)\n",
174174
"\n",
175175
" if method in [\"proportional_error_bar\", \"sankey_error_bar\"]:\n",
176176
" g = lambda x: np.sqrt(\n",
177177
" (np.sum(x) * (len(x) - np.sum(x))) / (len(x) * len(x) * len(x))\n",
178178
" )\n",
179-
" sd = data.groupby(x)[y].apply(g)\n",
179+
" sd = data.groupby(x, observed=False)[y].apply(g)\n",
180180
" else:\n",
181-
" sd = data.groupby(x)[y].std().reindex(index=group_order)\n",
181+
" sd = data.groupby(x, observed=False)[y].std().reindex(index=group_order)\n",
182182
"\n",
183183
" lower_sd = means - sd\n",
184184
" upper_sd = means + sd\n",
185185
"\n",
186186
" if (lower_sd < ax_ylims[0]).any() or (upper_sd > ax_ylims[1]).any():\n",
187187
" kwargs[\"clip_on\"] = True\n",
188188
"\n",
189-
" medians = data.groupby(x)[y].median().reindex(index=group_order)\n",
189+
" medians = data.groupby(x, observed=False)[y].median().reindex(index=group_order)\n",
190190
" quantiles = (\n",
191-
" data.groupby(x)[y].quantile([0.25, 0.75]).unstack().reindex(index=group_order)\n",
191+
" data.groupby(x, observed=False)[y].quantile([0.25, 0.75]).unstack().reindex(index=group_order)\n",
192192
" )\n",
193193
" lower_quartiles = quantiles[0.25]\n",
194194
" upper_quartiles = quantiles[0.75]\n",

nbs/API/plotter.ipynb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -837,7 +837,7 @@
837837
" )\n",
838838
"\n",
839839
" # Add the counts to the rawdata axes xticks.\n",
840-
" counts = plot_data.groupby(xvar).count()[yvar]\n",
840+
" counts = plot_data.groupby(xvar, observed=False).count()[yvar]\n",
841841
" ticks_with_counts = []\n",
842842
" ticks_loc = rawdata_axes.get_xticks()\n",
843843
" rawdata_axes.xaxis.set_major_locator(matplotlib.ticker.FixedLocator(ticks_loc))\n",
@@ -1133,19 +1133,19 @@
11331133
" # Check that the effect size is within the swarm ylims.\n",
11341134
" if effect_size_type in [\"mean_diff\", \"cohens_d\", \"hedges_g\", \"cohens_h\"]:\n",
11351135
" control_group_summary = (\n",
1136-
" plot_data.groupby(xvar)\n",
1136+
" plot_data.groupby(xvar, observed=False)\n",
11371137
" .mean(numeric_only=True)\n",
11381138
" .loc[current_control, yvar]\n",
11391139
" )\n",
11401140
" test_group_summary = (\n",
1141-
" plot_data.groupby(xvar).mean(numeric_only=True).loc[current_group, yvar]\n",
1141+
" plot_data.groupby(xvar, observed=False).mean(numeric_only=True).loc[current_group, yvar]\n",
11421142
" )\n",
11431143
" elif effect_size_type == \"median_diff\":\n",
11441144
" control_group_summary = (\n",
1145-
" plot_data.groupby(xvar).median(numeric_only=True).loc[current_control, yvar]\n",
1145+
" plot_data.groupby(xvar, observed=False).median(numeric_only=True).loc[current_control, yvar]\n",
11461146
" )\n",
11471147
" test_group_summary = (\n",
1148-
" plot_data.groupby(xvar).median(numeric_only=True).loc[current_group, yvar]\n",
1148+
" plot_data.groupby(xvar, observed=False).median(numeric_only=True).loc[current_group, yvar]\n",
11491149
" )\n",
11501150
"\n",
11511151
" if swarm_ylim is None:\n",
@@ -1189,7 +1189,7 @@
11891189
" pooled_sd = stds[0]\n",
11901190
"\n",
11911191
" if effect_size_type == \"hedges_g\":\n",
1192-
" gby_count = plot_data.groupby(xvar).count()\n",
1192+
" gby_count = plot_data.groupby(xvar, observed=False).count()\n",
11931193
" len_control = gby_count.loc[current_control, yvar]\n",
11941194
" len_test = gby_count.loc[current_group, yvar]\n",
11951195
"\n",

settings.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ language = English
3737
status = 3
3838
user = acclab
3939

40-
requirements = fastcore pandas~=1.5.3 numpy~=1.26 matplotlib~=3.8.4 seaborn~=0.12.2 scipy~=1.12 datetime statsmodels lqrt
40+
requirements = fastcore pandas~=2.1.4 numpy~=1.26 matplotlib~=3.8.4 seaborn~=0.12.2 scipy~=1.12 datetime statsmodels lqrt
4141
dev_requirements = pytest~=7.2.1 pytest-mpl~=0.16.1
4242

4343
### Optional ###

0 commit comments

Comments
 (0)