From 14f2cd06b1bf749aaab90b9a5a5fce6349fb7582 Mon Sep 17 00:00:00 2001 From: jbrockmendel Date: Mon, 9 Dec 2019 20:45:25 -0800 Subject: [PATCH 1/2] DEPR: remove stata deprecations from 2015 and 2017 --- doc/source/whatsnew/v1.0.0.rst | 2 ++ pandas/io/stata.py | 36 +--------------------------------- pandas/tests/io/test_stata.py | 10 ---------- 3 files changed, 3 insertions(+), 45 deletions(-) diff --git a/doc/source/whatsnew/v1.0.0.rst b/doc/source/whatsnew/v1.0.0.rst index 19fb4bdcd9536..36f2bd71c8fab 100644 --- a/doc/source/whatsnew/v1.0.0.rst +++ b/doc/source/whatsnew/v1.0.0.rst @@ -527,6 +527,8 @@ or ``matplotlib.Axes.plot``. See :ref:`plotting.formatters` for more. **Other removals** +- Removed the previously deprecated "index" keyword from :func:`read_stata`, :class:`StataReader`, and :meth:`StataReader.read`, use "index_col" instead (:issue:`17328`) +- Removed the previously deprecated :meth:`StataReader.data` method, use :meth:`StataReader.read` instead (:issue:`9493`) - Removed the previously deprecated :func:`pandas.plotting._matplotlib.tsplot`, use :meth:`Series.plot` instead (:issue:`19980`) - :func:`pandas.tseries.converter.register` has been moved to :func:`pandas.plotting.register_matplotlib_converters` (:issue:`18307`) - :meth:`Series.plot` no longer accepts positional arguments, pass keyword arguments instead (:issue:`30003`) diff --git a/pandas/io/stata.py b/pandas/io/stata.py index eaecc0627e693..dbe64e4c0f06d 100644 --- a/pandas/io/stata.py +++ b/pandas/io/stata.py @@ -23,7 +23,7 @@ from pandas._libs.lib import infer_dtype from pandas._libs.writers import max_len_string_array -from pandas.util._decorators import Appender, deprecate_kwarg +from pandas.util._decorators import Appender from pandas.core.dtypes.common import ( ensure_object, @@ -132,25 +132,6 @@ _iterator_params, ) -_data_method_doc = """ -Read observations from Stata file, converting them into a dataframe. - -.. deprecated:: - This is a legacy method. Use `read` in new code. - -Parameters ----------- -%s -%s - -Returns -------- -DataFrame -""" % ( - _statafile_processing_params1, - _statafile_processing_params2, -) - _read_method_doc = """\ Reads observations from Stata file, converting them into a dataframe @@ -191,7 +172,6 @@ @Appender(_read_stata_doc) -@deprecate_kwarg(old_arg_name="index", new_arg_name="index_col") def read_stata( filepath_or_buffer, convert_dates=True, @@ -1033,7 +1013,6 @@ def __init__(self): class StataReader(StataParser, BaseIterator): __doc__ = _stata_reader_doc - @deprecate_kwarg(old_arg_name="index", new_arg_name="index_col") def __init__( self, path_or_buf, @@ -1525,18 +1504,6 @@ def _read_strls(self): # Wrap v_o in a string to allow uint64 values as keys on 32bit OS self.GSO[str(v_o)] = va - # legacy - @Appender(_data_method_doc) - def data(self, **kwargs): - - warnings.warn("'data' is deprecated, use 'read' instead") - - if self._data_read: - raise Exception("Data has already been read.") - self._data_read = True - - return self.read(None, **kwargs) - def __next__(self): return self.read(nrows=self._chunksize or 1) @@ -1558,7 +1525,6 @@ def get_chunk(self, size=None): return self.read(nrows=size) @Appender(_read_method_doc) - @deprecate_kwarg(old_arg_name="index", new_arg_name="index_col") def read( self, nrows=None, diff --git a/pandas/tests/io/test_stata.py b/pandas/tests/io/test_stata.py index 4203d0b0241ff..cbc5ebd986c15 100644 --- a/pandas/tests/io/test_stata.py +++ b/pandas/tests/io/test_stata.py @@ -120,16 +120,6 @@ def test_read_empty_dta(self, version): empty_ds2 = read_stata(path) tm.assert_frame_equal(empty_ds, empty_ds2) - def test_data_method(self): - # Minimal testing of legacy data method - with StataReader(self.dta1_114) as rdr: - with tm.assert_produces_warning(UserWarning): - parsed_114_data = rdr.data() - - with StataReader(self.dta1_114) as rdr: - parsed_114_read = rdr.read() - tm.assert_frame_equal(parsed_114_data, parsed_114_read) - @pytest.mark.parametrize("file", ["dta1_114", "dta1_117"]) def test_read_dta1(self, file): From b0d680c61b9c8175f83bbb9efd663ed524afd9a8 Mon Sep 17 00:00:00 2001 From: jbrockmendel Date: Tue, 10 Dec 2019 08:45:00 -0800 Subject: [PATCH 2/2] update docs --- doc/redirects.csv | 1 - doc/source/reference/io.rst | 1 - 2 files changed, 2 deletions(-) diff --git a/doc/redirects.csv b/doc/redirects.csv index e0ec3bcaa340d..02c0af9be3739 100644 --- a/doc/redirects.csv +++ b/doc/redirects.csv @@ -779,7 +779,6 @@ generated/pandas.io.formats.style.Styler.use,../reference/api/pandas.io.formats. generated/pandas.io.formats.style.Styler.where,../reference/api/pandas.io.formats.style.Styler.where generated/pandas.io.json.build_table_schema,../reference/api/pandas.io.json.build_table_schema generated/pandas.io.json.json_normalize,../reference/api/pandas.io.json.json_normalize -generated/pandas.io.stata.StataReader.data,../reference/api/pandas.io.stata.StataReader.data generated/pandas.io.stata.StataReader.data_label,../reference/api/pandas.io.stata.StataReader.data_label generated/pandas.io.stata.StataReader.value_labels,../reference/api/pandas.io.stata.StataReader.value_labels generated/pandas.io.stata.StataReader.variable_labels,../reference/api/pandas.io.stata.StataReader.variable_labels diff --git a/doc/source/reference/io.rst b/doc/source/reference/io.rst index 91f4942d03b0d..95c68bafa4032 100644 --- a/doc/source/reference/io.rst +++ b/doc/source/reference/io.rst @@ -140,7 +140,6 @@ STATA .. autosummary:: :toctree: api/ - StataReader.data StataReader.data_label StataReader.value_labels StataReader.variable_labels