Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
0e10a9d
remove read_excel kwd NotImplemented error, update documentation #11544
grahamjeffries Jan 15, 2016
925ce1b
Update tests
jorisvandenbossche Sep 30, 2016
b1c7f87
add whatsnew
jorisvandenbossche Sep 30, 2016
656ec44
Fix detection to raise warning
jorisvandenbossche Sep 30, 2016
0b65a7a
update wording
jorisvandenbossche Sep 30, 2016
a1d966a
DOC: GH21194
msmarchena May 31, 2018
5603bd2
BUG: GH21194
msmarchena May 31, 2018
1886cc3
TST: adding tz tests
msmarchena May 31, 2018
09348c6
solving PEP8 errors
msmarchena Jun 1, 2018
e2cc031
DOC update
msmarchena Jun 1, 2018
9cb6242
Merge remote-tracking branch 'upstream/master'
msmarchena Jun 1, 2018
d353ddb
DOC update
msmarchena Jun 1, 2018
b421c2e
DOC update
msmarchena Jun 1, 2018
0996c19
Merge branch 'master' of github.com:msmarchena/pandas into PR21194
msmarchena Jun 1, 2018
1b398d9
Doc update
msmarchena Jun 1, 2018
91a4547
Doc update
msmarchena Jun 1, 2018
f76d423
parametrizing tests
msmarchena Jun 4, 2018
8cc507b
parametrizing tests
msmarchena Jun 4, 2018
8441881
parametrizing tests
msmarchena Jun 4, 2018
d3cc807
Implementing pytest.mark.parametrize
msmarchena Jun 25, 2018
8726d0e
Implementing pytest.mark.parametrize
msmarchena Jun 25, 2018
e1cdfa5
Documentation update
msmarchena Jun 25, 2018
246326d
Merge branch 'pr/12051' of https://github.com/msmarchena/pandas into …
msmarchena Jun 25, 2018
4c91628
Merging
msmarchena Jun 25, 2018
79dbfe6
Merge branch 'PR21194' of https://github.com/msmarchena/pandas into P…
msmarchena Jun 25, 2018
a5bc90b
Merge branch 'master' into PR21194
msmarchena Aug 3, 2018
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
parametrizing tests
  • Loading branch information
msmarchena committed Jun 4, 2018
commit 8cc507b998390e5ee9a9a50444799ce3ce5352a0
26 changes: 12 additions & 14 deletions pandas/tests/frame/test_asof.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,23 +107,21 @@ def test_all_nans(self):
expected = Series(np.nan, index=['A', 'B'], name=3)
tm.assert_series_equal(result, expected)


# Testing awareness of DataFrame index considering different
# UTC and different timezone
@pytest.mark.parametrize("stamp,expected",
[(Timestamp('2018-01-01 23:22:43.325+00:00'),
Series(2.0, name=Timestamp('2018-01-01 23:22:43.325+00:00'))),
(Timestamp('2018-01-01 22:33:20.682+01:00'),
Series(1.0, name=Timestamp('2018-01-01 22:33:20.682+01:00')))
]
)
[(Timestamp('2018-01-01 23:22:43.325+00:00'),
Series(2.0,
name=Timestamp('2018-01-01 23:22:43.325+00:00'))),
(Timestamp('2018-01-01 22:33:20.682+01:00'),
Series(1.0,
name=Timestamp('2018-01-01 22:33:20.682+01:00')))
]
)
def test_time_zone_aware_index(self, stamp, expected):
# GH21194
df = DataFrame(data=[1, 2], index=[Timestamp('2018-01-01 21:00:05.001+00:00'),
Timestamp('2018-01-01 22:35:10.550+00:00')])
df = DataFrame(data=[1, 2],
index=[Timestamp('2018-01-01 21:00:05.001+00:00'),
Timestamp('2018-01-01 22:35:10.550+00:00')])
result = df.asof(stamp)
tm.assert_series_equal(result, expected)




tm.assert_series_equal(result, expected)