Merge branch 'master' of https://github.com/pandas-dev/pandas into offsets-fixweeks

Author: jbrockmendel

.travis.yml

@@ -49,12 +49,13 @@ matrix:
         apt:
           packages:
           - python-gtk2
+    # In allow_failures
     - dist: trusty
       env:
-        - JOB="3.5_CONDA_BUILD_TEST" TEST_ARGS="--skip-slow --skip-network" CONDA_BUILD_TEST=true COVERAGE=true
+        - JOB="3.5_CONDA_BUILD_TEST" TEST_ARGS="--skip-slow --skip-network" CONDA_BUILD_TEST=true
     - dist: trusty
       env:
-        - JOB="3.6" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" CONDA_FORGE=true
+        - JOB="3.6" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" CONDA_FORGE=true COVERAGE=true
     # In allow_failures
     - dist: trusty
       env:
@@ -76,6 +77,10 @@ matrix:
       env:
         - JOB="3.6_DOC" DOC=true
     allow_failures:
+      # TODO(jreback)
+      - dist: trusty
+        env:
+          - JOB="3.5_CONDA_BUILD_TEST" TEST_ARGS="--skip-slow --skip-network" CONDA_BUILD_TEST=true
       - dist: trusty
         env:
           - JOB="2.7_SLOW" SLOW=true

asv_bench/benchmarks/replace.py

@@ -1,70 +1,58 @@
-from .pandas_vb_common import *
+import numpy as np
+import pandas as pd
 
+from .pandas_vb_common import setup  # noqa
 
-class replace_fillna(object):
-    goal_time = 0.2
-
-    def setup(self):
-        self.N = 1000000
-        try:
-            self.rng = date_range('1/1/2000', periods=self.N, freq='min')
-        except NameError:
-            self.rng = DatetimeIndex('1/1/2000', periods=self.N, offset=datetools.Minute())
-            self.date_range = DateRange
-        self.ts = Series(np.random.randn(self.N), index=self.rng)
 
-    def time_replace_fillna(self):
-        self.ts.fillna(0.0, inplace=True)
+class FillNa(object):
 
-
-class replace_large_dict(object):
     goal_time = 0.2
+    params = [True, False]
+    param_names = ['inplace']
 
-    def setup(self):
-        self.n = (10 ** 6)
-        self.start_value = (10 ** 5)
-        self.to_rep = {i: self.start_value + i for i in range(self.n)}
-        self.s = Series(np.random.randint(self.n, size=(10 ** 3)))
-
-    def time_replace_large_dict(self):
-        self.s.replace(self.to_rep, inplace=True)
+    def setup(self, inplace):
+        N = 10**6
+        rng = pd.date_range('1/1/2000', periods=N, freq='min')
+        data = np.random.randn(N)
+        data[::2] = np.nan
+        self.ts = pd.Series(data, index=rng)
 
+    def time_fillna(self, inplace):
+        self.ts.fillna(0.0, inplace=inplace)
 
-class replace_convert(object):
-    goal_time = 0.5
+    def time_replace(self, inplace):
+        self.ts.replace(np.nan, 0.0, inplace=inplace)
 
-    def setup(self):
-        self.n = (10 ** 3)
-        self.to_ts = {i: pd.Timestamp(i) for i in range(self.n)}
-        self.to_td = {i: pd.Timedelta(i) for i in range(self.n)}
-        self.s = Series(np.random.randint(self.n, size=(10 ** 3)))
-        self.df = DataFrame({'A': np.random.randint(self.n, size=(10 ** 3)),
-                             'B': np.random.randint(self.n, size=(10 ** 3))})
 
-    def time_replace_series_timestamp(self):
-        self.s.replace(self.to_ts)
+class ReplaceDict(object):
 
-    def time_replace_series_timedelta(self):
-        self.s.replace(self.to_td)
+    goal_time = 0.2
+    params = [True, False]
+    param_names = ['inplace']
 
-    def time_replace_frame_timestamp(self):
-        self.df.replace(self.to_ts)
+    def setup(self, inplace):
+        N = 10**5
+        start_value = 10**5
+        self.to_rep = dict(enumerate(np.arange(N) + start_value))
+        self.s = pd.Series(np.random.randint(N, size=10**3))
 
