@@ -187,17 +187,12 @@ def test_column_index_names_are_preserved(self):
187
187
_check_pandas_roundtrip (df , preserve_index = True )
188
188
189
189
def test_column_index_names_with_tz (self ):
190
- if Version ("2.0.0.dev0" ) <= Version (pd .__version__ ) < Version ("2.0.0" ):
191
- # TODO: regression in pandas, should be fixed before final 2.0.0
192
- # https://github.com/pandas-dev/pandas/issues/50140
193
- pytest .skip ("Regression in pandas 2.0.0.dev" )
194
190
# ARROW-13756
195
191
# Bug if index is timezone aware DataTimeIndex
196
192
197
193
df = pd .DataFrame (
198
194
np .random .randn (5 , 3 ),
199
- columns = pd .date_range (
200
- "2021-01-01" , "2021-01-3" , freq = "D" , tz = "CET" )
195
+ columns = pd .date_range ("2021-01-01" , periods = 3 , freq = "50D" , tz = "CET" )
201
196
)
202
197
_check_pandas_roundtrip (df , preserve_index = True )
203
198
@@ -453,11 +448,11 @@ def test_mixed_column_names(self):
453
448
preserve_index = True )
454
449
455
450
def test_binary_column_name (self ):
456
- if Version ("2.0.0.dev0 " ) <= Version (pd .__version__ ) < Version ("2.0 .0" ):
457
- # TODO: regression in pandas, should be fixed before final 2.0.0
451
+ if Version ("2.0.0" ) <= Version (pd .__version__ ) < Version ("2.1 .0" ):
452
+ # TODO: regression in pandas, hopefully fixed in next version
458
453
# https://issues.apache.org/jira/browse/ARROW-18394
459
454
# https://github.com/pandas-dev/pandas/issues/50127
460
- pytest .skip ("Regression in pandas 2.0.0.dev " )
455
+ pytest .skip ("Regression in pandas 2.0.0" )
461
456
column_data = ['い' ]
462
457
key = 'あ' .encode ()
463
458
data = {key : column_data }
@@ -2064,11 +2059,6 @@ def test_nested_smaller_ints(self):
2064
2059
assert result3 .equals (expected3 )
2065
2060
2066
2061
def test_infer_lists (self ):
2067
- if ((Version (np .__version__ ) >= Version ("1.25.0.dev0" )) and
2068
- (Version (pd .__version__ ) < Version ("2.0.0" ))):
2069
- # TODO: regression in pandas with numpy 1.25dev
2070
- # https://github.com/pandas-dev/pandas/issues/50360
2071
- pytest .skip ("Regression in pandas with numpy 1.25" )
2072
2062
data = OrderedDict ([
2073
2063
('nan_ints' , [[None , 1 ], [2 , 3 ]]),
2074
2064
('ints' , [[0 , 1 ], [2 , 3 ]]),
@@ -2118,11 +2108,6 @@ def test_infer_numpy_array(self):
2118
2108
_check_pandas_roundtrip (df , expected_schema = expected_schema )
2119
2109
2120
2110
def test_to_list_of_structs_pandas (self ):
2121
- if ((Version (np .__version__ ) >= Version ("1.25.0.dev0" )) and
2122
- (Version (pd .__version__ ) < Version ("2.0.0" ))):
2123
- # TODO: regression in pandas with numpy 1.25dev
2124
- # https://github.com/pandas-dev/pandas/issues/50360
2125
- pytest .skip ("Regression in pandas with numpy 1.25" )
2126
2111
ints = pa .array ([1 , 2 , 3 ], pa .int32 ())
2127
2112
strings = pa .array ([['a' , 'b' ], ['c' , 'd' ], ['e' , 'f' ]],
2128
2113
pa .list_ (pa .string ()))
@@ -2192,11 +2177,6 @@ def test_array_from_nested_arrays(self):
2192
2177
assert result .equals (expected )
2193
2178
2194
2179
def test_nested_large_list (self ):
2195
- if ((Version (np .__version__ ) >= Version ("1.25.0.dev0" )) and
2196
- (Version (pd .__version__ ) < Version ("2.0.0" ))):
2197
- # TODO: regression in pandas with numpy 1.25dev
2198
- # https://github.com/pandas-dev/pandas/issues/50360
2199
- pytest .skip ("Regression in pandas with numpy 1.25" )
2200
2180
s = (pa .array ([[[1 , 2 , 3 ], [4 ]], None ],
2201
2181
type = pa .large_list (pa .large_list (pa .int64 ())))
2202
2182
.to_pandas ())
@@ -2950,11 +2930,11 @@ def _fully_loaded_dataframe_example():
2950
2930
2951
2931
@pytest .mark .parametrize ('columns' , ([b'foo' ], ['foo' ]))
2952
2932
def test_roundtrip_with_bytes_unicode (columns ):
2953
- if Version ("2.0.0.dev0 " ) <= Version (pd .__version__ ) < Version ("2.0 .0" ):
2954
- # TODO: regression in pandas, should be fixed before final 2.0.0
2933
+ if Version ("2.0.0" ) <= Version (pd .__version__ ) < Version ("2.1 .0" ):
2934
+ # TODO: regression in pandas, hopefully fixed in next version
2955
2935
# https://issues.apache.org/jira/browse/ARROW-18394
2956
2936
# https://github.com/pandas-dev/pandas/issues/50127
2957
- pytest .skip ("Regression in pandas 2.0.0.dev " )
2937
+ pytest .skip ("Regression in pandas 2.0.0" )
2958
2938
2959
2939
df = pd .DataFrame (columns = columns )
2960
2940
table1 = pa .Table .from_pandas (df )
0 commit comments