forked from pandas-dev/pandas
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Merge branch 'timeseries'
* timeseries: (200 commits) TST: don't use deprecated DateRange BUG: fix buglets surfacing from merge RLS: set released to false, bump dev version to 0.8.0 BUG: fix major performance issue in DatetimeIndex.union affecting join performance on irregular indexes, remedying pandas-dev#1046 ENH: add to_datetime method to Index, close pandas-dev#208 ENH: legacy time rule support and refactoring, better alias handling. misc tests, pandas-dev#1041 ENH: to_datetime will convert array of strings and NAs to datetime64 with NaT, close pandas-dev#999 ENH: more datetime64 integration in core data algorithms per pandas-dev#996, close pandas-dev#1035 ENH: handle datetime64 in block formation from dict of arrays in DataFrame constructor, close pandas-dev#1037 BUG: fix broken time_rule usage in legacy DateRange, close pandas-dev#1036 BUG: name inline method something different ENH: initial version of convert_to_annual for pandas, pandas-dev#736 BUG: convert datetime64 -> datetime.datetime for matplotlib, close pandas-dev#1003 ENH: integrate cython ohlc in groupby and test, close pandas-dev#152 ENH: implement Cython OHLC function for groupby pandas-dev#152 ENH: use cython bin groupers, fix bug in DatetimeIndex.__getitem causing slowness, some timeseries vbenches ENH: enable to_datetime to be vectorized, handle NAs, close pandas-dev#858 TST: interactions between array of datetime objects and DatetimeIndex, bug fixes TST: remove errant foo and test_datetime64.py TST: moved test_datetime64.py tests to test_timeseries ...
- Loading branch information
Showing
82 changed files
with
16,580 additions
and
2,757 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
Copyright (c) 2005-2011, NumPy Developers. | ||
All rights reserved. | ||
|
||
Redistribution and use in source and binary forms, with or without | ||
modification, are permitted provided that the following conditions are | ||
met: | ||
|
||
* Redistributions of source code must retain the above copyright | ||
notice, this list of conditions and the following disclaimer. | ||
|
||
* Redistributions in binary form must reproduce the above | ||
copyright notice, this list of conditions and the following | ||
disclaimer in the documentation and/or other materials provided | ||
with the distribution. | ||
|
||
* Neither the name of the NumPy Developers nor the names of any | ||
contributors may be used to endorse or promote products derived | ||
from this software without specific prior written permission. | ||
|
||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.