-    def time_replace_frame_timedelta(self):
-        self.df.replace(self.to_td)
+    def time_replace_series(self, inplace):
+        self.s.replace(self.to_rep, inplace=inplace)
 
 
-class replace_replacena(object):
-    goal_time = 0.2
+class Convert(object):
 
-    def setup(self):
-        self.N = 1000000
-        try:
-            self.rng = date_range('1/1/2000', periods=self.N, freq='min')
-        except NameError:
-            self.rng = DatetimeIndex('1/1/2000', periods=self.N, offset=datetools.Minute())
-            self.date_range = DateRange
-        self.ts = Series(np.random.randn(self.N), index=self.rng)
-
-    def time_replace_replacena(self):
-        self.ts.replace(np.nan, 0.0, inplace=True)
+    goal_time = 0.5
+    params = (['DataFrame', 'Series'], ['Timestamp', 'Timedelta'])
+    param_names = ['contructor', 'replace_data']
+
+    def setup(self, contructor, replace_data):
+        N = 10**3
+        data = {'Series': pd.Series(np.random.randint(N, size=N)),
+                'DataFrame': pd.DataFrame({'A': np.random.randint(N, size=N),
+                                           'B': np.random.randint(N, size=N)})}
+        self.to_replace = {i: getattr(pd, replace_data) for i in range(N)}
+        self.data = data[contructor]
+
+    def time_replace(self, contructor, replace_data):
+        self.data.replace(self.to_replace)

ci/install_travis.sh

@@ -56,6 +56,11 @@ if [ "$CONDA_BUILD_TEST" ]; then
     conda install conda-build
 fi
 
+# TODO(jreback)
+echo
+echo "[fix conda version]"
+conda install conda=4.3.30
+
 echo
 echo "[add channels]"
 conda config --remove channels defaults || exit 1
@@ -175,7 +180,7 @@ if [ "$PIP_BUILD_TEST" ]; then
     echo "[building release]"
     bash scripts/build_dist_for_release.sh
     conda uninstall -y cython
