diff --git a/doc/source/faq.rst b/doc/source/faq.rst index 534ad576da0a7..04492210137ee 100644 --- a/doc/source/faq.rst +++ b/doc/source/faq.rst @@ -35,7 +35,7 @@ horizontal scrolling, auto-detection of width/height. To appropriately address all these environments, the display behavior is controlled by several options, which you're encouraged to tweak to suit your setup. -As of 0.11.1, these are the relavent options, all under the `display` namespace, +As of 0.12, these are the relevant options, all under the `display` namespace, (e.g. display.width, etc'): - notebook_repr_html: if True, IPython frontends with HTML support will display diff --git a/doc/source/groupby.rst b/doc/source/groupby.rst index 431ee9271ea61..88d7519c31f4e 100644 --- a/doc/source/groupby.rst +++ b/doc/source/groupby.rst @@ -500,7 +500,7 @@ and that the transformed data contains no NAs. Filtration ---------- -.. versionadded:: 0.11.1 +.. versionadded:: 0.12 The ``filter`` method returns a subset of the original object. Suppose we want to take only elements that belong to groups with a group sum greater diff --git a/doc/source/io.rst b/doc/source/io.rst index 5450289adb776..bc15aa102dcec 100644 --- a/doc/source/io.rst +++ b/doc/source/io.rst @@ -820,7 +820,7 @@ rows will skip the interveaing rows. print open('mi.csv').read() pd.read_csv('mi.csv',header=[0,1,2,3],index_col=[0,1],tupleize_cols=False) -Note: The default behavior in 0.11.1 remains unchanged (``tupleize_cols=True``), +Note: The default behavior in 0.12 remains unchanged (``tupleize_cols=True``), but starting with 0.12, the default *to* write and read multi-index columns will be in the new format (``tupleize_cols=False``) @@ -1126,7 +1126,7 @@ Reading HTML Content .. _io.read_html: -.. versionadded:: 0.11.1 +.. versionadded:: 0.12 The top-level :func:`~pandas.io.html.read_html` function can accept an HTML string/file/url and will parse HTML tables into list of pandas DataFrames. @@ -1501,7 +1501,7 @@ advanced strategies .. note:: - The prior method of accessing Excel is now deprecated as of 0.11.1, + The prior method of accessing Excel is now deprecated as of 0.12, this will work but will be removed in a future version. .. code-block:: python @@ -1935,7 +1935,7 @@ The default is 50,000 rows returned in a chunk. .. note:: - .. versionadded:: 0.11.1 + .. versionadded:: 0.12 You can also use the iterator with ``read_hdf`` which will open, then automatically close the store when finished iterating. @@ -2443,7 +2443,7 @@ Reading from STATA format .. _io.stata_reader: -.. versionadded:: 0.11.1 +.. versionadded:: 0.12 The top-level function ``read_stata`` will read a dta format file and return a DataFrame: diff --git a/doc/source/release.rst b/doc/source/release.rst index da62a437c5e36..917d91a14441e 100644 --- a/doc/source/release.rst +++ b/doc/source/release.rst @@ -24,7 +24,7 @@ Where to get it * Binary installers on PyPI: http://pypi.python.org/pypi/pandas * Documentation: http://pandas.pydata.org -pandas 0.11.1 +pandas 0.12 ============= **Release date:** not-yet-released @@ -40,9 +40,9 @@ pandas 0.11.1 - Added support for writing in ``to_csv`` and reading in ``read_csv``, multi-index columns. The ``header`` option in ``read_csv`` now accepts a list of the rows from which to read the index. Added the option, - ``tupleize_cols`` to provide compatiblity for the pre 0.11.1 behavior of + ``tupleize_cols`` to provide compatiblity for the pre 0.12 behavior of writing and reading multi-index columns via a list of tuples. The default in - 0.11.1 is to write lists of tuples and *not* interpret list of tuples as a + 0.12 is to write lists of tuples and *not* interpret list of tuples as a multi-index column. Note: The default value will change in 0.12 to make the default *to* write and read multi-index columns in the new format. (:issue:`3571`, :issue:`1651`, :issue:`3141`) @@ -146,7 +146,7 @@ pandas 0.11.1 - Deprecated display.height, display.width is now only a formatting option does not control triggering of summary, similar to < 0.11.0. - Add the keyword ``allow_duplicates`` to ``DataFrame.insert`` to allow a duplicate column - to be inserted if ``True``, default is ``False`` (same as prior to 0.11.1) (:issue:`3679`) + to be inserted if ``True``, default is ``False`` (same as prior to 0.12) (:issue:`3679`) - io API changes - added ``pandas.io.api`` for i/o imports @@ -282,7 +282,6 @@ pandas 0.11.1 - Fix ``Series.clip`` for datetime series. NA/NaN threshold values will now throw ValueError (:issue:`3996`) - Fixed insertion issue into DataFrame, after rename (:issue:`4032`) -.. _Gh3616: https://github.com/pydata/pandas/issues/3616 pandas 0.11.0 ============= diff --git a/doc/source/v0.11.1.txt b/doc/source/v0.12.0.txt similarity index 98% rename from doc/source/v0.11.1.txt rename to doc/source/v0.12.0.txt index e7624225853a0..e146e892722d8 100644 --- a/doc/source/v0.11.1.txt +++ b/doc/source/v0.12.0.txt @@ -1,6 +1,6 @@ -.. _whatsnew_0111: +.. _whatsnew_0120: -v0.11.1 (June ??, 2013) +v0.12.0 (June ??, 2013) ------------------------ This is a minor release from 0.11.0 and includes several new features and @@ -107,7 +107,7 @@ API changes performs conversion by default. (:issue:`3907`) - Add the keyword ``allow_duplicates`` to ``DataFrame.insert`` to allow a duplicate column - to be inserted if ``True``, default is ``False`` (same as prior to 0.11.1) (:issue:`3679`) + to be inserted if ``True``, default is ``False`` (same as prior to 0.12) (:issue:`3679`) - Implement ``__nonzero__`` for ``NDFrame`` objects (:issue:`3691`, :issue:`3696`) - IO api @@ -195,12 +195,12 @@ I/O Enhancements list of the rows from which to read the index. - The option, ``tupleize_cols`` can now be specified in both ``to_csv`` and - ``read_csv``, to provide compatiblity for the pre 0.11.1 behavior of + ``read_csv``, to provide compatiblity for the pre 0.12 behavior of writing and reading multi-index columns via a list of tuples. The default in - 0.11.1 is to write lists of tuples and *not* interpret list of tuples as a + 0.12 is to write lists of tuples and *not* interpret list of tuples as a multi-index column. - Note: The default behavior in 0.11.1 remains unchanged, but starting with 0.12, + Note: The default behavior in 0.12 remains unchanged, but starting with 0.13, the default *to* write and read multi-index columns will be in the new format. (:issue:`3571`, :issue:`1651`, :issue:`3141`) diff --git a/doc/source/whatsnew.rst b/doc/source/whatsnew.rst index 98c4ad2f2e02a..81bd39dd0e70f 100644 --- a/doc/source/whatsnew.rst +++ b/doc/source/whatsnew.rst @@ -16,7 +16,7 @@ What's New These are new features and improvements of note in each release. -.. include:: v0.11.1.txt +.. include:: v0.12.0.txt .. include:: v0.11.0.txt diff --git a/pandas/core/api.py b/pandas/core/api.py index a8f5bb2a46e76..14af72a2a762a 100644 --- a/pandas/core/api.py +++ b/pandas/core/api.py @@ -28,7 +28,7 @@ # legacy from pandas.core.daterange import DateRange # deprecated -from pandas.core.common import save, load # deprecated, remove in 0.12 +from pandas.core.common import save, load # deprecated, remove in 0.13 import pandas.core.datetools as datetools from pandas.core.config import get_option, set_option, reset_option,\ diff --git a/pandas/core/common.py b/pandas/core/common.py index a31c92caf4343..96c567cbb6348 100644 --- a/pandas/core/common.py +++ b/pandas/core/common.py @@ -2076,7 +2076,7 @@ def console_encode(object, **kwds): return pprint_thing_encoded(object, get_option("display.encoding")) -def load(path): # TODO remove in 0.12 +def load(path): # TODO remove in 0.13 """ Load pickled pandas object (or any other pickled object) from the specified file path @@ -2098,7 +2098,7 @@ def load(path): # TODO remove in 0.12 from pandas.io.pickle import read_pickle return read_pickle(path) -def save(obj, path): # TODO remove in 0.12 +def save(obj, path): # TODO remove in 0.13 ''' Pickle (serialize) object to input file path diff --git a/pandas/core/format.py b/pandas/core/format.py index b1f7a2a8964b9..2f4432e44b9f6 100644 --- a/pandas/core/format.py +++ b/pandas/core/format.py @@ -793,7 +793,7 @@ def __init__(self, obj, path_or_buf, sep=",", na_rep='', float_format=None, line_terminator='\n', chunksize=None, engine=None, tupleize_cols=True): - self.engine = engine # remove for 0.12 + self.engine = engine # remove for 0.13 self.obj = obj self.path_or_buf = path_or_buf @@ -962,7 +962,7 @@ def save(self): delimiter=self.sep, quoting=self.quoting) if self.engine == 'python': - # to be removed in 0.12 + # to be removed in 0.13 self._helper_csv(self.writer, na_rep=self.na_rep, float_format=self.float_format, cols=self.cols, header=self.header, index=self.index, diff --git a/pandas/core/frame.py b/pandas/core/frame.py index 43b4e8c3cf007..3a23a212c51e8 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -568,14 +568,14 @@ def _wrap_array(self, arr, axes, copy=False): def _verbose_info(self): import warnings warnings.warn('The _verbose_info property will be removed in version ' - '0.12. please use "max_info_rows"', FutureWarning) + '0.13. please use "max_info_rows"', FutureWarning) return get_option('display.max_info_rows') is None @_verbose_info.setter def _verbose_info(self, value): import warnings warnings.warn('The _verbose_info property will be removed in version ' - '0.12. please use "max_info_rows"', FutureWarning) + '0.13. please use "max_info_rows"', FutureWarning) value = None if value else 1000000 set_option('display.max_info_rows', value) @@ -3593,12 +3593,12 @@ def replace(self, to_replace=None, value=None, inplace=False, limit=None, if method is not None: from warnings import warn warn('the "method" argument is deprecated and will be removed in' - 'v0.12; this argument has no effect') + 'v0.13; this argument has no effect') if axis is not None: from warnings import warn warn('the "axis" argument is deprecated and will be removed in' - 'v0.12; this argument has no effect') + 'v0.13; this argument has no effect') self._consolidate_inplace() @@ -3733,7 +3733,7 @@ def interpolate(self, to_replace, method='pad', axis=0, inplace=False, reindex, replace, fillna """ from warnings import warn - warn('DataFrame.interpolate will be removed in v0.12, please use ' + warn('DataFrame.interpolate will be removed in v0.13, please use ' 'either DataFrame.fillna or DataFrame.replace instead', FutureWarning) if self._is_mixed_type and axis == 1: diff --git a/pandas/core/generic.py b/pandas/core/generic.py index 2bbb0da9af658..627a8ab825e5f 100644 --- a/pandas/core/generic.py +++ b/pandas/core/generic.py @@ -36,13 +36,13 @@ def to_pickle(self, path): from pandas.io.pickle import to_pickle return to_pickle(self, path) - def save(self, path): # TODO remove in 0.12 + def save(self, path): # TODO remove in 0.13 import warnings from pandas.io.pickle import to_pickle warnings.warn("save is deprecated, use to_pickle", FutureWarning) return to_pickle(self, path) - def load(self, path): # TODO remove in 0.12 + def load(self, path): # TODO remove in 0.13 import warnings from pandas.io.pickle import read_pickle warnings.warn("load is deprecated, use pd.read_pickle", FutureWarning) diff --git a/pandas/io/parsers.py b/pandas/io/parsers.py index f54a5e41d443d..3bcfb66d32092 100644 --- a/pandas/io/parsers.py +++ b/pandas/io/parsers.py @@ -1957,7 +1957,7 @@ def _make_reader(self, f): self.data = FixedWidthReader(f, self.colspecs, self.delimiter) -##### deprecations in 0.11.1 ##### +##### deprecations in 0.12 ##### ##### remove in 0.12 ##### from pandas.io import clipboard diff --git a/pandas/io/tests/test_excel.py b/pandas/io/tests/test_excel.py index baa4f6b64ec0e..489546557b938 100644 --- a/pandas/io/tests/test_excel.py +++ b/pandas/io/tests/test_excel.py @@ -861,7 +861,7 @@ def roundtrip(df, header=True, parser_hdr=0): def test_deprecated_from_parsers(self): - # since 0.11.1 changed the import path + # since 0.12 changed the import path import warnings with warnings.catch_warnings() as w: diff --git a/pandas/tools/plotting.py b/pandas/tools/plotting.py index 039e13f35c4d7..a5aaac05d8ad8 100644 --- a/pandas/tools/plotting.py +++ b/pandas/tools/plotting.py @@ -880,7 +880,7 @@ def _compute_plot_data(self): try: # might be an ndframe numeric_data = self.data._get_numeric_data() - except AttributeError: # TODO: rm in 0.12 (series-inherit-ndframe) + except AttributeError: # TODO: rm in 0.13 (series-inherit-ndframe) numeric_data = self.data orig_dtype = numeric_data.dtype diff --git a/setup.py b/setup.py index ee8f30d62ac6c..7d59e0f95f0e8 100755 --- a/setup.py +++ b/setup.py @@ -187,8 +187,8 @@ def build_extensions(self): ] MAJOR = 0 -MINOR = 11 -MICRO = 1 +MINOR = 12 +MICRO = 0 ISRELEASED = False VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO) QUALIFIER = ''