Merge branch 'master' of git://github.com/pydata/pandas into pytablesv4

Author: jreback

.travis.yml

@@ -7,7 +7,17 @@ python:
   - 3.2
 
 install:
-  - pip install --use-mirrors cython numpy nose pytz python-dateutil
+  - export PYTHONIOENCODING=utf8 # activate venv 1.8.4 "detach" fix
+  - virtualenv --version
+  - whoami
+  - pwd
+  # install 1.7.0b2 for 3.3, and pull a version of numpy git master
+  # with a alternate fix for detach bug as a temporary workaround
+  # for the others.
+  - "if [ $TRAVIS_PYTHON_VERSION == '3.3' ]; then pip uninstall numpy; pip install http://downloads.sourceforge.net/project/numpy/NumPy/1.7.0b2/numpy-1.7.0b2.tar.gz; fi"
+  - "if [ $TRAVIS_PYTHON_VERSION == '3.2' ] || [ $TRAVIS_PYTHON_VERSION == '3.1' ]; then pip install --use-mirrors git+git://github.com/numpy/numpy.git@089bfa5865cd39e2b40099755e8563d8f0d04f5f#egg=numpy; fi"
+  - "if [ ${TRAVIS_PYTHON_VERSION:0:1} == '2' ]; then pip install numpy; fi" # should be nop if pre-installed
+  - pip install --use-mirrors cython nose pytz python-dateutil
 
 script:
   - python setup.py build_ext install

doc/source/groupby.rst

@@ -560,6 +560,15 @@ The dimension of the returned result can also change:
 
     In [11]: grouped.apply(f)
 
+``apply`` on a Series can operate on a returned value from the applied function, that is itself a series, and possibly upcast the result to a DataFrame
+
+.. ipython:: python
+
+    def f(x):
+	   return Series([ x, x**2 ], index = ['x', 'x^s'])
+    s = Series(np.random.rand(5))
+    s
+    s.apply(f)
 
 Other useful features
 ---------------------

doc/source/v0.10.0.txt

@@ -0,0 +1,50 @@
+.. _whatsnew_0100:
+
+v0.10.0 (December ??, 2012)
+---------------------------
+
+This is a major release from 0.9.1 and includes several new features and
+enhancements along with a large number of bug fixes.
+
+New features
+~~~~~~~~~~~~
+
+
+API changes
+~~~~~~~~~~~
+
+  - ``Series.apply`` will now operate on a returned value from the applied function, that is itself a series, and possibly upcast the result to a DataFrame
+
+    .. ipython:: python
+
+        def f(x):
+	        return Series([ x, x**2 ], index = ['x', 'x^s'])
+        s = Series(np.random.rand(5))
+	    s
+        s.apply(f)
+
+    This is conceptually similar to the following.
+
+    .. ipython:: python
+
+        concat([ f(y) for x, y in s.iteritems() ], axis=1).T
+
+  - New API functions for working with pandas options (GH2097_):
+
+    - ``get_option`` / ``set_option`` - get/set the value of an option.
+    - ``reset_option`` / ``reset_options`` - reset an options / all options to their default value.
+    - ``describe_options`` - print a description of one or more option. When called  with no arguments. print all registered options.
+    - ``set_printoptions`` is now deprecated (but functioning), the print options now live under "print_config.XYZ". For example:
+
+
+    .. ipython:: python
+
+       import pandas as pd
+       pd.get_option("print_config.max_rows")
+
+See the `full release notes
+<https://github.com/pydata/pandas/blob/master/RELEASE.rst>`__ or issue tracker
+on GitHub for a complete list.
+
+.. _GH2316: https://github.com/pydata/pandas/issues/2316
+.. _GH2097: https://github.com/pydata/pandas/issues/2097

doc/source/whatsnew.rst

@@ -16,6 +16,8 @@ What's New
 
 These are new features and improvements of note in each release.
 
+.. include:: v0.10.0.txt
+
 .. include:: v0.9.1.txt
 
 .. include:: v0.9.0.txt

pandas/__init__.py

@@ -22,6 +22,9 @@
 from pandas.version import version as __version__
 from pandas.info import __doc__
 
+# let init-time option registration happen
+import pandas.core.config_init
+
 from pandas.core.api import *
 from pandas.sparse.api import *
 from pandas.stats.api import *

pandas/core/api.py

@@ -29,3 +29,6 @@
 # legacy
 from pandas.core.daterange import DateRange # deprecated
 import pandas.core.datetools as datetools
+
+from pandas.core.config import get_option,set_option,reset_option,\
+                               reset_options,describe_options

pandas/core/common.py

@@ -19,6 +19,8 @@
 
 from pandas.util.py3compat import StringIO, BytesIO
 
+from pandas.core.config import get_option
+
 # XXX: HACK for NumPy 1.5.1 to suppress warnings
 try:
     np.seterr(all='ignore')
@@ -1113,7 +1115,7 @@ def in_interactive_session():
 # 2) If you need to send something to the console, use console_encode().
 #
 #    console_encode() should (hopefully) choose the right encoding for you
-#    based on the encoding set in fmt.print_config.encoding.
+#    based on the encoding set in option "print_config.encoding"
 #
 # 3) if you need to write something out to file, use
 #    pprint_thing_encoded(encoding).
@@ -1165,16 +1167,17 @@ def pprint_thing(thing, _nest_lvl=0):
     result - unicode object on py2, str on py3. Always Unicode.
 
     """
-    from pandas.core.format import print_config
+
     if thing is None:
         result = ''
     elif (py3compat.PY3 and hasattr(thing,'__next__')) or \
          hasattr(thing,'next'):
         return unicode(thing)
     elif (isinstance(thing, dict) and
-          _nest_lvl < print_config.pprint_nest_depth):
+          _nest_lvl < get_option("print_config.pprint_nest_depth")):
         result = _pprint_dict(thing, _nest_lvl)
-    elif _is_sequence(thing) and _nest_lvl < print_config.pprint_nest_depth:
+    elif _is_sequence(thing) and _nest_lvl < \
+		get_option("print_config.pprint_nest_depth"):
         result = _pprint_seq(thing, _nest_lvl)
     else:
         # when used internally in the package, everything
@@ -1202,12 +1205,12 @@ def pprint_thing_encoded(object, encoding='utf-8', errors='replace'):
 
 
 def console_encode(object):
-    from pandas.core.format import print_config
     """
     this is the sanctioned way to prepare something for
     sending *to the console*, it delegates to pprint_thing() to get
     a unicode representation of the object relies on the global encoding
     set in print_config.encoding. Use this everywhere
     where you output to the console.
     """
-    return pprint_thing_encoded(object, print_config.encoding)
+    return pprint_thing_encoded(object,
+             get_option("print_config.encoding"))