Skip to content

Commit

Permalink
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
wesm committed Apr 14, 2012
2 parents 3454cb0 + d51faeb commit 63207b8
Show file tree
Hide file tree
Showing 82 changed files with 16,580 additions and 2,757 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Expand Up @@ -5,6 +5,9 @@ build
dist
MANIFEST
*.c
!np_datetime.c
!np_datetime_strings.c
!skts.c
*.cpp
*.so
*.pyd
Expand All @@ -16,4 +19,4 @@ doc/source/vbench.rst
*flymake*
scikits
.coverage
pandas.egg-info
pandas.egg-info
30 changes: 30 additions & 0 deletions NP_LICENSE.txt
@@ -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.
2 changes: 1 addition & 1 deletion bench/bench_dense_to_sparse.py
Expand Up @@ -4,7 +4,7 @@
N = 100000
rng = DateRange('1/1/2000', periods=N, offset=datetools.Minute())

rng2 = np.asarray(rng).astype('M8').astype('i8')
rng2 = np.asarray(rng).astype('M8[us]').astype('i8')

series = {}
for i in range(1, K + 1):
Expand Down
176 changes: 0 additions & 176 deletions bench/bench_tseries.py

This file was deleted.

13 changes: 10 additions & 3 deletions pandas/core/api.py
Expand Up @@ -2,17 +2,24 @@

import numpy as np

from pandas.core.datetools import DateOffset
from pandas.core.datetools import DateOffset, to_datetime
import pandas.core.datetools as datetools

from pandas.core.common import isnull, notnull, save, load
from pandas.core.format import set_printoptions
from pandas.core.index import Index, Int64Index, Factor, MultiIndex
from pandas.core.index import (Index, Int64Index, Factor, MultiIndex,
DatetimeIndex, IntervalIndex)

# deprecated
from pandas.core.daterange import DateRange

from pandas.core.daterange import date_range, bdate_range
from pandas.core.datetools import Timestamp, Interval

from pandas.core.series import Series, TimeSeries
from pandas.core.frame import DataFrame
from pandas.core.panel import Panel
from pandas.core.groupby import groupby
from pandas.core.groupby import groupby, TimeGrouper
from pandas.core.reshape import pivot_simple as pivot

DataMatrix = DataFrame
Expand Down

0 comments on commit 63207b8

Please sign in to comment.