-    time pip install dist/*tar.gz || exit 1
+    time pip install dist/*tar.gz --quiet || exit 1
 
 elif [ "$CONDA_BUILD_TEST" ]; then
 

doc/source/io.rst

@@ -131,7 +131,8 @@ usecols : array-like or callable, default ``None``
   be positional (i.e. integer indices into the document columns) or strings
   that correspond to column names provided either by the user in `names` or
   inferred from the document header row(s). For example, a valid array-like
-  `usecols` parameter would be [0, 1, 2] or ['foo', 'bar', 'baz'].
+  `usecols` parameter would be [0, 1, 2] or ['foo', 'bar', 'baz']. Element
+  order is ignored, so usecols=[0,1] is the same as [1, 0].
 
   If callable, the callable function will be evaluated against the column names,
   returning names where the callable function evaluates to True:
@@ -199,21 +200,6 @@ low_memory : boolean, default ``True``
   Note that the entire file is read into a single DataFrame regardless,
   use the ``chunksize`` or ``iterator`` parameter to return the data in chunks.
   (Only valid with C parser)
-compact_ints : boolean, default False
-  .. deprecated:: 0.19.0
-
-     Argument moved to ``pd.to_numeric``
-
-  If ``compact_ints`` is ``True``, then for any column that is of integer dtype, the
-  parser will attempt to cast it as the smallest integer ``dtype`` possible, either
-  signed or unsigned depending on the specification from the ``use_unsigned`` parameter.
-use_unsigned : boolean, default False
-  .. deprecated:: 0.18.2
-
-     Argument moved to ``pd.to_numeric``
-
-  If integer columns are being compacted (i.e. ``compact_ints=True``), specify whether
-  the column should be compacted to the smallest signed or unsigned integer dtype.
 memory_map : boolean, default False
   If a filepath is provided for ``filepath_or_buffer``, map the file object
   directly onto memory and access the data directly from there. Using this
@@ -2804,11 +2790,11 @@ to be parsed.
 
 If `usecols` is a list of integers, then it is assumed to be the file column
 indices to be parsed.
-
 .. code-block:: python
 
    read_excel('path_to_file.xls', 'Sheet1', usecols=[0, 2, 3])
 
+Element order is ignored, so usecols=[0,1] is the same as [1,0].
 
 Parsing Dates
 +++++++++++++

doc/source/whatsnew.rst

@@ -18,6 +18,8 @@ What's New
 
 These are new features and improvements of note in each release.
 
+.. include:: whatsnew/v0.23.0.txt
+
 .. include:: whatsnew/v0.22.0.txt
 
 .. include:: whatsnew/v0.21.1.txt

doc/source/whatsnew/v0.22.0

@@ -0,0 +1,14 @@
+.. _whatsnew_0220:
+
+v0.22.0
+-------
+
+This is a major release from 0.21.1 and includes a number of API changes,
+deprecations, new features, enhancements, and performance improvements along
+with a large number of bug fixes. We recommend that all users upgrade to this
+version.
+
+.. _whatsnew_0220.api_breaking:
+
+Backwards incompatible API changes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

doc/source/whatsnew/v0.22.0.txt renamed to doc/source/whatsnew/v0.23.0

@@ -1,14 +1,14 @@
-.. _whatsnew_0220:
+.. _whatsnew_0230:
 
-v0.22.0
+v0.23.0
 -------
 
 This is a major release from 0.21.1 and includes a number of API changes,
 deprecations, new features, enhancements, and performance improvements along
 with a large number of bug fixes. We recommend that all users upgrade to this
 version.
 
-.. _whatsnew_0220.enhancements:
+.. _whatsnew_0230.enhancements:
 
 New features
 ~~~~~~~~~~~~
@@ -32,7 +32,7 @@ The :func:`get_dummies` now accepts a ``dtype`` argument, which specifies a dtyp
    pd.get_dummies(df, columns=['c'], dtype=bool).dtypes
 
 
-.. _whatsnew_0220.enhancements.merge_on_columns_and_levels:
+.. _whatsnew_0230.enhancements.merge_on_columns_and_levels:
 
 Merging on a combination of columns and index levels
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -63,7 +63,7 @@ levels <merging.merge_on_columns_and_levels>` documentation section.
    left.merge(right, on=['key1', 'key2'])
 
 
-.. _whatsnew_0220.enhancements.ran_inf:
+.. _whatsnew_0230.enhancements.ran_inf:
 
 ``.rank()`` handles ``inf`` values when ``NaN`` are present
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -119,7 +119,7 @@ Current Behavior
 
     s.rank(na_option='top')
 
-.. _whatsnew_0220.enhancements.other:
+.. _whatsnew_0230.enhancements.other:
 
 Other Enhancements
 ^^^^^^^^^^^^^^^^^^
@@ -139,13 +139,15 @@ Other Enhancements
 - :func:`read_excel()` has gained the ``nrows`` parameter (:issue:`16645`)
 - :func:``DataFrame.to_json`` and ``Series.to_json`` now accept an ``index`` argument which allows the user to exclude the index from the JSON output (:issue:`17394`)
 - ``IntervalIndex.to_tuples()`` has gained the ``na_tuple`` parameter to control whether NA is returned as a tuple of NA, or NA itself (:issue:`18756`)
+- ``Categorical.rename_categories``, ``CategoricalIndex.rename_categories`` and :attr:`Series.cat.rename_categories`
+  can now take a callable as their argument (:issue:`18862`)
 
-.. _whatsnew_0220.api_breaking:
+.. _whatsnew_0230.api_breaking:
 
 Backwards incompatible API changes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. _whatsnew_0220.api_breaking.deps:
+.. _whatsnew_0230.api_breaking.deps:
 
 Dependencies have increased minimum versions
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -169,7 +171,7 @@ Build Changes
 - Building from source now explicity requires ``setuptools`` in ``setup.py`` (:issue:`18113`)
 - Updated conda recipe to be in compliance with conda-build 3.0+ (:issue:`18002`)
 
-.. _whatsnew_0220.api:
+.. _whatsnew_0230.api:
 
 Other API Changes
 ^^^^^^^^^^^^^^^^^
@@ -199,7 +201,7 @@ Other API Changes
 - :func:`pandas.merge` now raises a ``ValueError`` when trying to merge on incompatible data types (:issue:`9780`)
 - :func:`wide_to_long` previously kept numeric-like suffixes as ``object`` dtype. Now they are cast to numeric if possible (:issue:`17627`)
 
-.. _whatsnew_0220.deprecations:
+.. _whatsnew_0230.deprecations:
 
 Deprecations
 ~~~~~~~~~~~~
@@ -213,8 +215,9 @@ Deprecations
   retain the previous behavior, use a list instead of a tuple (:issue:`18314`)
 - ``Series.valid`` is deprecated. Use :meth:`Series.dropna` instead (:issue:`18800`).
 - :func:`read_excel` has deprecated the ``skip_footer`` parameter. Use ``skipfooter`` instead (:issue:`18836`)
+- The ``is_copy`` attribute is deprecated and will be removed in a future version (:issue:`18801`).
 
-.. _whatsnew_0220.prior_deprecations:
+.. _whatsnew_0230.prior_deprecations:
 
 Removal of prior version deprecations/changes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -233,8 +236,9 @@ Removal of prior version deprecations/changes
 - :func:`read_csv` has dropped the ``skip_footer`` parameter (:issue:`13386`)
 - :func:`read_csv` has dropped the ``as_recarray`` parameter (:issue:`13373`)
 - :func:`read_csv` has dropped the ``buffer_lines`` parameter (:issue:`13360`)
+- :func:`read_csv` has dropped the ``compact_ints`` and ``use_unsigned`` parameters (:issue:`13323`)
 
-.. _whatsnew_0220.performance:
+.. _whatsnew_0230.performance:
 
 Performance Improvements
 ~~~~~~~~~~~~~~~~~~~~~~~~
@@ -252,7 +256,7 @@ Performance Improvements
 - Improved performance of ``DatetimeIndex`` and ``Series`` arithmetic operations with Business-Month and Business-Quarter frequencies (:issue:`18489`)
 - :func:`Series` / :func:`DataFrame` tab completion limits to 100 values, for better performance. (:issue:`18587`)
 
-.. _whatsnew_0220.docs:
+.. _whatsnew_0230.docs:
 
 Documentation Changes
 ~~~~~~~~~~~~~~~~~~~~~
@@ -261,7 +265,7 @@ Documentation Changes
 -
 -
 
-.. _whatsnew_0220.bug_fixes:
+.. _whatsnew_0230.bug_fixes:
 
 Bug Fixes
 ~~~~~~~~~
@@ -277,6 +281,7 @@ Conversion
 - Fixed a bug where ``FY5253`` date offsets could incorrectly raise an ``AssertionError`` in arithmetic operatons (:issue:`14774`)
 - Bug in :meth:`Index.astype` with a categorical dtype where the resultant index is not converted to a :class:`CategoricalIndex` for all types of index (:issue:`18630`)
 - Bug in :meth:`Series.astype` and ``Categorical.astype()`` where an existing categorical data does not get updated (:issue:`10696`, :issue:`18593`)
+- Bug in :class:`Series` constructor with an int or float list where specifying ``dtype=str``, ``dtype='str'`` or ``dtype='U'`` failed to convert the data elements to strings (:issue:`16605`)
 
 
 Indexing
@@ -294,6 +299,8 @@ Indexing
 - Bug in tz-aware :class:`DatetimeIndex` where addition/subtraction with a :class:`TimedeltaIndex` or array with ``dtype='timedelta64[ns]'`` was incorrect (:issue:`17558`)
 - :func:`Index.to_series` now accepts ``index`` and ``name`` kwargs (:issue:`18699`)
 - :func:`DatetimeIndex.to_series` now accepts ``index`` and ``name`` kwargs (:issue:`18699`)
+- Bug in indexing non-scalar value from ``Series`` having non-unique ``Index`` will return value flattened (:issue:`17610`)
+
 
 I/O
 ^^^
@@ -302,13 +309,14 @@ I/O
 - Bug in :func:`read_msgpack` with a non existent file is passed in Python 2 (:issue:`15296`)
 - Bug in :func:`read_csv` where a ``MultiIndex`` with duplicate columns was not being mangled appropriately (:issue:`18062`)
 - Bug in :func:`read_sas` where a file with 0 variables gave an ``AttributeError`` incorrectly. Now it gives an ``EmptyDataError`` (:issue:`18184`)
--
+- Bug in :func:`DataFrame.to_latex()` where pairs of braces meant to serve as invisible placeholders were escaped (:issue:`18667`)
 -
 
 Plotting
 ^^^^^^^^
 
 - :func: `DataFrame.plot` now raises a ``ValueError`` when the ``x`` or ``y`` argument is improperly formed (:issue:`18671`)
+- Bug in formatting tick labels with ``datetime.time()`` and fractional seconds (:issue:`18478`).
 -
 -