@@ -516,15 +516,6 @@ def test_groupby_extension_no_sort(self, data_for_grouping, request):
516
516
reason = f"pyarrow doesn't support factorizing { pa_dtype } " ,
517
517
)
518
518
)
519
- elif pa .types .is_date (pa_dtype ) or (
520
- pa .types .is_timestamp (pa_dtype ) and pa_dtype .tz is None
521
- ):
522
- request .node .add_marker (
523
- pytest .mark .xfail (
524
- raises = AttributeError ,
525
- reason = "GH 34986" ,
526
- )
527
- )
528
519
super ().test_groupby_extension_no_sort (data_for_grouping )
529
520
530
521
def test_groupby_extension_transform (self , data_for_grouping , request ):
@@ -551,8 +542,7 @@ def test_groupby_extension_apply(
551
542
self , data_for_grouping , groupby_apply_op , request
552
543
):
553
544
pa_dtype = data_for_grouping .dtype .pyarrow_dtype
554
- # Is there a better way to get the "series" ID for groupby_apply_op?
555
- is_series = "series" in request .node .nodeid
545
+ # TODO: Is there a better way to get the "object" ID for groupby_apply_op?
556
546
is_object = "object" in request .node .nodeid
557
547
if pa .types .is_duration (pa_dtype ):
558
548
request .node .add_marker (
@@ -571,13 +561,6 @@ def test_groupby_extension_apply(
571
561
reason = "GH 47514: _concat_datetime expects axis arg." ,
572
562
)
573
563
)
574
- elif not is_series :
575
- request .node .add_marker (
576
- pytest .mark .xfail (
577
- raises = AttributeError ,
578
- reason = "GH 34986" ,
579
- )
580
- )
581
564
with tm .maybe_produces_warning (
582
565
PerformanceWarning , pa_version_under7p0 , check_stacklevel = False
583
566
):
@@ -610,16 +593,6 @@ def test_groupby_extension_agg(self, as_index, data_for_grouping, request):
610
593
reason = f"pyarrow doesn't support factorizing { pa_dtype } " ,
611
594
)
612
595
)
613
- elif as_index is True and (
614
- pa .types .is_date (pa_dtype )
615
- or (pa .types .is_timestamp (pa_dtype ) and pa_dtype .tz is None )
616
- ):
617
- request .node .add_marker (
618
- pytest .mark .xfail (
619
- raises = AttributeError ,
620
- reason = "GH 34986" ,
621
- )
622
- )
623
596
with tm .maybe_produces_warning (
624
597
PerformanceWarning , pa_version_under7p0 , check_stacklevel = False
625
598
):
@@ -1464,12 +1437,13 @@ def test_diff(self, data, periods, request):
1464
1437
@pytest .mark .parametrize ("dropna" , [True , False ])
1465
1438
def test_value_counts (self , all_data , dropna , request ):
1466
1439
pa_dtype = all_data .dtype .pyarrow_dtype
1467
- if pa .types .is_date (pa_dtype ) or (
1468
- pa .types .is_timestamp (pa_dtype ) and pa_dtype .tz is None
1469
- ):
1440
+ if (
1441
+ pa .types .is_date (pa_dtype )
1442
+ or (pa .types .is_timestamp (pa_dtype ) and pa_dtype .tz is None )
1443
+ ) and dropna :
1470
1444
request .node .add_marker (
1471
1445
pytest .mark .xfail (
1472
- raises = AttributeError ,
1446
+ raises = NotImplementedError , # tries casting to i8
1473
1447
reason = "GH 34986" ,
1474
1448
)
1475
1449
)
@@ -1489,7 +1463,7 @@ def test_value_counts_with_normalize(self, data, request):
1489
1463
):
1490
1464
request .node .add_marker (
1491
1465
pytest .mark .xfail (
1492
- raises = AttributeError ,
1466
+ raises = NotImplementedError , # tries casting to i8
1493
1467
reason = "GH 34986" ,
1494
1468
)
1495
1469
)
0 commit comments