Skip to content

Commit 477b13c

Browse files
committed
Merge pull request #4860 from jreback/dtypes_fix
TST: dtypes tests fix for 32-bit
2 parents 7b81ca6 + 107ff43 commit 477b13c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

pandas/tests/test_frame.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2743,7 +2743,7 @@ def test_constructor_generator(self):
27432743
gen = ([ i, 'a'] for i in range(10))
27442744
result = DataFrame(gen)
27452745
expected = DataFrame({ 0 : range(10), 1 : 'a' })
2746-
assert_frame_equal(result, expected)
2746+
assert_frame_equal(result, expected, check_dtype=False)
27472747

27482748
def test_constructor_list_of_dicts(self):
27492749
data = [OrderedDict([['a', 1.5], ['b', 3], ['c', 4], ['d', 6]]),

pandas/tests/test_indexing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1362,7 +1362,7 @@ def f():
13621362

13631363
### frame ###
13641364

1365-
df_orig = DataFrame(np.arange(6).reshape(3,2),columns=['A','B'])
1365+
df_orig = DataFrame(np.arange(6).reshape(3,2),columns=['A','B'],dtype='int64')
13661366

13671367
# iloc/iat raise
13681368
df = df_orig.copy()

pandas/tests/test_series.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,8 @@ def test_constructor_series(self):
355355

356356
def test_constructor_iterator(self):
357357

358-
expected = Series(list(range(10)))
359-
result = Series(range(10))
358+
expected = Series(list(range(10)),dtype='int64')
359+
result = Series(range(10),dtype='int64')
360360
assert_series_equal(result, expected)
361361

362362
def test_constructor_generator(self):

0 commit comments

Comments
 (0)