Skip to content

CLN/DOC: update version numbers #4038

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.

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
merged 2 commits into from
Jun 26, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion doc/source/faq.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/source/groupby.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions doc/source/io.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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``)

Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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:
Expand Down
9 changes: 4 additions & 5 deletions doc/source/release.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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`)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
=============
Expand Down
12 changes: 6 additions & 6 deletions doc/source/v0.11.1.txt → doc/source/v0.12.0.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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`)

Expand Down
2 changes: 1 addition & 1 deletion doc/source/whatsnew.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion pandas/core/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,\
Expand Down
4 changes: 2 additions & 2 deletions pandas/core/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions pandas/core/format.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions pandas/core/frame.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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()

Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions pandas/core/generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion pandas/io/parsers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pandas/io/tests/test_excel.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion pandas/tools/plotting.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ''
Expand Down