Skip to content

Fixes to docs, eliminate scikits.timeseries docs dep, sphinx 1.2, update copyright years #5921

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

Merged
4 commits merged into from Jan 13, 2014
Merged

Fixes to docs, eliminate scikits.timeseries docs dep, sphinx 1.2, update copyright years #5921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
19583a1
BLD: remove local autosummary copy
Jan 13, 2014
dd8be69
DOC: remove scikits.timeseries dep from faq.rst and docs in general
Jan 13, 2014
923a156
DOC: update copyright string years
Jan 13, 2014
c4b3f0c
BLD: conf.py fixes
Jan 13, 2014
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
33 changes: 0 additions & 33 deletions doc/source/_templates/autosummary/class.rst
View file
Open in desktop

This file was deleted.

9 changes: 5 additions & 4 deletions doc/source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

import sys
import os
from pandas.compat import u

# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
Expand Down Expand Up @@ -63,8 +64,8 @@
master_doc = 'index'

# General information about the project.
project = u'pandas'
copyright = u'2008-2012, the pandas development team'
project = u('pandas')
copyright = u('2008-2014, the pandas development team')

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
Expand Down Expand Up @@ -211,8 +212,8 @@
# (source start file, target name, title, author, documentclass [howto/manual]).
latex_documents = [
('index', 'pandas.tex',
u'pandas: powerful Python data analysis toolkit',
u'Wes McKinney\n\& PyData Development Team', 'manual'),
u('pandas: powerful Python data analysis toolkit'),
u('Wes McKinney\n\& PyData Development Team'), 'manual'),
]

# The name of an image file (relative to this directory) to place at the top of
Expand Down
12 changes: 1 addition & 11 deletions doc/source/faq.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,17 +181,7 @@ 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 montly with
scikits.timeseries:

.. ipython:: python

import scikits.timeseries as ts
data = ts.time_series(np.random.randn(50), start_date='Jan-2000', freq='M')
data
data.convert('A', func=np.mean)

Here is the equivalent pandas code:
(3D). Here is some code that resamples daily data to montly:

.. ipython:: python

Expand Down