Skip to content

Commit 5902587

Browse files
fix pandas futurewarnings without pinning pandas (#634)
1 parent c9cf35b commit 5902587

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

CHANGELOG.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
**3.4.9 - 07/31/25**
2+
3+
- Modify futurewarning fix from v3.4.7 to not require pandas>=2.2.0
4+
15
**3.4.8 - 07/25/25**
26

37
- Feature: Support new environment creation via 'make build-env'

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"vivarium_build_utils>=2.0.1,<3.0.0",
4545
"layered_config_tree>=2.1.0",
4646
"numpy<2.0.0",
47-
"pandas>=2.2.0",
47+
"pandas",
4848
"pyyaml>=5.1",
4949
"scipy",
5050
"click",

src/vivarium/framework/results/observation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ def _aggregate(
340340
aggregates = (
341341
pop_groups[aggregator_sources].apply(aggregator).fillna(0.0) # type: ignore [arg-type]
342342
if aggregator_sources
343-
else pop_groups.apply(aggregator, include_groups=False) # type: ignore [arg-type]
343+
else pop_groups[pop_groups.obj.columns].apply(aggregator) # type: ignore [arg-type]
344344
).astype(float)
345345
return aggregates
346346

0 commit comments

Comments
 (0)