Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DOC: remove mention of TimeSeries in docs #7671

Merged
merged 1 commit into from
May 15, 2015
Merged

DOC: remove mention of TimeSeries in docs #7671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions doc/source/dsintro.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,10 +577,8 @@ row-wise. For example:

df - df.iloc[0]

In the special case of working with time series data, if the Series is a
TimeSeries (which it will be automatically if the index contains datetime
objects), and the DataFrame index also contains dates, the broadcasting will be
column-wise:
In the special case of working with time series data, and the DataFrame index
also contains dates, the broadcasting will be column-wise:

.. ipython:: python
:okwarning:
Expand Down
7 changes: 3 additions & 4 deletions doc/source/faq.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,9 @@ properties. Here are the pandas equivalents:
Frequency conversion
~~~~~~~~~~~~~~~~~~~~

Frequency conversion is implemented using the ``resample`` method on TimeSeries
and DataFrame objects (multiple time series). ``resample`` also works on panels
(3D). Here is some code that resamples daily data to monthly:
Frequency conversion is implemented using the ``resample`` method on Series
and DataFrame objects with a DatetimeIndex or PeriodIndex. ``resample`` also
works on panels (3D). Here is some code that resamples daily data to montly:

.. ipython:: python

Expand Down Expand Up @@ -369,4 +369,3 @@ just a thin layer around the ``QTableView``.
mw = MainWidget()
mw.show()
app.exec_()

3 changes: 1 addition & 2 deletions doc/source/overview.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Package overview
:mod:`pandas` consists of the following things

* A set of labeled array data structures, the primary of which are
Series/TimeSeries and DataFrame
Series and DataFrame
* Index objects enabling both simple axis indexing and multi-level /
hierarchical axis indexing
* An integrated group by engine for aggregating and transforming data sets
Expand All @@ -32,7 +32,6 @@ Data structures at a glance
:widths: 15, 20, 50

1, Series, "1D labeled homogeneously-typed array"
1, TimeSeries, "Series with index containing datetimes"
2, DataFrame, "General 2D labeled, size-mutable tabular structure with
potentially heterogeneously-typed columns"
3, Panel, "General 3D labeled, also size-mutable array"
Expand Down
10 changes: 5 additions & 5 deletions doc/source/timeseries.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1008,7 +1008,7 @@ Time series-related instance methods
Shifting / lagging
~~~~~~~~~~~~~~~~~~

One may want to *shift* or *lag* the values in a TimeSeries back and forward in
One may want to *shift* or *lag* the values in a time series back and forward in
time. The method for this is ``shift``, which is available on all of the pandas
objects.

Expand All @@ -1026,7 +1026,7 @@ The shift method accepts an ``freq`` argument which can accept a
ts.shift(5, freq='BM')

Rather than changing the alignment of the data and the index, ``DataFrame`` and
``TimeSeries`` objects also have a ``tshift`` convenience method that changes
``Series`` objects also have a ``tshift`` convenience method that changes
all the dates in the index by a specified number of offsets:

.. ipython:: python
Expand Down Expand Up @@ -1569,16 +1569,16 @@ time zones using ``tz_convert``:
rng_berlin[5]
rng_eastern[5].tz_convert('Europe/Berlin')

Localization of Timestamps functions just like DatetimeIndex and TimeSeries:
Localization of Timestamps functions just like DatetimeIndex and Series:

.. ipython:: python

rng[5]
rng[5].tz_localize('Asia/Shanghai')


Operations between TimeSeries in different time zones will yield UTC
TimeSeries, aligning the data on the UTC timestamps:
Operations between Series in different time zones will yield UTC
Series, aligning the data on the UTC timestamps:

.. ipython:: python

Expand Down