From 19583a10bd56c2027decd87cf1dc8a9f111eb1eb Mon Sep 17 00:00:00 2001 From: y-p Date: Mon, 13 Jan 2014 15:04:58 +0200 Subject: [PATCH 1/4] BLD: remove local autosummary copy --- doc/source/_templates/autosummary/class.rst | 33 --------------------- 1 file changed, 33 deletions(-) delete mode 100644 doc/source/_templates/autosummary/class.rst diff --git a/doc/source/_templates/autosummary/class.rst b/doc/source/_templates/autosummary/class.rst deleted file mode 100644 index a9c9bd2b6507f..0000000000000 --- a/doc/source/_templates/autosummary/class.rst +++ /dev/null @@ -1,33 +0,0 @@ -{% extends "!autosummary/class.rst" %} - -{% block methods %} -{% if methods %} - -.. - HACK -- the point here is that we don't want this to appear in the output, but the autosummary should still generate the pages. - .. autosummary:: - :toctree: - {% for item in all_methods %} - {%- if not item.startswith('_') or item in ['__call__'] %} - {{ name }}.{{ item }} - {%- endif -%} - {%- endfor %} - -{% endif %} -{% endblock %} - -{% block attributes %} -{% if attributes %} - -.. - HACK -- the point here is that we don't want this to appear in the output, but the autosummary should still generate the pages. - .. autosummary:: - :toctree: - {% for item in all_attributes %} - {%- if not item.startswith('_') %} - {{ name }}.{{ item }} - {%- endif -%} - {%- endfor %} - -{% endif %} -{% endblock %} From dd8be69bf0742a907b2ecfe6da92615a7a1b4978 Mon Sep 17 00:00:00 2001 From: y-p Date: Mon, 13 Jan 2014 15:05:26 +0200 Subject: [PATCH 2/4] DOC: remove scikits.timeseries dep from faq.rst and docs in general --- doc/source/faq.rst | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/doc/source/faq.rst b/doc/source/faq.rst index d64b799a865d1..c826d95e9c1d7 100644 --- a/doc/source/faq.rst +++ b/doc/source/faq.rst @@ -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 From 923a15665a5c38c8564960a7f5fccd69227aa972 Mon Sep 17 00:00:00 2001 From: y-p Date: Mon, 13 Jan 2014 15:06:13 +0200 Subject: [PATCH 3/4] DOC: update copyright string years --- doc/source/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 8e8ac4a61acf5..25541fcb394ae 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -63,8 +63,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 From c4b3f0c93cbef96c6b632ad950a0d251f0610c1b Mon Sep 17 00:00:00 2001 From: y-p Date: Mon, 13 Jan 2014 15:18:08 +0200 Subject: [PATCH 4/4] BLD: conf.py fixes --- doc/source/conf.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 25541fcb394ae..c3c946a5180ba 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -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 @@ -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